Mercurial > evolve

changeset 5078:66f01dd79f5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename a function to make it explicit
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 01 Jan 2020 21:36:21 +0530
parents 43b448bb1a57
children 1f92a6aa40d6
files hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/rewriteutil.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Dec 03 14:56:25 2019 +0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed Jan 01 21:36:21 2020 +0530
@@ -50,7 +50,7 @@
 commitopts2 = commands.commitopts2
 mergetoolopts = commands.mergetoolopts
 stringio = util.stringio
-contentdivrisk = rewriteutil.contentdivrisk
+precheck_contentdiv = rewriteutil.precheck_contentdiv
 
 # option added by evolve
 
@@ -1392,7 +1392,7 @@
         p2 = newmapping.get(p2, p2)
 
         if not (duplicate or allowdivergence):
-            if contentdivrisk(repo, ctx):
+            if precheck_contentdiv(repo, ctx):
                 displayer.show(ctx)
                 index = ui.promptchoice(
                     _(b"reviving this changeset will create divergence"
--- a/hgext3rd/evolve/rewriteutil.py	Tue Dec 03 14:56:25 2019 +0700
+++ b/hgext3rd/evolve/rewriteutil.py	Wed Jan 01 21:36:21 2020 +0530
@@ -256,7 +256,7 @@
     finally:
         lockmod.release(tr, lock, wlock)
 
-def contentdivrisk(repo, ctx):
+def precheck_contentdiv(repo, ctx):
     """logic to check if rewriting an obsolete cset will create divergence"""
     # We need to check two cases that can cause divergence:
     # case 1: the rev being rewritten has a non-obsolete successor (easily