Mercurial > evolve

changeset 5020:8f6095e88d1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: mark relocate() private
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Dec 2019 13:06:29 -0800
parents 967e9a87e82d
children edcff79a3192
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Dec 19 22:31:13 2019 -0800
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Dec 19 13:06:29 2019 -0800
@@ -178,8 +178,8 @@
         if progresscb:
             progresscb()
         with state.saver(evolvestate, {b'current': orig.node()}):
-            newid = relocate(repo, orig, target, evolvestate, pctx,
-                             keepbranch, b'orphan')
+            newid = _relocate(repo, orig, target, evolvestate, pctx,
+                              keepbranch, b'orphan')
             return (True, newid)
 
 def _solvephasedivergence(ui, repo, bumped, evolvestate, displayer,
@@ -237,8 +237,8 @@
             _(b'rebasing to destination parent: %s\n') % prec.p1())
         with state.saver(evolvestate, {b'current': bumped.hex(),
                                        b'precursor': prec.hex()}):
-            newnode = relocate(repo, bumped, prec.p1(), evolvestate,
-                               category=b'phasedivergent')
+            newnode = _relocate(repo, bumped, prec.p1(), evolvestate,
+                                category=b'phasedivergent')
             if newnode is not None:
                 new = repo[newnode]
                 obsolete.createmarkers(repo, [(bumped, (new,))],
@@ -517,8 +517,8 @@
         ui.status(_(b'rebasing "divergent" content-divergent changeset %s on'
                     b' %s\n' % (divergent, repo[succsdivp1])))
         with state.saver(evolvestate, {b'current': divergent.node()}):
-            newdivergent = relocate(repo, divergent, repo[succsdivp1],
-                                    evolvestate, keepbranch=True)
+            newdivergent = _relocate(repo, divergent, repo[succsdivp1],
+                                     evolvestate, keepbranch=True)
         divergent = repo[newdivergent]
         evolvestate[b'relocating-div'] = False
         evolvestate[b'relocated-div'] = divergent.node()
@@ -538,8 +538,8 @@
         ui.status(_(b'rebasing "other" content-divergent changeset %s on'
                     b' %s\n' % (other, divergent.p1())))
         with state.saver(evolvestate, {b'current': other.node()}):
-            newother = relocate(repo, other, divergent.p1(), evolvestate,
-                                keepbranch=True)
+            newother = _relocate(repo, other, divergent.p1(), evolvestate,
+                                 keepbranch=True)
         evolvestate[b'old-other'] = other.node()
         other = repo[newother]
         evolvestate[b'relocating-other'] = False
@@ -955,8 +955,8 @@
     ordering.extend(sorted(dependencies))
     return ordering
 
-def relocate(repo, orig, dest, evolvestate, pctx=None, keepbranch=False,
-             category=None):
+def _relocate(repo, orig, dest, evolvestate, pctx=None, keepbranch=False,
+              category=None):
     """rewrites the orig rev on dest rev
 
     returns the node of new commit which is formed
@@ -2039,8 +2039,8 @@
                 ui.status(_(b'rebasing "other" content-divergent changeset %s on'
                             b' %s\n' % (other, divergent.p1())))
                 with state.saver(evolvestate, {b'current': other.node()}):
-                    newother = relocate(repo, other, divergent.p1(), evolvestate,
-                                        keepbranch=True)
+                    newother = _relocate(repo, other, divergent.p1(),
+                                         evolvestate, keepbranch=True)
                 evolvestate[b'old-other'] = other.node()
                 other = repo[newother]
                 evolvestate[b'relocating-other'] = False