Mercurial > evolve
changeset 6078:26ddbaa12ab4
rewriteutil: rename revs_hascontentdivrisk to new_divergence
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 27 Oct 2021 13:29:22 +0530 |
| parents | c5cb95d677bc |
| children | 8cc7732a29bf |
| files | hgext3rd/evolve/rewriteutil.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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. """