( )⚙ D10136 tests: clarify some missing output in test-merge-subrepos

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10136

tests: clarify some missing output in test-merge-subrepos
ClosedPublic

Authored by SimonSapin on Mar 9 2021, 4:40 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb4ad45f2f648: tests: clarify some missing output in test-merge-subrepos
Summary

This makes the test behavior clearer, especially, why the output are
inconsistent.

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

SimonSapin created this revision.Mar 9 2021, 4:40 AM
baymax updated this revision to Diff 26195.Mar 9 2021, 8:40 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a subscriber: marmoute.Mar 9 2021, 1:17 PM

I would approve this if I did not wrote it myself :-D

Alphare requested changes to this revision.Mar 10 2021, 3:48 AM
Alphare added a subscriber: Alphare.

In status semantics, deleted is the same as missing, and you've listed them as removed. I think this is the correct output, but the comment is confusing.

This revision now requires changes to proceed.Mar 10 2021, 3:48 AM
marmoute added a comment.Mar 12 2021, 11:50 AM
In D10136#154195, @Alphare wrote:

In status semantics, deleted is the same as missing, and you've listed them as removed. I think this is the correct output, but the comment is confusing.

The test itself is confusing because the update seems to upgrade the initially missing file to removed. This is fairly strange but not the core issue here. So when this eventually get fixed, I expect the fixer to sort the missing/deleted situation themself.

Alphare accepted this revision.Mar 12 2021, 11:52 AM
This revision now requires review to proceed.Mar 12 2021, 11:52 AM
baymax updated this revision to Diff 26342.Mar 15 2021, 9:10 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGb4ad45f2f648: tests: clarify some missing output in test-merge-subrepos.Mar 16 2021, 5:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb4ad45f2f648: tests: clarify some missing output in test-merge-subrepos (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-subrepos.t (9 lines)

Diff 26419

tests/test-merge-subrepos.t

> d > d
> EOF > EOF
file 'b' was deleted in local [working copy] but was modified in other [destination]. file 'b' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? d What do you want to do? d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
XXX: There's a difference between wdir() and '.', so there should be a status. XXX: There's a difference between wdir() and '.', so there should be a status.
`hg files -S` from the top is also missing 'subrepo/b'. `hg files -S` from the top is also missing 'subrepo/b'. The files should be
seen as deleted (and, maybe even missing? in which case `hg files` should list
it)
$ hg st -S $ hg st -S
R subrepo/b (missing-correct-output !)
$ hg st -R subrepo $ hg st -R subrepo
R subrepo/b (missing-correct-output !)
(note: return [1] because no files "match" since the list is empty)
$ hg files -R subrepo $ hg files -R subrepo
[1] [1]
$ hg files -R subrepo -r '.' $ hg files -R subrepo -r '.'
subrepo/b subrepo/b
$ hg bookmark -r tip @other $ hg bookmark -r tip @other
$ echo xyz > subrepo/c $ echo xyz > subrepo/c
$ hg ci -SAm 'add c' $ hg ci -SAm 'add c'