[PATCH 2 of 2] manifestmerge: use already existing fl2 synonym for m2.flags(f)

Martin von Zweigbergk martinvonz at google.com
Fri Nov 14 18:21:24 CST 2014


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1415986408 28800
#      Fri Nov 14 09:33:28 2014 -0800
# Node ID cdd343f8bfe68bb979e83f007e651b5005efc01c
# Parent  c2491406f4623e148bee137b1862ff0b609e4235
manifestmerge: use already existing fl2 synonym for m2.flags(f)

Probably not a noticeable performance gain, but shortens the code
slightly.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -514,11 +514,9 @@
             else:
                 # if different: old untracked f may be overwritten and lost
                 if acceptremote:
-                    actions['g'].append((f, (m2.flags(f),),
-                                   "remote recreating"))
+                    actions['g'].append((f, (fl2,), "remote recreating"))
                 else:
-                    actions['dc'].append((f, (m2.flags(f),),
-                                   "prompt deleted/changed"))
+                    actions['dc'].append((f, (fl2,), "prompt deleted/changed"))
 
     for f, m in sorted(aborts):
         if m == "ud":


More information about the Mercurial-devel mailing list