Mercurial > hg

changeset 2971:33dcf03ef45f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: hoist partial code out of manifest loops
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:23:29 -0500
parents fa9c769fee8a
children ad558f297eb1
files mercurial/merge.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Aug 22 16:12:54 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 22 16:23:29 2006 -0500
@@ -79,7 +79,7 @@
         raise util.Abort(_("there is nothing to merge, just use "
                            "'hg update' or look at 'hg heads'"))
 
-    if not overwrite and not linear_path and not branchmerge:
+    if not linear_path and not (overwrite or branchmerge):
         raise util.Abort(_("update spans branches, use 'hg merge' "
                            "or 'hg update -C' to lose changes"))
 
@@ -140,10 +140,14 @@
         if linear_path and f not in m2:
             forget.append(f)
 
+    if partial:
+        for f in mw.keys():
+            if not partial(f): del mw[f]
+        for f in m2.keys():
+            if not partial(f): del m2[f]
+
     # Compare manifests
     for f, n in mw.iteritems():
-        if partial and not partial(f):
-            continue
         if f in m2:
             queued = 0
 
@@ -205,8 +209,6 @@
                 repo.ui.debug(_("working dir created %s, keeping\n") % f)
 
     for f, n in m2.iteritems():
-        if partial and not partial(f):
-            continue
         if f[0] == "/":
             continue
         if f in ma and n != ma[f]: