Patchwork [2,of,7,checkunknown] _checkunknownfiles: rename 'aborts' to 'conflicts'

login
register
mail settings
Submitter Siddharth Agarwal
Date Jan. 2, 2016, 11:25 a.m.
Message ID <0fe2d217d1a7700f58dd.1451733906@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/12472/
State Accepted
Delegated to: Martin von Zweigbergk
Headers show

Comments

Siddharth Agarwal - Jan. 2, 2016, 11:25 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1451732577 28800
#      Sat Jan 02 03:02:57 2016 -0800
# Node ID 0fe2d217d1a7700f58ddecd081642d2bbe58ce16
# Parent  cf6d05eb438a4ee7597a52aa20e1ab64dae61a21
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 0fe2d217d1a7
_checkunknownfiles: rename 'aborts' to 'conflicts'

In upcoming patches we'll be able to do more useful things than aborting.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -570,19 +570,19 @@  def _checkunknownfiles(repo, wctx, mctx,
     files. For some actions, the result is to abort; for others, it is to
     choose a different action.
     """
-    aborts = []
+    conflicts = []
     if not force:
         for f, (m, args, msg) in actions.iteritems():
             if m in ('c', 'dc'):
                 if _checkunknownfile(repo, wctx, mctx, f):
-                    aborts.append(f)
+                    conflicts.append(f)
             elif m == 'dg':
                 if _checkunknownfile(repo, wctx, mctx, f, args[0]):
-                    aborts.append(f)
+                    conflicts.append(f)
 
-    for f in sorted(aborts):
+    for f in sorted(conflicts):
         repo.ui.warn(_("%s: untracked file differs\n") % f)
-    if aborts:
+    if conflicts:
         raise error.Abort(_("untracked files in working directory differ "
                            "from files in requested revision"))