facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

merge: consistently use "x" instead of 'x' for internal action types

Browse Source 
This makes it simpler to search for places where the action types are handled.
This commit is contained in:
Mads Kiilerich 2013-01-09 00:01:33 +01:00
parent 0fea0bfee8
commit 2c466c126f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/merge.py
View File

@ -318,7 +318,7 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
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, mctx, actx, overwrite):
# 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