Commit 26ddbaa1 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

rewriteutil: rename revs_hascontentdivrisk to new_divergence

parent c5cb95d677bc
Pipeline #28989 passed with stage
in 14 minutes and 20 seconds
......@@ -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.
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment