test-obsolete.t
797 lines
| 28.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-obsolete.t
|
r17171 | $ cat >> $HGRCPATH << EOF | ||
> [phases] | ||||
> # public changeset are not obsolete | ||||
> publish=false | ||||
|
r21978 | > [ui] | ||
> logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" | ||||
|
r17171 | > EOF | ||
|
r17071 | $ mkcommit() { | ||
> echo "$1" > "$1" | ||||
> hg add "$1" | ||||
> hg ci -m "add $1" | ||||
> } | ||||
$ getid() { | ||||
|
r24162 | > hg log -T "{node}\n" --hidden -r "desc('$1')" | ||
|
r17071 | > } | ||
|
r17252 | $ cat > debugkeys.py <<EOF | ||
> def reposetup(ui, repo): | ||||
> class debugkeysrepo(repo.__class__): | ||||
> def listkeys(self, namespace): | ||||
> ui.write('listkeys %s\n' % (namespace,)) | ||||
> return super(debugkeysrepo, self).listkeys(namespace) | ||||
> | ||||
> if repo.local(): | ||||
> repo.__class__ = debugkeysrepo | ||||
> EOF | ||||
|
r17071 | |||
$ hg init tmpa | ||||
$ cd tmpa | ||||
|
r17296 | $ mkcommit kill_me | ||
Checking that the feature is properly disabled | ||||
$ hg debugobsolete -d '0 0' `getid kill_me` -u babar | ||||
|
r22950 | abort: creating obsolete markers is not enabled on this repo | ||
|
r17296 | [255] | ||
Enabling it | ||||
|
r22955 | $ cat >> $HGRCPATH << EOF | ||
> [experimental] | ||||
> evolution=createmarkers,exchange | ||||
|
r17296 | > EOF | ||
|
r17071 | |||
Killing a single changeset without replacement | ||||
|
r17292 | $ hg debugobsolete 0 | ||
abort: changeset references must be full hexadecimal node identifiers | ||||
[255] | ||||
$ hg debugobsolete '00' | ||||
abort: changeset references must be full hexadecimal node identifiers | ||||
[255] | ||||
|
r17071 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | ||
|
r17074 | $ hg debugobsolete | ||
|
r22220 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | ||
|
r18464 | |||
(test that mercurial is not confused) | ||||
$ hg up null --quiet # having 0 as parent prevents it to be hidden | ||||
$ hg tip | ||||
|
r21978 | -1:000000000000 (public) [tip ] | ||
|
r18464 | $ hg up --hidden tip --quiet | ||
|
r22177 | |||
Killing a single changeset with itself should fail | ||||
(simple local safeguard) | ||||
$ hg debugobsolete `getid kill_me` `getid kill_me` | ||||
abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 | ||||
[255] | ||||
|
r17071 | $ cd .. | ||
Killing a single changeset with replacement | ||||
|
r22948 | (and testing the format option) | ||
|
r17071 | |||
$ hg init tmpb | ||||
$ cd tmpb | ||||
$ mkcommit a | ||||
$ mkcommit b | ||||
$ mkcommit original_c | ||||
$ hg up "desc('b')" | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit new_c | ||||
created new head | ||||
|
r17390 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | ||
|
r23094 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | ||
|
r17390 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | ||
2:245bde4270cd add original_c | ||||
|
r21033 | $ hg debugrevlog -cd | ||
|
r22311 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen | ||
0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 | ||||
1 0 -1 59 118 59 59 0 0 58 116 0 1 0 | ||||
|
r23285 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 | ||
3 1 -1 193 260 193 193 59 0 66 258 0 2 0 | ||||
|
r17074 | $ hg debugobsolete | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r17071 | |||
|
r22948 | (check for version number of the obsstore) | ||
$ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null | ||||
\x00 (no-eol) (esc) | ||||
|
r17071 | do it again (it read the obsstore before adding new changeset) | ||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit new_2_c | ||||
created new head | ||||
$ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | ||||
|
r17074 | $ hg debugobsolete | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
|
r17071 | |||
Register two markers with a missing node | ||||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ mkcommit new_3_c | ||||
created new head | ||||
$ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | ||||
$ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | ||||
|
r17074 | $ hg debugobsolete | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
|
r17075 | |||
|
r17774 | Refuse pathological nullid successors | ||
$ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | ||||
transaction abort! | ||||
rollback completed | ||||
abort: bad obsolescence marker detected: invalid successors nullid | ||||
[255] | ||||
|
r17119 | Check that graphlog detect that a changeset is obsolete: | ||
|
r20117 | $ hg log -G | ||
|
r21978 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
|
r17119 | | | ||
|
r21978 | o 1:7c3bad9141dc (draft) [ ] add b | ||
|
r17119 | | | ||
|
r21978 | o 0:1f0dee641bb7 (draft) [ ] add a | ||
|
r17119 | |||
|
r18268 | check that heads does not report them | ||
$ hg heads | ||||
|
r21978 | 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
|
r18268 | $ hg heads --hidden | ||
|
r21978 | 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
4:ca819180edb9 (draft) [ ] add new_2_c | ||||
3:cdbce2fbb163 (draft) [ ] add new_c | ||||
2:245bde4270cd (draft) [ ] add original_c | ||||
|
r18268 | |||
check that summary does not report them | ||||
$ hg init ../sink | ||||
$ echo '[paths]' >> .hg/hgrc | ||||
$ echo 'default=../sink' >> .hg/hgrc | ||||
$ hg summary --remote | ||||
parent: 5:5601fb93a350 tip | ||||
add new_3_c | ||||
branch: default | ||||
commit: (clean) | ||||
update: (current) | ||||
remote: 3 outgoing | ||||
$ hg summary --remote --hidden | ||||
parent: 5:5601fb93a350 tip | ||||
add new_3_c | ||||
branch: default | ||||
commit: (clean) | ||||
update: 3 new changesets, 4 branch heads (merge) | ||||
remote: 3 outgoing | ||||
|
r18423 | check that various commands work well with filtering | ||
$ hg tip | ||||
|
r21978 | 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
|
r18423 | $ hg log -r 6 | ||
abort: unknown revision '6'! | ||||
[255] | ||||
$ hg log -r 4 | ||||
|
r23046 | abort: hidden revision '4'! | ||
(use --hidden to access hidden revisions) | ||||
|
r18423 | [255] | ||
|
r23062 | $ hg debugrevspec 'rev(6)' | ||
$ hg debugrevspec 'rev(4)' | ||||
|
r24204 | $ hg debugrevspec 'null' | ||
-1 | ||||
|
r18423 | |||
|
r17119 | Check that public changeset are not accounted as obsolete: | ||
|
r18267 | $ hg --hidden phase --public 2 | ||
|
r20117 | $ hg log -G | ||
|
r21978 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
|
r17119 | | | ||
|
r21978 | | o 2:245bde4270cd (public) [ ] add original_c | ||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
|
r17119 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17119 | |||
|
r17829 | And that bumped changeset are detected | ||
-------------------------------------- | ||||
If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | ||||
note that the bumped changeset (5:5601fb93a350) is not a direct successor of | ||||
the public changeset | ||||
$ hg log --hidden -r 'bumped()' | ||||
|
r21978 | 5:5601fb93a350 (draft) [tip ] add new_3_c | ||
|
r17829 | |||
|
r17834 | And that we can't push bumped changeset | ||
|
r18085 | $ hg push ../tmpa -r 0 --force #(make repo related) | ||
|
r18015 | pushing to ../tmpa | ||
searching for changes | ||||
|
r18104 | warning: repository is unrelated | ||
|
r18015 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r17834 | $ hg push ../tmpa | ||
pushing to ../tmpa | ||||
searching for changes | ||||
abort: push includes bumped changeset: 5601fb93a350! | ||||
[255] | ||||
|
r17831 | Fixing "bumped" situation | ||
We need to create a clone of 5 and add a special marker with a flag | ||||
$ hg up '5^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg revert -ar 5 | ||||
adding new_3_c | ||||
$ hg ci -m 'add n3w_3_c' | ||||
created new head | ||||
$ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | ||||
$ hg log -r 'bumped()' | ||||
$ hg log -G | ||||
|
r21978 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | ||
|
r17831 | | | ||
|
r21978 | | o 2:245bde4270cd (public) [ ] add original_c | ||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
|
r17831 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17831 | |||
|
r17075 | $ cd .. | ||
Exchange Test | ||||
============================ | ||||
Destination repo does not have any data | ||||
--------------------------------------- | ||||
|
r18493 | Simple incoming test | ||
$ hg init tmpc | ||||
$ cd tmpc | ||||
$ hg incoming ../tmpb | ||||
comparing with ../tmpb | ||||
|
r21978 | 0:1f0dee641bb7 (public) [ ] add a | ||
1:7c3bad9141dc (public) [ ] add b | ||||
2:245bde4270cd (public) [ ] add original_c | ||||
6:6f9641995072 (draft) [tip ] add n3w_3_c | ||||
|
r18493 | |||
|
r17075 | Try to pull markers | ||
|
r17206 | (extinct changeset are excluded but marker are pushed) | ||
|
r17075 | |||
$ hg pull ../tmpb | ||||
pulling from ../tmpb | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r17206 | added 4 changesets with 4 changes to 4 files (+1 heads) | ||
|
r17075 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg debugobsolete | ||||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r17126 | |||
Rollback//Transaction support | ||||
$ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | ||||
$ hg debugobsolete | ||||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} | ||||
|
r17126 | $ hg rollback -n | ||
|
r17206 | repository tip rolled back to revision 3 (undo debugobsolete) | ||
|
r17126 | $ hg rollback | ||
|
r17206 | repository tip rolled back to revision 3 (undo debugobsolete) | ||
|
r17126 | $ hg debugobsolete | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r17075 | |||
$ cd .. | ||||
|
r18492 | Try to push markers | ||
|
r17075 | |||
$ hg init tmpd | ||||
$ hg -R tmpb push tmpd | ||||
pushing to tmpd | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r17169 | added 4 changesets with 4 changes to 4 files (+1 heads) | ||
|
r22349 | $ hg -R tmpd debugobsolete | sort | ||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22349 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
|
r17075 | |||
|
r17252 | Check obsolete keys are exchanged only if source has an obsolete store | ||
$ hg init empty | ||||
$ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | ||||
pushing to tmpd | ||||
|
r22019 | listkeys phases | ||
|
r22239 | listkeys bookmarks | ||
|
r17252 | no changes found | ||
listkeys phases | ||||
[1] | ||||
|
r17249 | clone support | ||
(markers are copied and extinct changesets are included to allow hardlinks) | ||||
$ hg clone tmpb clone-dest | ||||
updating to branch default | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R clone-dest log -G --hidden | ||||
|
r21978 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | ||
|
r17249 | | | ||
|
r21978 | | x 5:5601fb93a350 (draft) [ ] add new_3_c | ||
|/ | ||||
| x 4:ca819180edb9 (draft) [ ] add new_2_c | ||||
|/ | ||||
| x 3:cdbce2fbb163 (draft) [ ] add new_c | ||||
|/ | ||||
| o 2:245bde4270cd (public) [ ] add original_c | ||||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
|
r17249 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17249 | |||
$ hg -R clone-dest debugobsolete | ||||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r17249 | |||
|
r17075 | |||
Destination repo have existing data | ||||
--------------------------------------- | ||||
On pull | ||||
$ hg init tmpe | ||||
$ cd tmpe | ||||
|
r22348 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | ||
|
r17075 | $ hg pull ../tmpb | ||
pulling from ../tmpb | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r17206 | added 4 changesets with 4 changes to 4 files (+1 heads) | ||
|
r17075 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg debugobsolete | ||||
|
r22348 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r17075 | |||
|
r17171 | |||
|
r17075 | On push | ||
$ hg push ../tmpc | ||||
pushing to ../tmpc | ||||
searching for changes | ||||
no changes found | ||||
[1] | ||||
$ hg -R ../tmpc debugobsolete | ||||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22220 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
|
r22348 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||
|
r17171 | |||
detect outgoing obsolete and unstable | ||||
--------------------------------------- | ||||
|
r17206 | |||
|
r20117 | $ hg log -G | ||
|
r21978 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c | ||
|
r17171 | | | ||
|
r21978 | | o 2:245bde4270cd (public) [ ] add original_c | ||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
|
r17171 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17171 | |||
|
r17831 | $ hg up 'desc("n3w_3_c")' | ||
|
r17206 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r17171 | $ mkcommit original_d | ||
|
r17206 | $ mkcommit original_e | ||
|
r22272 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | ||
$ hg debugobsolete | grep `getid original_d` | ||||
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
|
r17206 | $ hg log -r 'obsolete()' | ||
|
r21978 | 4:94b33453f93b (draft) [ ] add original_d | ||
|
r20117 | $ hg log -G -r '::unstable()' | ||
|
r21978 | @ 5:cda648ca50f5 (draft) [tip ] add original_e | ||
| | ||||
x 4:94b33453f93b (draft) [ ] add original_d | ||||
|
r17206 | | | ||
|
r21978 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | ||
|
r17171 | | | ||
|
r21978 | o 1:7c3bad9141dc (public) [ ] add b | ||
|
r17171 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17171 | |||
|
r17206 | |||
refuse to push obsolete changeset | ||||
$ hg push ../tmpc/ -r 'desc("original_d")' | ||||
pushing to ../tmpc/ | ||||
searching for changes | ||||
|
r17833 | abort: push includes obsolete changeset: 94b33453f93b! | ||
|
r17206 | [255] | ||
refuse to push unstable changeset | ||||
|
r17172 | $ hg push ../tmpc/ | ||
pushing to ../tmpc/ | ||||
searching for changes | ||||
|
r17833 | abort: push includes unstable changeset: cda648ca50f5! | ||
|
r17172 | [255] | ||
|
r17173 | |||
Test that extinct changeset are properly detected | ||||
$ hg log -r 'extinct()' | ||||
|
r17206 | |||
Don't try to push extinct changeset | ||||
$ hg init ../tmpf | ||||
$ hg out ../tmpf | ||||
comparing with ../tmpf | ||||
searching for changes | ||||
|
r21978 | 0:1f0dee641bb7 (public) [ ] add a | ||
1:7c3bad9141dc (public) [ ] add b | ||||
2:245bde4270cd (public) [ ] add original_c | ||||
3:6f9641995072 (draft) [ ] add n3w_3_c | ||||
4:94b33453f93b (draft) [ ] add original_d | ||||
5:cda648ca50f5 (draft) [tip ] add original_e | ||||
|
r17206 | $ hg push ../tmpf -f # -f because be push unstable too | ||
pushing to ../tmpf | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 6 changesets with 6 changes to 6 files (+1 heads) | ||||
no warning displayed | ||||
$ hg push ../tmpf | ||||
pushing to ../tmpf | ||||
searching for changes | ||||
no changes found | ||||
[1] | ||||
|
r17214 | |||
Do not warn about new head when the new head is a successors of a remote one | ||||
|
r20117 | $ hg log -G | ||
|
r21978 | @ 5:cda648ca50f5 (draft) [tip ] add original_e | ||
|
r17214 | | | ||
|
r21978 | x 4:94b33453f93b (draft) [ ] add original_d | ||
| | ||||
o 3:6f9641995072 (draft) [ ] add n3w_3_c | ||||
|
r17214 | | | ||
|
r21978 | | o 2:245bde4270cd (public) [ ] add original_c | ||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
|
r17214 | | | ||
|
r21978 | o 0:1f0dee641bb7 (public) [ ] add a | ||
|
r17214 | |||
|
r17831 | $ hg up -q 'desc(n3w_3_c)' | ||
|
r17214 | $ mkcommit obsolete_e | ||
created new head | ||||
$ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` | ||||
|
r18493 | $ hg outgoing ../tmpf # parasite hg outgoing testin | ||
comparing with ../tmpf | ||||
searching for changes | ||||
|
r21978 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e | ||
|
r17214 | $ hg push ../tmpf | ||
pushing to ../tmpf | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r17297 | |||
|
r22274 | test relevance computation | ||
--------------------------------------- | ||||
Checking simple case of "marker relevance". | ||||
Reminder of the repo situation | ||||
$ hg log --hidden --graph | ||||
@ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | ||||
| | ||||
| x 5:cda648ca50f5 (draft) [ ] add original_e | ||||
| | | ||||
| x 4:94b33453f93b (draft) [ ] add original_d | ||||
|/ | ||||
o 3:6f9641995072 (draft) [ ] add n3w_3_c | ||||
| | ||||
| o 2:245bde4270cd (public) [ ] add original_c | ||||
|/ | ||||
o 1:7c3bad9141dc (public) [ ] add b | ||||
| | ||||
o 0:1f0dee641bb7 (public) [ ] add a | ||||
List of all markers | ||||
$ hg debugobsolete | ||||
|
r22348 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22274 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | ||||
List of changesets with no chain | ||||
$ hg debugobsolete --hidden --rev ::2 | ||||
List of changesets that are included on marker chain | ||||
$ hg debugobsolete --hidden --rev 6 | ||||
cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | ||||
List of changesets with a longer chain, (including a pruned children) | ||||
$ hg debugobsolete --hidden --rev 3 | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
|
r22348 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22274 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||||
List of both | ||||
$ hg debugobsolete --hidden --rev 3::6 | ||||
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||||
|
r22348 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | ||
|
r23094 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | ||
|
r22274 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | ||||
cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | ||||
cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | ||||
|
r18506 | #if serve | ||
|
r18401 | check hgweb does not explode | ||
==================================== | ||||
$ hg unbundle $TESTDIR/bundles/hgweb+obs.hg | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 62 changesets with 63 changes to 9 files (+60 heads) | ||||
(run 'hg heads .' to see heads, 'hg merge' to merge) | ||||
$ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | ||||
> do | ||||
> hg debugobsolete $node | ||||
> done | ||||
$ hg up tip | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
|
r18426 | check changelog view | ||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'shortlog/' | ||||
200 Script output follows | ||||
|
r18401 | |||
|
r18428 | check graph view | ||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'graph' | ||||
200 Script output follows | ||||
|
r18401 | check filelog view | ||
|
r24162 | $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | ||
|
r18401 | 200 Script output follows | ||
|
r18522 | |||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/68' | ||||
200 Script output follows | ||||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67' | ||||
|
r18532 | 404 Not Found | ||
|
r18522 | [1] | ||
check that web.view config option: | ||||
|
r18596 | $ "$TESTDIR/killdaemons.py" hg.pid | ||
|
r18522 | $ cat >> .hg/hgrc << EOF | ||
> [web] | ||||
> view=all | ||||
> EOF | ||||
$ wait | ||||
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67' | ||||
200 Script output follows | ||||
|
r18596 | $ "$TESTDIR/killdaemons.py" hg.pid | ||
|
r18401 | |||
|
r17306 | Checking _enable=False warning if obsolete marker exists | ||
|
r17297 | |||
|
r22955 | $ echo '[experimental]' >> $HGRCPATH | ||
$ echo "evolution=" >> $HGRCPATH | ||||
|
r17297 | $ hg log -r tip | ||
|
r18401 | obsolete feature not enabled but 68 markers found! | ||
|
r21978 | 68:c15e9edfca13 (draft) [tip ] add celestine | ||
|
r18568 | |||
reenable for later test | ||||
|
r22955 | $ echo '[experimental]' >> $HGRCPATH | ||
$ echo "evolution=createmarkers,exchange" >> $HGRCPATH | ||||
|
r18568 | |||
|
r18506 | #endif | ||
|
r18568 | |||
Test incoming/outcoming with changesets obsoleted remotely, known locally | ||||
=============================================================================== | ||||
This test issue 3805 | ||||
$ hg init repo-issue3805 | ||||
$ cd repo-issue3805 | ||||
$ echo "foo" > foo | ||||
$ hg ci -Am "A" | ||||
adding foo | ||||
$ hg clone . ../other-issue3805 | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo "bar" >> foo | ||||
$ hg ci --amend | ||||
$ cd ../other-issue3805 | ||||
$ hg log -G | ||||
|
r21978 | @ 0:193e9254ce7e (draft) [tip ] A | ||
|
r18568 | |||
$ hg log -G -R ../repo-issue3805 | ||||
|
r21978 | @ 2:3816541e5485 (draft) [tip ] A | ||
|
r18568 | |||
$ hg incoming | ||||
|
r18679 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | ||
|
r18568 | searching for changes | ||
|
r21978 | 2:3816541e5485 (draft) [tip ] A | ||
|
r18568 | $ hg incoming --bundle ../issue3805.hg | ||
|
r18679 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | ||
|
r18568 | searching for changes | ||
|
r21978 | 2:3816541e5485 (draft) [tip ] A | ||
|
r18568 | $ hg outgoing | ||
|
r18679 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | ||
|
r18568 | searching for changes | ||
no changes found | ||||
[1] | ||||
#if serve | ||||
$ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
$ hg incoming http://localhost:$HGPORT | ||||
comparing with http://localhost:$HGPORT/ | ||||
searching for changes | ||||
|
r23632 | 1:3816541e5485 (draft) [tip ] A | ||
|
r18568 | $ hg outgoing http://localhost:$HGPORT | ||
comparing with http://localhost:$HGPORT/ | ||||
searching for changes | ||||
no changes found | ||||
[1] | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | ||||
#endif | ||||
|
r18617 | |||
This test issue 3814 | ||||
(nothing to push but locally hidden changeset) | ||||
$ cd .. | ||||
$ hg init repo-issue3814 | ||||
$ cd repo-issue3805 | ||||
$ hg push -r 3816541e5485 ../repo-issue3814 | ||||
pushing to ../repo-issue3814 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
$ hg out ../repo-issue3814 | ||||
comparing with ../repo-issue3814 | ||||
searching for changes | ||||
no changes found | ||||
[1] | ||||
|
r20807 | Test that a local tag blocks a changeset from being hidden | ||
|
r18617 | |||
|
r20807 | $ hg tag -l visible -r 0 --hidden | ||
$ hg log -G | ||||
|
r21978 | @ 2:3816541e5485 (draft) [tip ] A | ||
|
r20807 | |||
|
r21978 | x 0:193e9254ce7e (draft) [visible ] A | ||
|
r20807 | |||
|
r21823 | Test that removing a local tag does not cause some commands to fail | ||
$ hg tag -l -r tip tiptag | ||||
$ hg tags | ||||
tiptag 2:3816541e5485 | ||||
tip 2:3816541e5485 | ||||
visible 0:193e9254ce7e | ||||
$ hg --config extensions.strip= strip -r tip --no-backup | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg tags | ||||
visible 0:193e9254ce7e | ||||
tip 0:193e9254ce7e | ||||
|
r24113 | |||
|
r24136 | #if serve | ||
Test issue 4506 | ||||
$ cd .. | ||||
$ hg init repo-issue4506 | ||||
$ cd repo-issue4506 | ||||
$ echo "0" > foo | ||||
$ hg add foo | ||||
$ hg ci -m "content-0" | ||||
$ hg up null | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "1" > bar | ||||
$ hg add bar | ||||
$ hg ci -m "content-1" | ||||
created new head | ||||
$ hg up 0 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg graft 1 | ||||
grafting 1:1c9eddb02162 "content-1" (tip) | ||||
$ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | ||||
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/1' | ||||
404 Not Found | ||||
[1] | ||||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'file/tip/bar' | ||||
200 Script output follows | ||||
$ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'annotate/tip/bar' | ||||
200 Script output follows | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | ||||
#endif | ||||