[PATCH 4 of 4 V2] manifestmerge: drop redundant flags calls
Siddharth Agarwal
sid0 at fb.com
Mon Mar 25 19:51:23 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1364169385 25200
# Sun Mar 24 16:56:25 2013 -0700
# Node ID 910684c1594c5605adb49bf48a55e5977763c52a
# Parent 51115dab3750296ddd1d237c5af4b7c9f18700ee
manifestmerge: drop redundant flags calls
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -275,7 +275,7 @@ def manifestmerge(repo, wctx, p2, pa, br
pass
elif n1 and f in movewithdir: # directory rename
f2 = movewithdir[f]
- actions.append((f, "d", (None, f2, m1.flags(f)),
+ actions.append((f, "d", (None, f2, fl1),
"remote renamed directory to " + f2))
elif n1 and f in copy:
f2 = copy[f]
@@ -290,7 +290,7 @@ def manifestmerge(repo, wctx, p2, pa, br
actions.append((f, "r", None, "other deleted"))
elif n2 and f in movewithdir:
f2 = movewithdir[f]
- actions.append((None, "d", (f, f2, m2.flags(f)),
+ actions.append((None, "d", (f, f2, fl2),
"local renamed directory to " + f2))
elif n2 and f in copy:
f2 = copy[f]
@@ -314,7 +314,7 @@ def manifestmerge(repo, wctx, p2, pa, br
# Checking whether the files are different is expensive, so we
# don't do that when we can avoid it.
if force and not branchmerge:
- actions.append((f, "g", (m2.flags(f),), "remote created"))
+ actions.append((f, "g", (fl2,), "remote created"))
else:
different = _checkunknownfile(repo, wctx, p2, f)
if force and branchmerge and different:
@@ -323,7 +323,7 @@ def manifestmerge(repo, wctx, p2, pa, br
elif not force and different:
aborts.append((f, "ud"))
else:
- actions.append((f, "g", (m2.flags(f),), "remote created"))
+ actions.append((f, "g", (fl2,), "remote created"))
elif n2 and n2 != ma[f]:
prompts.append((f, "dc")) # prompt deleted/changed
More information about the Mercurial-devel
mailing list