This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6408

convert: demonstrate broken {files} list in merge commits with file flags
ClosedPublic

Authored by martinvonz on May 17 2019, 2:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG78530404d00b: convert: demonstrate broken {files} list in merge commits with file flags
Summary

When there is a merge in which the flags for a file from p2 is
non-empty, hg convert will incorrectly include that in the
changeset's files list.

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.May 17 2019, 2:49 PM
Closed by commit rHG78530404d00b: convert: demonstrate broken {files} list in merge commits with file flags (authored by martinvonz). · Explain WhyMay 20 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.
pulkit added a subscriber: pulkit.May 23 2019, 8:00 AM
pulkit added inline comments.
tests/test-convert-hg-sink.t
604

Shouldn't this show b?

pulkit added inline comments.May 23 2019, 8:01 AM
tests/test-convert-hg-sink.t
604

Oh, I understood the merge commit other way. So this should show a or not? I am not sure whether we consider mod change as file change or not.

martinvonz marked an inline comment as done.May 23 2019, 9:05 AM
martinvonz added inline comments.
tests/test-convert-hg-sink.t
604

A file gets included pretty if it's different from both parents, so a should not be included here.

Revision Contents
Changeset List

PathPackages
Mtests/test-convert-hg-sink.t (48 lines)

Diff 15189

tests/test-convert-hg-sink.t

scanning source... scanning source...
sorting... sorting...
converting... converting...
0 f 0 f
$ hg -R a status --change tip $ hg -R a status --change tip
M f M f
A b-only A b-only
R a-only R a-only
Recorded {files} list does not get confused about flags on merge commits
#if execbit
$ cd ..
$ hg init merge-flags-orig
$ cd merge-flags-orig
$ echo 0 > 0
$ hg ci -Aqm 'add 0'
$ echo a > a
$ chmod +x a
$ hg ci -qAm 'add executable file'
$ hg co -q 0
$ echo b > b
$ hg ci -qAm 'add file'
$ hg merge -q
$ hg ci -m 'merge'
$ hg log -G -T '{rev} {desc}\n'
@ 3 merge
|\
| o 2 add file
| |
o | 1 add executable file
|/
o 0 add 0
# No files changed
$ hg log -r 3 -T '{files}\n'
pulkitUnsubmitted
Done

Shouldn't this show b?

pulkit: Shouldn't this show `b`?
pulkitUnsubmitted
Not Done

Oh, I understood the merge commit other way. So this should show a or not? I am not sure whether we consider mod change as file change or not.

pulkit: Oh, I understood the merge commit other way. So this should show `a` or not? I am not sure…
martinvonzAuthorUnsubmitted
Not Done

A file gets included pretty if it's different from both parents, so a should not be included here.

martinvonz: A file gets included pretty if it's different from both parents, so `a` should not be included…
$ cd ..
$ hg convert merge-flags-orig merge-flags-new -q
$ cd merge-flags-new
$ hg log -G -T '{rev} {desc}\n'
o 3 merge
|\
| o 2 add file
| |
o | 1 add executable file
|/
o 0 add 0
BROKEN: now 'a' appears changed
$ hg log -r 3 -T '{files}\n'
a
#endif