mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
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.
This commit is contained in:
parent
0fea0bfee8
commit
2c466c126f
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user