Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: consistently use "x" instead of 'x' for internal action types
authorMads Kiilerich <mads@kiilerich.com>
Wed, 09 Jan 2013 00:01:33 +0100
changeset 18329 eb6ca96f4dd0
parent 18328 2fee5119099b
child 18330 b717f49833a2
merge: consistently use "x" instead of 'x' for internal action types This makes it simpler to search for places where the action types are handled.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Wed Jan 09 00:01:33 2013 +0100
+++ b/mercurial/merge.py	Wed Jan 09 00:01:33 2013 +0100
@@ -318,7 +318,7 @@
     return action
 
 def actionkey(a):
-    return a[1] == 'r' and -1 or 0, a
+    return a[1] == "r" and -1 or 0, a
 
 def applyupdates(repo, action, wctx, mctx, actx, overwrite):
     """apply the merge action list to the working directory
@@ -340,7 +340,7 @@
     # prescan for merges
     for a in action:
         f, m = a[:2]
-        if m == 'm': # merge
+        if m == "m": # merge
             f2, fd, flags, move = a[2:]
             if f == '.hgsubstate': # merged internally
                 continue
mercurial