Patchwork [1,of,3] rebase: rename merge to mergemod

login
register
mail settings
Submitter timeless
Date Nov. 2, 2016, 7:01 p.m.
Message ID <78cf30254354eafb993e.1478113311@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/17289/
State Accepted
Headers show

Comments

timeless - Nov. 2, 2016, 7:01 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1478112967 0
#      Wed Nov 02 18:56:07 2016 +0000
# Node ID 78cf30254354eafb993ed7f226eb70d7b7abb6dc
# Parent  b032a7b676c6637b2ac6f3ef29431013b15a08f9
# Available At https://bitbucket.org/timeless/mercurial-crew
#              hg pull https://bitbucket.org/timeless/mercurial-crew -r 78cf30254354
rebase: rename merge to mergemod

Patch

diff -r b032a7b676c6 -r 78cf30254354 hgext/rebase.py
--- a/hgext/rebase.py	Tue Nov 01 18:54:03 2016 -0700
+++ b/hgext/rebase.py	Wed Nov 02 18:56:07 2016 +0000
@@ -36,7 +36,7 @@ 
     extensions,
     hg,
     lock,
-    merge,
+    merge as mergemod,
     obsolete,
     patch,
     phases,
@@ -823,7 +823,7 @@ 
     # Update to target and merge it with local
     if repo['.'].rev() != p1:
         repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
-        merge.update(repo, p1, False, True)
+        mergemod.update(repo, p1, False, True)
     else:
         repo.ui.debug(" already in target\n")
     repo.dirstate.write(repo.currenttransaction())
@@ -832,8 +832,8 @@ 
         repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
     # When collapsing in-place, the parent is the common ancestor, we
     # have to allow merging with it.
-    stats = merge.update(repo, rev, True, True, base, collapse,
-                        labels=['dest', 'source'])
+    stats = mergemod.update(repo, rev, True, True, base, collapse,
+                            labels=['dest', 'source'])
     if collapse:
         copies.duplicatecopies(repo, rev, target)
     else:
@@ -1150,7 +1150,7 @@ 
 
             # Update away from the rebase if necessary
             if shouldupdate or needupdate(repo, state):
-                merge.update(repo, originalwd, False, True)
+                mergemod.update(repo, originalwd, False, True)
 
             # Strip from the first rebased revision
             if rebased: