Mercurial > hg > gitweb

changeset 2813:56f99f5aab34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents 3aeab7bb5adc
children 0f787997e3c2
files mercurial/merge.py
diffstat 1 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Aug 08 09:19:20 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 08 09:26:00 2006 -0500
@@ -57,8 +57,6 @@
     if not force and pl[1] != nullid:
         raise util.Abort(_("outstanding uncommitted merges"))
 
-    err = False
-
     p1, p2 = pl[0], node
     pa = repo.changelog.ancestor(p1, p2)
     m1n = repo.changelog.read(p1)[0]
@@ -276,7 +274,7 @@
                 repo.dirstate.update([f], 'n')
 
     # merge the tricky bits
-    failedmerge = []
+    unresolved = []
     files = merge.keys()
     files.sort()
     for f in files:
@@ -284,8 +282,7 @@
         my, other, flag = merge[f]
         ret = merge3(repo, f, my, other, xp1, xp2)
         if ret:
-            err = True
-            failedmerge.append(f)
+            unresolved.append(f)
         util.set_exec(repo.wjoin(f), flag)
         if not partial:
             if branchmerge:
@@ -322,14 +319,14 @@
 
     if show_stats:
         stats = ((len(get), _("updated")),
-                 (len(merge) - len(failedmerge), _("merged")),
+                 (len(merge) - len(unresolved), _("merged")),
                  (len(remove), _("removed")),
-                 (len(failedmerge), _("unresolved")))
+                 (len(unresolved), _("unresolved")))
         note = ", ".join([_("%d files %s") % s for s in stats])
         repo.ui.status("%s\n" % note)
     if not partial:
         if branchmerge:
-            if failedmerge:
+            if unresolved:
                 repo.ui.status(_("There are unresolved merges,"
                                 " you can redo the full merge using:\n"
                                 "  hg update -C %s\n"
@@ -338,10 +335,10 @@
                                     repo.changelog.rev(p2))))
             elif remind:
                 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
-        elif failedmerge:
+        elif unresolved:
             repo.ui.status(_("There are unresolved merges with"
                              " locally modified files.\n"))
 
-    repo.hook('update', parent1=xp1, parent2=xxp2, error=int(err))
-    return err
+    repo.hook('update', parent1=xp1, parent2=xxp2, error=len(unresolved))
+    return len(unresolved)