Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove constant tuple element from 'aborts'
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 Nov 2014 20:29:25 -0800
changeset 23652 6fcc3669e483
parent 23651 72da02d7f126
child 23653 0297d8469350
merge: remove constant tuple element from 'aborts' The second element of the tuples in the 'aborts' list is always 'ud', so let's remove it.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Wed Nov 19 11:51:31 2014 -0800
+++ b/mercurial/merge.py	Tue Nov 18 20:29:25 2014 -0800
@@ -516,12 +516,10 @@
         for f, (m, args, msg) in actions.iteritems():
             if m in ('c', 'dc'):
                 if _checkunknownfile(repo, wctx, p2, f):
-                    aborts.append((f, "ud"))
+                    aborts.append(f)
 
-    for f, m in sorted(aborts):
-        if m == 'ud':
-            repo.ui.warn(_("%s: untracked file differs\n") % f)
-        else: assert False, m
+    for f in sorted(aborts):
+        repo.ui.warn(_("%s: untracked file differs\n") % f)
     if aborts:
         raise util.Abort(_("untracked files in working directory differ "
                            "from files in requested revision"))
Mercurial