[PATCH 3 of 5] copies: rename diverge2 to divergeset for clarity
Matt Mackall
mpm at selenic.com
Wed Sep 23 15:07:09 CDT 2015
# HG changeset patch
# User Matt Mackall <mpm at selenic.com>
# Date 1440011094 18000
# Wed Aug 19 14:04:54 2015 -0500
# Node ID 70d573eac86803219037c7f430421e8bcae1108c
# Parent ae018fcd2e7b76bf4a4c95793675f2692749a9ef
copies: rename diverge2 to divergeset for clarity
diff -r ae018fcd2e7b -r 70d573eac868 mercurial/copies.py
--- a/mercurial/copies.py Wed Aug 19 13:40:18 2015 -0500
+++ b/mercurial/copies.py Wed Aug 19 14:04:54 2015 -0500
@@ -341,7 +341,7 @@
renamedelete = {}
renamedelete2 = set()
- diverge2 = set()
+ divergeset = set()
for of, fl in diverge.items():
if len(fl) == 1 or of in c1 or of in c2:
del diverge[of] # not actually divergent, or not a rename
@@ -351,7 +351,7 @@
renamedelete[of] = [f for f in fl if f in c1 or f in c2]
renamedelete2.update(fl) # reverse map for below
else:
- diverge2.update(fl) # reverse map for below
+ divergeset.update(fl) # reverse map for below
bothnew = sorted(addedinm1 & addedinm2)
if bothnew:
@@ -374,13 +374,13 @@
note = ""
if f in copy:
note += "*"
- if f in diverge2:
+ if f in divergeset:
note += "!"
if f in renamedelete2:
note += "%"
repo.ui.debug(" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f,
note))
- del diverge2
+ del divergeset
if not fullcopy:
return copy, movewithdir, diverge, renamedelete
More information about the Mercurial-devel
mailing list