[PATCH 5 of 5 V2] revert: drop now useless conditional in the backup check

Augie Fackler raf at durin42.com
Tue Sep 9 11:08:36 CDT 2014


On Mon, Sep 08, 2014 at 04:58:22PM +0200, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1409356262 -7200
> #      Sat Aug 30 01:51:02 2014 +0200
> # Node ID 5417bc06f6b3f7f9ab18c998dc08541ee825afaf
> # Parent  f2199b928fd12e6b82387e7563e683e935df455c
> revert: drop now useless conditional in the backup check

Series looks reasonable, queued.

>
> Now that we removed the (hopeless attempt) attempt to backup file we knew to be
> missing in the target changesets, we can stop checking if the file exists in
> the target changeset.
>
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -2549,12 +2549,12 @@ def revert(ui, repo, ctx, parents, *pats
>              for table, (xlist, msg), dobackup in disptable:
>                  if abs not in table:
>                      continue
>                  if xlist is not None:
>                      xlist.append(abs)
> -                    if (dobackup and os.path.lexists(target) and
> -                        abs in ctx and repo[None][abs].cmp(ctx[abs])):
> +                    if (dobackup and os.path.lexists(target)
> +                        and repo[None][abs].cmp(ctx[abs])):
>                          bakname = "%s.orig" % rel
>                          ui.note(_('saving current version of %s as %s\n') %
>                                  (rel, bakname))
>                          if not opts.get('dry_run'):
>                              util.rename(target, bakname)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list