This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9899

copies: fix an incorrect comment in graftcopies() from recent D9802
ClosedPublic

Authored by martinvonz on Jan 28 2021, 3:19 AM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG892eb7c5edaa: copies: fix an incorrect comment in graftcopies() from recent D9802
Summary

I don't think the bit about creating a merge in the filelog was
correct. Or at least I couldn't find a case where it happened.

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 28 2021, 3:19 AM
marmoute added a subscriber: marmoute.Jan 28 2021, 4:07 AM

What would be in that empty commit ?

martinvonz added a comment.Jan 28 2021, 4:16 AM
In D9899#149911, @marmoute wrote:

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

marmoute added a comment.Jan 28 2021, 7:30 AM
In D9899#149912, @martinvonz wrote:
In D9899#149911, @marmoute wrote:

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

martinvonz added a comment.Jan 28 2021, 11:16 AM
In D9899#149913, @marmoute wrote:
In D9899#149912, @martinvonz wrote:
In D9899#149911, @marmoute wrote:

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

I didn't see any new file nodeids get created in the test case I looked at (around test-rebase-rename.t:135).

marmoute accepted this revision.Jan 28 2021, 12:03 PM
In D9899#149954, @martinvonz wrote:
In D9899#149913, @marmoute wrote:
In D9899#149912, @martinvonz wrote:
In D9899#149911, @marmoute wrote:

What would be in that empty commit ?

A the new manifest's nodeid (which has the same content as the parent manifest, just different parent).

If I remember correctly, that different nodeid is a file-revision that contains copy information ? Does it not ?

I didn't see any new file nodeids get created in the test case I looked at (around test-rebase-rename.t:135).

Hum right, my bad. I don't know where/if I actually such change…

Lets take that rephrasing.

pulkit accepted this revision.Jan 28 2021, 1:12 PM
This revision is now accepted and ready to land.Jan 28 2021, 1:12 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (7 lines)

Diff 25366

mercurial/copies.py

mark copies if it thinks the source files are related (see 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 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" on the local side. This function adds the copies that were "missed"
by merge.update(). by merge.update().
""" """
new_copies = pathcopies(base, ctx) new_copies = pathcopies(base, ctx)
parent = wctx.p1() parent = wctx.p1()
_filter(parent, wctx, new_copies) _filter(parent, wctx, new_copies)
# extra filtering to drop copy information for files that existed before # Extra filtering to drop copy information for files that existed before
# the graft (otherwise we would create merge filelog for non-merge commit # the graft. This is to handle the case of grafting a rename onto a commit
# that already has the rename. Otherwise the presence of copy information
# would result in the creation of an empty commit where we would prefer to
# not create one.
for dest, __ in list(new_copies.items()): for dest, __ in list(new_copies.items()):
if dest in parent: if dest in parent:
del new_copies[dest] del new_copies[dest]
for dst, src in pycompat.iteritems(new_copies): for dst, src in pycompat.iteritems(new_copies):
wctx[dst].markcopied(src) wctx[dst].markcopied(src)