Page MenuHomePhabricator

tests: show the files fields of changelogs for many merges
ClosedPublic

Authored by valentin.gatienbaron on Sun, Jul 7, 12:18 PM.

Details

Summary

I don't think there's coverage for many of the subtle cases, and I
found it hard to understand what the code is doing by reading it. The
test takes 40s to run on a laptop, or 9s with --chg.

I have yet to find a description of what the files field is supposed
to be for merges. I thought it could be one of:

  1. the files added/modified/removed relative to p1 (wouldn't seem useful, but hg diff -c -r mergerev has this behavior)
  2. the files with filelog nodes not in either parent (i.e., what is

needed to create a bundle out of a commit)

  1. the files added/removed/modified files by merge itself [1]

It's clearly not 1, because file contents merges are symmetric. It's
clearly not 2 because removed files and exec bit changes are
listed. It's also not 3 but I think it's intended to be 3 and the
differences are bugs.

Assuming 3, the test shows that, for merges, the list of files both
overapproximates and underapproximates. All the cases involve file
changes not in the filelog but in the manifest (existence of file
at revision, exec bit and file vs symlink).

I didn't look at all underapproximations, but they looked minor. The
two overapproximations are problematic though because they both cause
potentially long lists of files when merging cleanly.

[1] even what it means for the merge commit itself to change a file is
not completely trivial. A file in the merge being the same as in one
of the parent is too lax as it would consider that merges change
nothing when they revert all the changes done on one side. The
criteria used in the test and in the next commit for "merge didn't
touch a file" is:

  • the parents and the merge all have the same file
  • or, one parent didn't touch the file and the other parent contains the same file as the merge

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

I know @martinvonz has been looking at files in changelogs recently. Do you have an opinion on this? It looks fine to me.

durin42 accepted this revision as: durin42.Wed, Jul 17, 6:25 PM

(Martin, this looks fine to me, if you've got no objections let's include it in 5.1)

(Martin, this looks fine to me, if you've got no objections let's include it in 5.1)

Yes, I agree. I wish there had been a clear and simple definition of what {files} should contain (as there is for {file_adds} and {file_dels} since https://www.mercurial-scm.org/repo/hg/rev/0c72eddb4be5). I spent some time trying to think of something, but I don't have a better proposal than what Valentin did in the next patch, so I think this is good. Great testing too.

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.

Thanks! I didn't expect this would make it for 5.1.