# HG changeset patch # User Sushil khanchi # Date 1635321562 -19800 # Node ID 26ddbaa12ab434e401009e1c783f88706dd8babd # Parent c5cb95d677bc35cb03a587121d84286e08fd231e rewriteutil: rename revs_hascontentdivrisk to new_divergence diff -r c5cb95d677bc -r 26ddbaa12ab4 hgext3rd/evolve/rewriteutil.py --- a/hgext3rd/evolve/rewriteutil.py Wed Oct 27 00:51:05 2021 +0530 +++ b/hgext3rd/evolve/rewriteutil.py Wed Oct 27 13:29:22 2021 +0530 @@ -88,7 +88,7 @@ allowdivergence = compat.isenabled(repo, compat.allowdivergenceopt) if allowdivergence: return - divergence = revs_hascontentdivrisk(repo, revs) + divergence = new_divergence(repo, revs) if divergence: local, other, common_prec = divergence localdiv = repo[local] @@ -124,7 +124,7 @@ repo._bookmarks.applychanges(repo, tr, bmchanges) return updatebookmarks -def revs_hascontentdivrisk(repo, revs): +def new_divergence(repo, revs): """Return a tuple (rev, divergent, common_precursor) if rewriting one of the revs will create content-divergence. """