This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12549

branchmap: add a test that shows bad interaction with strip
Needs ReviewPublic

Authored by aalekseyev on Wed, Apr 13, 9:40 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

aalekseyev created this revision.Wed, Apr 13, 9:40 AM
aalekseyev updated this revision to Diff 33162.Wed, Apr 13, 9:42 AM
Alphare requested changes to this revision.Thu, Apr 14, 4:44 AM
Alphare added a subscriber: Alphare.

Thanks for adding this test. Do you have a fix coming?

tests/test-strip-branch-cache.t
17

That doesn't seem to do anything?

60

Please add a (known-bad-output !) at the end of the line here. We add them to keep track of tests that are supposed to be broken like this one. The opposite is (missing-correct-output !), if you know what it is.

This revision now requires changes to proceed.Thu, Apr 14, 4:44 AM
aalekseyev updated this revision to Diff 33175.Thu, Apr 14, 5:44 AM
aalekseyev added a comment.Thu, Apr 14, 5:48 AM
In D12549#192062, @Alphare wrote:

Thanks for adding this test. Do you have a fix coming?

I don't have a fix at the moment, and I'm not actively working on one.
If you have some ideas on what the fix should be, please don't hesitate to share.

aalekseyev marked an inline comment as done.Thu, Apr 14, 5:48 AM
aalekseyev added inline comments.
tests/test-strip-branch-cache.t
17

Thanks. Removed.

aalekseyev marked 2 inline comments as done.Thu, Apr 14, 5:49 AM

Revision Contents
Changeset List

PathPackages
AMtests/test-strip-branch-cache.t (56 lines)

Diff 33175

tests/test-strip-branch-cache.t

  • This file was added.
Define helpers.
$ hg_log () { hg log -G -T "{rev}:{node|short}"; }
$ commit () { echo "foo - ${2:-$1}" > $1; hg commit -Aqm "Edited $1"; }
$ strip() { hg --config extensions.strip= strip -q -r "$1" ; }
Setup hg repo.
$ hg init repo
$ cd repo
$ touch x; hg add x; hg commit -m "initial"
$ hg clone -q . ../clone
$ commit a
$ cd ../clone
$ commit b
AlphareUnsubmitted
Done

That doesn't seem to do anything?

Alphare: That doesn't seem to do anything?
aalekseyevAuthorUnsubmitted
Done

Thanks. Removed.

aalekseyev: Thanks. Removed.
$ hg pull -q ../repo
$ cat .hg/cache/branch2-visible
222ae9789a75703f9836e44de7db179cbfd420ee 2
a3498d6e39376d2456425dd8c692367bdbf00fa2 o default
222ae9789a75703f9836e44de7db179cbfd420ee o default
$ hg_log
o 2:222ae9789a75
|
| @ 1:a3498d6e3937
|/
o 0:7ab0a3bd758a
$ strip '1:'
The branchmap cache is not adjusted on strip.
Now mentions a changelog entry that has been stripped.
$ cat .hg/cache/branch2-visible
222ae9789a75703f9836e44de7db179cbfd420ee 2
a3498d6e39376d2456425dd8c692367bdbf00fa2 o default
222ae9789a75703f9836e44de7db179cbfd420ee o default
$ commit c
Not adjusted on commit, either.
$ cat .hg/cache/branch2-visible
222ae9789a75703f9836e44de7db179cbfd420ee 2
a3498d6e39376d2456425dd8c692367bdbf00fa2 o default
222ae9789a75703f9836e44de7db179cbfd420ee o default
On pull we end up with the same tip, and so wrongly reuse the invalid cache and crash.
$ hg pull ../repo 2>&1 | grep 'ValueError:'
ValueError: node a3498d6e39376d2456425dd8c692367bdbf00fa2 does not exist (known-bad-output !)
AlphareUnsubmitted
Done

Please add a (known-bad-output !) at the end of the line here. We add them to keep track of tests that are supposed to be broken like this one. The opposite is (missing-correct-output !), if you know what it is.

Alphare: Please add a `(known-bad-output !)` at the end of the line here. We add them to keep track of…