This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7861

graftcopies: document why the function is useful at all
ClosedPublic

Authored by martinvonz on Jan 14 2020, 12:06 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG06e7e7652ac0: graftcopies: document why the function is useful at all
Summary

Despite having spent a significant amount on time on the copy-tracing
code, I thought graftcopies() (formerly known as
duplicatecopies()) was needed to duplicate copies after calling
merge.update() to do a merge (as merge.graft() does), but it's
actually usually not needed; merge.update() takes care of most
copies. This patch documents what the function is for.

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 14 2020, 12:06 PM
pulkit accepted this revision.Jan 16 2020, 10:39 AM
This revision is now accepted and ready to land.Jan 16 2020, 10:39 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (16 lines)

Diff 19372

mercurial/copies.py

f2 = next(g2) f2 = next(g2)
else: # f1 and f2 point to files in the same linkrev else: # f1 and f2 point to files in the same linkrev
return f1 == f2 # true if they point to the same file return f1 == f2 # true if they point to the same file
except StopIteration: except StopIteration:
return False return False
def graftcopies(wctx, ctx, base): def graftcopies(wctx, ctx, base):
"""reproduce copies between base and ctx in the wctx""" """reproduce copies between base and ctx in the wctx
Unlike mergecopies(), this function will only consider copies between base
and ctx; it will ignore copies between base and wctx. Also unlike
mergecopies(), this function will apply copies to the working copy (instead
of just returning information about the copies). That makes it cheaper
(especially in the common case of base==ctx.p1()) and useful also when
experimental.copytrace=off.
merge.update() will have already marked most copies, but it will only
mark copies if it thinks the source files are related (see
merge._related()). It will also not mark copies if the file wasn't modified
on the local side. This function adds the copies that were "missed"
by merge.update().
"""
new_copies = pathcopies(base, ctx) new_copies = pathcopies(base, ctx)
_filter(wctx.p1(), wctx, new_copies) _filter(wctx.p1(), wctx, new_copies)
for dst, src in pycompat.iteritems(new_copies): for dst, src in pycompat.iteritems(new_copies):
wctx[dst].markcopied(src) wctx[dst].markcopied(src)
def computechangesetfilesadded(ctx): def computechangesetfilesadded(ctx):
"""return the list of files added in a changeset """return the list of files added in a changeset