# HG changeset patch # User Sushil khanchi # Date 1577894781 -19800 # Node ID 66f01dd79f5d0acc2d60f2dfabf60597b329643e # Parent 43b448bb1a57d4cf36d5745512c11b1be7c58bfc evolve: rename a function to make it explicit diff -r 43b448bb1a57 -r 66f01dd79f5d hgext3rd/evolve/cmdrewrite.py --- 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" diff -r 43b448bb1a57 -r 66f01dd79f5d hgext3rd/evolve/rewriteutil.py --- 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