This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7977

copies: extract function for finding directory renames
ClosedPublic

Authored by martinvonz on Jan 23 2020, 1:44 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG45192589555c: copies: extract function for finding directory renames
Summary

The directory rename code is logically quite isolated, so it makes
sense to make it physically isolated as well.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 23 2020, 1:44 AM
pulkit accepted this revision.Jan 24 2020, 5:23 PM
This revision is now accepted and ready to land.Jan 24 2020, 5:23 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (10 lines)

Diff 19575

mercurial/copies.py

repo.ui.debug( repo.ui.debug(
b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note) b" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f, note)
) )
del renamedeleteset del renamedeleteset
del divergeset del divergeset
repo.ui.debug(b" checking for directory renames\n") 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 # generate a directory move map
d1, d2 = c1.dirs(), c2.dirs() d1, d2 = c1.dirs(), c2.dirs()
invalid = set() invalid = set()
dirmove = {} dirmove = {}
# examine each file copy for a potential directory move, which is # examine each file copy for a potential directory move, which is
# when all the files in a directory are moved to a new directory # when all the files in a directory are moved to a new directory
for dst, src in pycompat.iteritems(fullcopy): for dst, src in pycompat.iteritems(fullcopy):
dirmove[dsrc] = ddst dirmove[dsrc] = ddst
for i in invalid: for i in invalid:
if i in dirmove: if i in dirmove:
del dirmove[i] del dirmove[i]
del d1, d2, invalid del d1, d2, invalid
if not dirmove: if not dirmove:
return copy, {}, diverge, renamedelete, {} return {}, {}
dirmove = {k + b"/": v + b"/" for k, v in pycompat.iteritems(dirmove)} dirmove = {k + b"/": v + b"/" for k, v in pycompat.iteritems(dirmove)}
for d in dirmove: for d in dirmove:
repo.ui.debug( repo.ui.debug(
b" discovered dir src: '%s' -> dst: '%s'\n" % (d, dirmove[d]) b" discovered dir src: '%s' -> dst: '%s'\n" % (d, dirmove[d])
) )
movewithdir = {} movewithdir = {}
# check unaccounted nonoverlapping files against directory moves # check unaccounted nonoverlapping files against directory moves
for f in u1 + u2: for f in u1 + u2:
if f not in fullcopy: if f not in fullcopy:
for d in dirmove: for d in dirmove:
if f.startswith(d): if f.startswith(d):
# new file added in a directory that was moved, move it # new file added in a directory that was moved, move it
df = dirmove[d] + f[len(d) :] df = dirmove[d] + f[len(d) :]
if df not in copy: if df not in copy:
movewithdir[f] = df movewithdir[f] = df
repo.ui.debug( repo.ui.debug(
b" pending file src: '%s' -> dst: '%s'\n" b" pending file src: '%s' -> dst: '%s'\n"
% (f, df) % (f, df)
) )
break break
return copy, movewithdir, diverge, renamedelete, dirmove return dirmove, movewithdir
def _heuristicscopytracing(repo, c1, c2, base): def _heuristicscopytracing(repo, c1, c2, base):
""" Fast copytracing using filename heuristics """ Fast copytracing using filename heuristics
Assumes that moves or renames are of following two types: Assumes that moves or renames are of following two types:
1) Inside a directory only (same directory name but different filenames) 1) Inside a directory only (same directory name but different filenames)