[PATCH 1 of 6 mergedriver] filemerge: clean up some dead code

Siddharth Agarwal sid0 at fb.com
Mon Oct 12 20:09:37 UTC 2015


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1444601040 25200
#      Sun Oct 11 15:04:00 2015 -0700
# Node ID aa38606b117b5830b7f2521b7047405400f8e082
# Parent  e1162eb7f9b2942602b001ac24b141b3aa84c7e0
filemerge: clean up some dead code

We now exit early if we do a premerge, so extra checks are no longer necessary.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -522,12 +522,8 @@ def _filemerge(premerge, repo, mynode, o
             # complete if premerge successful (r is 0)
             return not r, r
 
-        if not r:  # premerge successfully merged the file
-            needcheck = False
-        else:
-            needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
-                                files, labels=labels)
-
+        needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, files,
+                            labels=labels)
         if needcheck:
             r = _check(r, ui, tool, fcd, files)
 


More information about the Mercurial-devel mailing list