D7977: copies: extract function for finding directory renames
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 24 17:02:11 EST 2020
martinvonz updated this revision to Diff 19562.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7977?vs=19529&id=19562
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7977/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7977
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -657,6 +657,12 @@
repo.ui.debug(b" checking for directory renames\n")
+ dirmove, movewithdir = _dir_renames(repo, c1, c2, copy, fullcopy, u1, u2)
+
+ return copy, movewithdir, diverge, renamedelete, dirmove
+
+
+def _dir_renames(repo, c1, c2, copy, fullcopy, u1, u2):
# generate a directory move map
d1, d2 = c1.dirs(), c2.dirs()
invalid = set()
@@ -688,7 +694,7 @@
del d1, d2, invalid
if not dirmove:
- return copy, {}, diverge, renamedelete, {}
+ return {}, {}
dirmove = {k + b"/": v + b"/" for k, v in pycompat.iteritems(dirmove)}
@@ -713,7 +719,7 @@
)
break
- return copy, movewithdir, diverge, renamedelete, dirmove
+ return dirmove, movewithdir
def _heuristicscopytracing(repo, c1, c2, base):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list