dirstate: factor out the part retrieve "filedata" out of `normal`
We will need them elsewhere.
Differential Revision: https://phab.mercurial-scm.org/D11132
$ hg init repo
$ cd repo
$ cat > $TESTTMP/hook.sh <<'EOF'
> echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"
> EOF
$ TESTHOOK="hooks.txnclose-bookmark.test=sh $TESTTMP/hook.sh"
no bookmarks
$ hg bookmarks
no bookmarks set
$ hg bookmarks -Tjson
[
]
bookmark rev -1
$ hg bookmark X --config "$TESTHOOK"
test-hook-bookmark: X: -> 0000000000000000000000000000000000000000
list bookmarks
$ hg bookmarks
* X -1:000000000000
list bookmarks with color
$ hg --config extensions.color= --config color.mode=ansi \
> bookmarks --color=always
\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
$ echo a > a
$ hg add a
$ hg commit -m 0 --config "$TESTHOOK"
test-hook-bookmark: X: 0000000000000000000000000000000000000000 -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
bookmark X moved to rev 0
$ hg bookmarks
* X 0:f7b1eb17ad24
look up bookmark
$ hg log -r X
changeset: 0:f7b1eb17ad24
bookmark: X
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
second bookmark for rev 0, command should work even with ui.strict on
$ hg --config ui.strict=1 bookmark X2 --config "$TESTHOOK"
test-hook-bookmark: X2: -> f7b1eb17ad24730a1651fccd46c43826d1bbc2ac
bookmark rev -1 again
$ hg bookmark -r null Y
list bookmarks
$ hg bookmarks
X 0:f7b1eb17ad24
* X2 0:f7b1eb17ad24
Y -1:000000000000
$ hg bookmarks -l
X 0:f7b1eb17ad24
* X2 0:f7b1eb17ad24
Y -1:000000000000
$ hg bookmarks -l X Y
X 0:f7b1eb17ad24
Y -1:000000000000
$ hg bookmarks -l .
* X2 0:f7b1eb17ad24
$ hg bookmarks -l X A Y
abort: bookmark 'A' does not exist
[10]
$ hg bookmarks -l -r0
abort: cannot specify both --list and --rev
[10]
$ hg bookmarks -l --inactive
abort: cannot specify both --inactive and --list
[10]
$ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
0 X
0 X2
$ echo b > b
$ hg add b
$ hg commit -m 1 --config "$TESTHOOK"
test-hook-bookmark: X2: f7b1eb17ad24730a1651fccd46c43826d1bbc2ac -> 925d80f479bb026b0fb3deb27503780b13f74123
$ hg bookmarks -T '{rev}:{node|shortest} {bookmark} {desc|firstline}\n'
0:f7b1 X 0
1:925d X2 1
-1:0000 Y
$ hg bookmarks -Tjson
[
{
"active": false,
"bookmark": "X",
"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
"rev": 0
},
{
"active": true,
"bookmark": "X2",
"node": "925d80f479bb026b0fb3deb27503780b13f74123",
"rev": 1
},
{
"active": false,
"bookmark": "Y",
"node": "0000000000000000000000000000000000000000",
"rev": -1
}
]
bookmarks revset
$ hg log -r 'bookmark()'
changeset: 0:f7b1eb17ad24
bookmark: X
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
changeset: 1:925d80f479bb
bookmark: X2
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg log -r 'bookmark(Y)'
$ hg log -r 'bookmark(X2)'
changeset: 1:925d80f479bb
bookmark: X2
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg log -r 'bookmark("re:X")'
changeset: 0:f7b1eb17ad24
bookmark: X
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
changeset: 1:925d80f479bb
bookmark: X2
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg log -r 'bookmark("literal:X")'
changeset: 0:f7b1eb17ad24
bookmark: X
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
"." is expanded to the active bookmark:
$ hg log -r 'bookmark(.)'
changeset: 1:925d80f479bb
bookmark: X2
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
but "literal:." is not since "." seems not a literal bookmark:
$ hg log -r 'bookmark("literal:.")'
abort: bookmark '.' does not exist
[255]
"." should fail if there's no active bookmark:
$ hg bookmark --inactive
$ hg log -r 'bookmark(.)'
abort: no active bookmark
[255]
$ hg log -r 'present(bookmark(.))'
$ hg log -r 'bookmark(unknown)'
abort: bookmark 'unknown' does not exist
[255]
$ hg log -r 'bookmark("literal:unknown")'
abort: bookmark 'unknown' does not exist
[255]
$ hg log -r 'bookmark("re:unknown")'
$ hg log -r 'present(bookmark("literal:unknown"))'
$ hg log -r 'present(bookmark("re:unknown"))'
$ hg help revsets | grep 'bookmark('
"bookmark([name])"
reactivate "X2"
$ hg update X2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark X2)
bookmarks X and X2 moved to rev 1, Y at rev -1
$ hg bookmarks
X 0:f7b1eb17ad24
* X2 1:925d80f479bb
Y -1:000000000000
bookmark rev 0 again
$ hg bookmark -r 0 Z
$ hg update X
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark X)
$ echo c > c
$ hg add c
$ hg commit -m 2
created new head
bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
$ hg bookmarks
* X 2:db815d6d32e6
X2 1:925d80f479bb
Y -1:000000000000
Z 0:f7b1eb17ad24
rename nonexistent bookmark
$ hg bookmark -m A B
abort: bookmark 'A' does not exist
[10]
rename to existent bookmark
$ hg bookmark -m X Y
abort: bookmark 'Y' already exists (use -f to force)
[255]
force rename to existent bookmark
$ hg bookmark -f -m X Y
rename bookmark using .
$ hg book rename-me
$ hg book -m . renamed --config "$TESTHOOK"
test-hook-bookmark: rename-me: db815d6d32e69058eadefc8cffbad37675707975 ->
test-hook-bookmark: renamed: -> db815d6d32e69058eadefc8cffbad37675707975
$ hg bookmark
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
* renamed 2:db815d6d32e6
$ hg up -q Y
$ hg book -d renamed --config "$TESTHOOK"
test-hook-bookmark: renamed: db815d6d32e69058eadefc8cffbad37675707975 ->
rename bookmark using . with no active bookmark
$ hg book rename-me
$ hg book -i rename-me
$ hg book -m . renamed
abort: no active bookmark
[255]
$ hg up -q Y
$ hg book -d rename-me
delete bookmark using .
$ hg book delete-me
$ hg book -d .
$ hg bookmark
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
$ hg up -q Y
delete bookmark using . with no active bookmark
$ hg book delete-me
$ hg book -i delete-me
$ hg book -d .
abort: no active bookmark
[255]
$ hg up -q Y
$ hg book -d delete-me
list bookmarks
$ hg bookmark
X2 1:925d80f479bb
* Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
bookmarks from a revset
$ hg bookmark -r '.^1' REVSET
$ hg bookmark -r ':tip' TIP
$ hg up -q TIP
$ hg bookmarks
REVSET 0:f7b1eb17ad24
* TIP 2:db815d6d32e6
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
$ hg bookmark -d REVSET
$ hg bookmark -d TIP
rename without new name or multiple names
$ hg bookmark -m Y
abort: new bookmark name required
[10]
$ hg bookmark -m Y Y2 Y3
abort: only one new bookmark name allowed
[10]
delete without name
$ hg bookmark -d
abort: bookmark name required
[10]
delete nonexistent bookmark
$ hg bookmark -d A
abort: bookmark 'A' does not exist
[10]
delete with --inactive
$ hg bookmark -d --inactive Y
abort: cannot specify both --inactive and --delete
[10]
bookmark name with spaces should be stripped
$ hg bookmark ' x y '
list bookmarks
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
* x y 2:db815d6d32e6
$ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
2 Y
2 x y
1 X2
0 Z
look up stripped bookmark name
$ hg log -r '"x y"'
changeset: 2:db815d6d32e6
bookmark: Y
bookmark: x y
tag: tip
parent: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
reject bookmark name with newline
$ hg bookmark '
> '
abort: bookmark names cannot consist entirely of whitespace
[10]
$ hg bookmark -m Z '
> '
abort: bookmark names cannot consist entirely of whitespace
[10]
bookmark with reserved name
$ hg bookmark tip
abort: the name 'tip' is reserved
[10]
$ hg bookmark .
abort: the name '.' is reserved
[10]
$ hg bookmark null
abort: the name 'null' is reserved
[10]
bookmark with existing name
$ hg bookmark X2
abort: bookmark 'X2' already exists (use -f to force)
[255]
$ hg bookmark -m Y Z
abort: bookmark 'Z' already exists (use -f to force)
[255]
bookmark with name of branch
$ hg bookmark default
abort: a bookmark cannot have the name of an existing branch
[255]
$ hg bookmark -m Y default
abort: a bookmark cannot have the name of an existing branch
[255]
bookmark with integer name
$ hg bookmark 10
abort: cannot use an integer as a name
[10]
bookmark with a name that matches a node id
$ hg bookmark 925d80f479bb db815d6d32e6 --config "$TESTHOOK"
bookmark 925d80f479bb matches a changeset hash
(did you leave a -r out of an 'hg bookmark' command?)
bookmark db815d6d32e6 matches a changeset hash
(did you leave a -r out of an 'hg bookmark' command?)
test-hook-bookmark: 925d80f479bb: -> db815d6d32e69058eadefc8cffbad37675707975
test-hook-bookmark: db815d6d32e6: -> db815d6d32e69058eadefc8cffbad37675707975
$ hg bookmark -d 925d80f479bb
$ hg bookmark -d db815d6d32e6
$ cd ..
bookmark with a name that matches an ambiguous node id
$ hg init ambiguous
$ cd ambiguous
$ echo 0 > a
$ hg ci -qAm 0
$ for i in 1057 2857 4025; do
> hg up -q 0
> echo $i > a
> hg ci -qm $i
> done
$ hg up -q null
$ hg log -r0: -T '{rev}:{node}\n'
0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
1:c56256a09cd28e5764f32e8e2810d0f01e2e357a
2:c5623987d205cd6d9d8389bfc40fff9dbb670b48
3:c562ddd9c94164376c20b86b0b4991636a3bf84f
$ hg bookmark -r0 c562
$ hg bookmarks
c562 0:b4e73ffab476
$ cd ..
incompatible options
$ cd repo
$ hg bookmark -m Y -d Z
abort: cannot specify both --delete and --rename
[10]
$ hg bookmark -r 1 -d Z
abort: cannot specify both --delete and --rev
[10]
$ hg bookmark -r 1 -m Z Y
abort: cannot specify both --rename and --rev
[10]
force bookmark with existing name
$ hg bookmark -f X2 --config "$TESTHOOK"
test-hook-bookmark: X2: 925d80f479bb026b0fb3deb27503780b13f74123 -> db815d6d32e69058eadefc8cffbad37675707975
force bookmark back to where it was, should deactivate it
$ hg bookmark -fr1 X2
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
x y 2:db815d6d32e6
forward bookmark to descendant without --force
$ hg bookmark Z
moving bookmark 'Z' forward from f7b1eb17ad24
list bookmarks
$ hg bookmark
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
2 Y
2 Z
2 x y
1 X2
revision but no bookmark name
$ hg bookmark -r .
abort: bookmark name required
[10]
bookmark name with whitespace only
$ hg bookmark ' '
abort: bookmark names cannot consist entirely of whitespace
[10]
$ hg bookmark -m Y ' '
abort: bookmark names cannot consist entirely of whitespace
[10]
invalid bookmark
$ hg bookmark 'foo:bar'
abort: ':' cannot be used in a name
[10]
$ hg bookmark 'foo
> bar'
abort: '\n' cannot be used in a name
[10]
the bookmark extension should be ignored now that it is part of core
$ echo "[extensions]" >> $HGRCPATH
$ echo "bookmarks=" >> $HGRCPATH
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
test summary
$ hg summary
parent: 2:db815d6d32e6 tip
2
branch: default
bookmarks: *Z Y x y
commit: (clean)
update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft
test id
$ hg id
db815d6d32e6 tip Y/Z/x y
test rollback
$ echo foo > f1
$ hg bookmark tmp-rollback
$ hg ci -Amr
adding f1
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
* tmp-rollback 3:2bf5cfec5864
x y 2:db815d6d32e6
$ hg rollback
repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
* tmp-rollback 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg bookmark -f Z -r 1
$ hg rollback
repository tip rolled back to revision 2 (undo bookmark)
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
* tmp-rollback 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg bookmark -d tmp-rollback
activate bookmark on working dir parent without --force
$ hg bookmark --inactive Z
$ hg bookmark Z
deactivate current 'Z', but also add 'Y'
$ hg bookmark -d Y
$ hg bookmark --inactive Z Y
$ hg bookmark -l
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg bookmark Z
bookmark wdir to activate it (issue6218)
$ hg bookmark -d Z
$ hg bookmark -r 'wdir()' Z
$ hg bookmark -l
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
test clone
$ hg bookmark -r 2 -i @
$ hg bookmark -r 2 -i a@
$ hg bookmarks
@ 2:db815d6d32e6
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
a@ 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg clone . cloned-bookmarks
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
* @ 2:db815d6d32e6
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
a@ 2:db815d6d32e6
x y 2:db815d6d32e6
test clone with pull protocol
$ hg clone --pull . cloned-bookmarks-pull
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
new changesets f7b1eb17ad24:db815d6d32e6
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-pull bookmarks
* @ 2:db815d6d32e6
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
a@ 2:db815d6d32e6
x y 2:db815d6d32e6
delete multiple bookmarks at once
$ hg bookmark -d @ a@
test clone with a bookmark named "default" (issue3677)
$ hg bookmark -r 1 -f -i default
$ hg clone . cloned-bookmark-default
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmark-default bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
default 1:925d80f479bb
x y 2:db815d6d32e6
$ hg -R cloned-bookmark-default parents -q
2:db815d6d32e6
$ hg bookmark -d default
test clone with a specific revision
$ hg clone -r 925d80 . cloned-bookmarks-rev
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
new changesets f7b1eb17ad24:925d80f479bb
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-rev bookmarks
X2 1:925d80f479bb
test clone with update to a bookmark
$ hg clone -u Z . ../cloned-bookmarks-update
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R ../cloned-bookmarks-update bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
create bundle with two heads
$ hg clone . tobundle
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo x > tobundle/x
$ hg -R tobundle add tobundle/x
$ hg -R tobundle commit -m'x'
$ hg -R tobundle update -r -2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo y > tobundle/y
$ hg -R tobundle branch test
marked working directory as branch test
(branches are permanent and global, did you want a bookmark?)
$ hg -R tobundle add tobundle/y
$ hg -R tobundle commit -m'y'
$ hg -R tobundle bundle tobundle.hg
searching for changes
2 changesets found
$ hg unbundle tobundle.hg
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
new changesets 125c9a1d6df6:9ba5f110a0b3 (2 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
update to active bookmark if it's not the parent
(it is known issue that fsmonitor can't handle nested repositories. In
this test scenario, cloned-bookmark-default and tobundle exist in the
working directory of current repository)
$ hg summary
parent: 2:db815d6d32e6
2
branch: default
bookmarks: *Z Y x y
commit: 1 added, 1 unknown (new branch head) (no-fsmonitor !)
commit: 1 added, * unknown (new branch head) (glob) (fsmonitor !)
update: 2 new changesets (update)
phases: 5 draft
$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark Z
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 3:125c9a1d6df6
x y 2:db815d6d32e6
pull --update works the same as pull && update
$ hg bookmark -r3 Y
moving bookmark 'Y' forward from db815d6d32e6
$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
(manual version)
$ hg -R ../cloned-bookmarks-manual-update update Y
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark Y)
$ hg -R ../cloned-bookmarks-manual-update pull .
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
updating bookmark Y
updating bookmark Z
added 2 changesets with 2 changes to 2 files (+1 heads)
new changesets 125c9a1d6df6:9ba5f110a0b3
(run 'hg heads' to see heads, 'hg merge' to merge)
(# tests strange but with --date crashing when bookmark have to move)
$ hg -R ../cloned-bookmarks-manual-update update -d 1986
abort: revision matching date not found
[10]
$ hg -R ../cloned-bookmarks-manual-update update
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(all in one version)
$ hg -R ../cloned-bookmarks-update update Y
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark Y)
$ hg -R ../cloned-bookmarks-update pull --update .
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
updating bookmark Y
updating bookmark Z
added 2 changesets with 2 changes to 2 files (+1 heads)
new changesets 125c9a1d6df6:9ba5f110a0b3
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
We warn about divergent during bare update to the active bookmark
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark Y)
$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
X2 1:925d80f479bb
* Y 2:db815d6d32e6
Y@1 1:925d80f479bb
Z 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
pulling from $TESTTMP/repo
searching for changes
adding changesets
adding manifests
adding file changes
updating bookmark Y
updating bookmark Z
added 2 changesets with 2 changes to 2 files (+1 heads)
new changesets 125c9a1d6df6:9ba5f110a0b3
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 other divergent bookmarks for "Y"
test wrongly formated bookmark
$ echo '' >> .hg/bookmarks
$ hg bookmarks
X2 1:925d80f479bb
Y 3:125c9a1d6df6
* Z 3:125c9a1d6df6
x y 2:db815d6d32e6
$ echo "Ican'thasformatedlines" >> .hg/bookmarks
$ hg bookmarks
malformed line in .hg/bookmarks: "Ican'thasformatedlines"
X2 1:925d80f479bb
Y 3:125c9a1d6df6
* Z 3:125c9a1d6df6
x y 2:db815d6d32e6
test missing revisions
$ echo "925d80f479b925d80f479bc925d80f479bccabab z" > .hg/bookmarks
$ hg book
no bookmarks set
test stripping a non-checked-out but bookmarked revision
$ hg log --graph
o changeset: 4:9ba5f110a0b3
| branch: test
| tag: tip
| parent: 2:db815d6d32e6
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: y
|
| @ changeset: 3:125c9a1d6df6
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: x
|
o changeset: 2:db815d6d32e6
| parent: 0:f7b1eb17ad24
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 2
|
| o changeset: 1:925d80f479bb
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 1
|
o changeset: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
$ hg book should-end-on-two
$ hg co --clean 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark should-end-on-two)
$ hg book four
$ hg --config extensions.mq= strip 3
saved backup bundle to * (glob)
should-end-on-two should end up pointing to revision 2, as that's the
tipmost surviving ancestor of the stripped revision.
$ hg log --graph
@ changeset: 3:9ba5f110a0b3
| branch: test
| bookmark: four
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: y
|
o changeset: 2:db815d6d32e6
| bookmark: should-end-on-two
| parent: 0:f7b1eb17ad24
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 2
|
| o changeset: 1:925d80f479bb
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 1
|
o changeset: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
no-op update doesn't deactivate bookmarks
(it is known issue that fsmonitor can't handle nested repositories. In
this test scenario, cloned-bookmark-default and tobundle exist in the
working directory of current repository)
$ hg bookmarks
* four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6
$ hg up four
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg sum
parent: 3:9ba5f110a0b3 tip
y
branch: test
bookmarks: *four
commit: 2 unknown (clean) (no-fsmonitor !)
commit: * unknown (clean) (glob) (fsmonitor !)
update: (current)
phases: 4 draft
test clearing divergent bookmarks of linear ancestors
$ hg bookmark Z -r 0
$ hg bookmark Z@1 -r 1
$ hg bookmark Z@2 -r 2
$ hg bookmark Z@3 -r 3
$ hg book
Z 0:f7b1eb17ad24
Z@1 1:925d80f479bb
Z@2 2:db815d6d32e6
Z@3 3:9ba5f110a0b3
* four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6
$ hg bookmark Z
moving bookmark 'Z' forward from f7b1eb17ad24
$ hg book
* Z 3:9ba5f110a0b3
Z@1 1:925d80f479bb
four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6
test clearing only a single divergent bookmark across branches
$ hg book foo -r 1
$ hg book foo@1 -r 0
$ hg book foo@2 -r 2
$ hg book foo@3 -r 3
$ hg book foo -r foo@3
$ hg book
* Z 3:9ba5f110a0b3
Z@1 1:925d80f479bb
foo 3:9ba5f110a0b3
foo@1 0:f7b1eb17ad24
foo@2 2:db815d6d32e6
four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6
pull --update works the same as pull && update (case #2)
It is assumed that "hg pull" itself doesn't update current active
bookmark ('Y' in tests below).
$ hg pull -q ../cloned-bookmarks-update
divergent bookmark Z stored as Z@2
(pulling revision on another named branch with --update updates
neither the working directory nor current active bookmark: "no-op"
case)
$ echo yy >> y
$ hg commit -m yy
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
* Y 3:125c9a1d6df6
$ hg -R ../cloned-bookmarks-update path
default = $TESTTMP/repo
$ pwd
$TESTTMP/repo
$ hg -R ../cloned-bookmarks-update pull . --update
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
divergent bookmark Z stored as Z@default
adding remote bookmark foo
adding remote bookmark four
adding remote bookmark should-end-on-two
added 1 changesets with 1 changes to 1 files
new changesets 5fb12f0f2d51
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
3:125c9a1d6df6
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
* Y 3:125c9a1d6df6
(pulling revision on current named/topological branch with --update
updates the working directory and current active bookmark)
$ hg update -C -q 125c9a1d6df6
$ echo xx >> x
$ hg commit -m xx
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
* Y 3:125c9a1d6df6
$ hg -R ../cloned-bookmarks-update pull . --update
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
divergent bookmark Z stored as Z@default
added 1 changesets with 1 changes to 1 files
new changesets 81dcce76aa0b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark Y
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
6:81dcce76aa0b
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
* Y 6:81dcce76aa0b
$ cd ..
ensure changelog is written before bookmarks
$ hg init orderrepo
$ cd orderrepo
$ touch a
$ hg commit -Aqm one
$ hg book mybook
$ echo a > a
$ cat > $TESTTMP/pausefinalize.py <<EOF
> from __future__ import absolute_import
> import os
> import time
> from mercurial import extensions, localrepo
> def transaction(orig, self, desc, report=None):
> tr = orig(self, desc, report)
> def sleep(*args, **kwargs):
> retry = 20
> while retry > 0 and not os.path.exists(b"$TESTTMP/unpause"):
> retry -= 1
> time.sleep(0.5)
> if os.path.exists(b"$TESTTMP/unpause"):
> os.remove(b"$TESTTMP/unpause")
> # It is important that this finalizer start with 'a', so it runs before
> # the changelog finalizer appends to the changelog.
> tr.addfinalize(b'a-sleep', sleep)
> return tr
>
> def extsetup(ui):
> # This extension inserts an artifical pause during the transaction
> # finalizer, so we can run commands mid-transaction-close.
> extensions.wrapfunction(localrepo.localrepository, 'transaction',
> transaction)
> EOF
$ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
$ sleep 2
$ hg log -r .
changeset: 0:867bc5792c8c
bookmark: mybook
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: one
$ hg bookmarks
* mybook 0:867bc5792c8c
$ touch $TESTTMP/unpause
$ cd ..
check whether HG_PENDING makes pending changes only in related
repositories visible to an external hook.
(emulate a transaction running concurrently by copied
.hg/bookmarks.pending in subsequent test)
$ cat > $TESTTMP/savepending.sh <<EOF
> cp .hg/bookmarks.pending .hg/bookmarks.pending.saved
> exit 1 # to avoid adding new bookmark for subsequent tests
> EOF
$ hg init unrelated
$ cd unrelated
$ echo a > a
$ hg add a
$ hg commit -m '#0'
$ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" bookmarks INVISIBLE
transaction abort!
rollback completed
abort: pretxnclose hook exited with status 1
[40]
$ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending
(check visible bookmarks while transaction running in repo)
$ cat > $TESTTMP/checkpending.sh <<EOF
> echo "@repo"
> hg -R "$TESTTMP/repo" bookmarks
> echo "@unrelated"
> hg -R "$TESTTMP/unrelated" bookmarks
> exit 1 # to avoid adding new bookmark for subsequent tests
> EOF
$ cd ../repo
$ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" bookmarks NEW
@repo
* NEW 6:81dcce76aa0b
X2 1:925d80f479bb
Y 4:125c9a1d6df6
Z 5:5fb12f0f2d51
Z@1 1:925d80f479bb
Z@2 4:125c9a1d6df6
foo 3:9ba5f110a0b3
foo@1 0:f7b1eb17ad24
foo@2 2:db815d6d32e6
four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6
x y 2:db815d6d32e6
@unrelated
no bookmarks set
transaction abort!
rollback completed
abort: pretxnclose hook exited with status 1
[40]
Check pretxnclose-bookmark can abort a transaction
--------------------------------------------------
add hooks:
* to prevent NEW bookmark on a non-public changeset
* to prevent non-forward move of NEW bookmark
$ cat << EOF >> .hg/hgrc
> [hooks]
> pretxnclose-bookmark.force-public = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"\$HG_NODE\" -T '{phase}' | grep public > /dev/null)"
> pretxnclose-bookmark.force-forward = sh -c "(echo \$HG_BOOKMARK| grep -v NEW > /dev/null) || [ -z \"\$HG_NODE\" ] || (hg log -r \"max(\$HG_OLDNODE::\$HG_NODE)\" -T 'MATCH' | grep MATCH > /dev/null)"
> EOF
$ hg log -G -T phases
@ changeset: 6:81dcce76aa0b
| tag: tip
| phase: draft
| parent: 4:125c9a1d6df6
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: xx
|
| o changeset: 5:5fb12f0f2d51
| | branch: test
| | bookmark: Z
| | phase: draft
| | parent: 3:9ba5f110a0b3
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: yy
| |
o | changeset: 4:125c9a1d6df6
| | bookmark: Y
| | bookmark: Z@2
| | phase: public
| | parent: 2:db815d6d32e6
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: x
| |
| o changeset: 3:9ba5f110a0b3
|/ branch: test
| bookmark: foo
| bookmark: four
| phase: public
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: y
|
o changeset: 2:db815d6d32e6
| bookmark: foo@2
| bookmark: should-end-on-two
| bookmark: x y
| phase: public
| parent: 0:f7b1eb17ad24
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 2
|
| o changeset: 1:925d80f479bb
|/ bookmark: X2
| bookmark: Z@1
| phase: public
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 1
|
o changeset: 0:f7b1eb17ad24
bookmark: foo@1
phase: public
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
attempt to create on a default changeset
$ hg bookmark -r 81dcce76aa0b NEW
transaction abort!
rollback completed
abort: pretxnclose-bookmark.force-public hook exited with status 1
[40]
create on a public changeset
$ hg bookmark -r 9ba5f110a0b3 NEW
move to the other branch
$ hg bookmark -f -r 125c9a1d6df6 NEW
transaction abort!
rollback completed
abort: pretxnclose-bookmark.force-forward hook exited with status 1
[40]