This is an archive of the discontinued Mercurial Phabricator instance.

Differential D714

tests: add test for issue5678
ClosedPublic

Authored by martinvonz on Sep 14 2017, 2:54 PM.

Details

Reviewers
quark
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHGb5d7e7d5c573: tests: add test for issue5678
Summary

In addition to a test case for the direct problem described in the bug
report, this also adds a test case showing how obsmarkers can also get
lost when not using generaldelta.

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.Sep 14 2017, 2:54 PM
quark accepted this revision.Sep 14 2017, 3:09 PM
quark added a subscriber: quark.
quark added inline comments.
tests/test-rebase-scenario-global.t
392

Maybe add {rev} so the following hg rebase -s 1 -d 2 becomes easier to read.

indygreg accepted this revision.Sep 14 2017, 3:23 PM
This revision is now accepted and ready to land.Sep 14 2017, 3:23 PM
martinvonz marked an inline comment as done.Sep 14 2017, 3:42 PM
martinvonz updated this revision to Diff 1828.Sep 14 2017, 3:42 PM
indygreg accepted this revision.Sep 14 2017, 4:05 PM
martinvonz edited the summary of this revision. (Show Details)Sep 14 2017, 4:20 PM
martinvonz updated this revision to Diff 1832.
indygreg accepted this revision.Sep 14 2017, 7:44 PM
durin42 accepted this revision.Sep 15 2017, 11:31 AM
Closed by commit rHGb5d7e7d5c573: tests: add test for issue5678 (authored by martinvonz). · Explain WhySep 15 2017, 11:35 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-scenario-global.t (34 lines)
Mtests/test-strip.t (22 lines)

Diff 1846

tests/test-rebase-scenario-global.t

$ hg rebase -s8 -d9 $ hg rebase -s8 -d9
rebasing 8:6d4f22462821 "C" rebasing 8:6d4f22462821 "C"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob) saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob)
$ hg log --template "{phase}\n" -r 'rev(9)' $ hg log --template "{phase}\n" -r 'rev(9)'
secret secret
$ cd .. $ cd ..
Check that temporary bundle doesn't lose phase when not using generaldelta
$ hg --config format.usegeneraldelta=no init issue5678
$ cd issue5678
$ grep generaldelta .hg/requires
[1]
$ echo a > a
$ hg ci -Aqm a
$ echo b > b
$ hg ci -Aqm b
$ hg co -q '.^'
$ echo c > c
$ hg ci -Aqm c
$ hg phase --public
$ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n'
quarkUnsubmitted
Done

Maybe add {rev} so the following hg rebase -s 1 -d 2 becomes easier to read.

quark: Maybe add `{rev}` so the following `hg rebase -s 1 -d 2` becomes easier to read.
@ 2:d36c public c
|
| o 1:d2ae draft b
|/
o 0:cb9a public a
$ hg rebase -s 1 -d 2
rebasing 1:d2ae7f538514 "b"
saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg (glob)
BROKEN: d36c should remain public
$ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n'
o 2:c882 draft b
|
@ 1:d36c draft c
|
o 0:cb9a public a
$ cd ..
Test for revset Test for revset
We need a bit different graph We need a bit different graph
All destination are B All destination are B
$ hg init ah $ hg init ah
$ cd ah $ cd ah
$ hg unbundle "$TESTDIR/bundles/rebase-revset.hg" $ hg unbundle "$TESTDIR/bundles/rebase-revset.hg"

tests/test-strip.t

$ hg debugobsolete $ hg debugobsolete
1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
$ cd ..
Test that obsmarkers are restored even when not using generaldelta
$ hg --config format.usegeneraldelta=no init issue5678
$ cd issue5678
$ cat >> .hg/hgrc <<EOF
> [experimental]
> evolution=all
> EOF
$ echo a > a
$ hg ci -Aqm a
$ hg ci --amend -m a2
$ hg debugobsolete
cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg strip .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob)
$ hg unbundle -q .hg/strip-backup/*
BROKEN: obsmarker got lost
$ hg debugobsolete
$ cd ..