Patchwork [04,of,14] merge: consistently use "x" instead of 'x' for internal action types

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 13, 2013, 7:02 p.m.
Message ID <45154927265b8d8bea8b.1358103759@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/580/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 13, 2013, 7:02 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1357686093 -3600
# Node ID 45154927265b8d8bea8b021a5ea78f27dd53e44c
# Parent  1bf1f4612f344d80ec12bb844f34f2b6e3e4c345
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.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -318,7 +318,7 @@  def manifestmerge(repo, p1, p2, pa, over
     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 @@  def applyupdates(repo, action, wctx, mct
     # 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