test-bookmarks-current.t
224 lines
| 5.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bookmarks-current.t
Martin Geisler
|
r11862 | $ hg init | ||
| no bookmarks | ||||
| $ hg bookmarks | ||||
| no bookmarks set | ||||
| set bookmark X | ||||
| $ hg bookmark X | ||||
| list bookmarks | ||||
| $ hg bookmark | ||||
| * X -1:000000000000 | ||||
| list bookmarks with color | ||||
| $ hg --config extensions.color= --config color.mode=ansi \ | ||||
| > bookmark --color=always | ||||
Yuya Nishihara
|
r22775 | \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc) | ||
|
Martin Geisler
|
r11862 | |||
| update to bookmark X | ||||
FUJIWARA Katsunori
|
r28500 | $ hg bookmarks | ||
| * X -1:000000000000 | ||||
|
Martin Geisler
|
r11862 | $ hg update X | ||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| list bookmarks | ||||
| $ hg bookmarks | ||||
| * X -1:000000000000 | ||||
| rename | ||||
| $ hg bookmark -m X Z | ||||
| list bookmarks | ||||
Benoit Boissinot
|
r13620 | $ cat .hg/bookmarks.current | ||
| Z (no-eol) | ||||
| $ cat .hg/bookmarks | ||||
| 0000000000000000000000000000000000000000 Z | ||||
|
Martin Geisler
|
r11862 | $ hg bookmarks | ||
| * Z -1:000000000000 | ||||
Kevin Bullock
|
r19147 | new bookmarks X and Y, first one made active | ||
|
Martin Geisler
|
r11862 | |||
|
Kevin Bullock
|
r19147 | $ hg bookmark Y X | ||
|
Martin Geisler
|
r11862 | |||
| list bookmarks | ||||
| $ hg bookmark | ||||
|
Kevin Bullock
|
r19147 | X -1:000000000000 | ||
|
Martin Geisler
|
r11862 | * Y -1:000000000000 | ||
| Z -1:000000000000 | ||||
|
Kevin Bullock
|
r19147 | $ hg bookmark -d X | ||
|
Martin Geisler
|
r11862 | commit | ||
| $ echo 'b' > b | ||||
| $ hg add b | ||||
| $ hg commit -m'test' | ||||
| list bookmarks | ||||
| $ hg bookmark | ||||
| * Y 0:719295282060 | ||||
| Z -1:000000000000 | ||||
Ryan McElroy
|
r25349 | Verify that switching to Z updates the active bookmark: | ||
Augie Fackler
|
r13433 | $ hg update Z | ||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
Stephen Lee
|
r21503 | (activating bookmark Z) | ||
|
Augie Fackler
|
r13433 | $ hg bookmark | ||
| Y 0:719295282060 | ||||
| * Z -1:000000000000 | ||||
| Switch back to Y for the remaining tests in this file: | ||||
| $ hg update Y | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
Stephen Lee
|
r21503 | (activating bookmark Y) | ||
|
Augie Fackler
|
r13433 | |||
|
Martin Geisler
|
r11862 | delete bookmarks | ||
| $ hg bookmark -d Y | ||||
| $ hg bookmark -d Z | ||||
| list bookmarks | ||||
| $ hg bookmark | ||||
| no bookmarks set | ||||
| update to tip | ||||
| $ hg update tip | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Sean Farley
|
r19112 | set bookmark Y using -r . but make sure that the active | ||
| bookmark is not activated | ||||
|
Martin Geisler
|
r11862 | |||
| $ hg bookmark -r . Y | ||||
|
Sean Farley
|
r19112 | list bookmarks, Y should not be active | ||
|
Martin Geisler
|
r11862 | |||
| $ hg bookmark | ||||
|
Sean Farley
|
r19112 | Y 0:719295282060 | ||
| now, activate Y | ||||
| $ hg up -q Y | ||||
|
Kevin Bullock
|
r14188 | |||
| set bookmark Z using -i | ||||
| $ hg bookmark -r . -i Z | ||||
| $ hg bookmarks | ||||
| * Y 0:719295282060 | ||||
| Z 0:719295282060 | ||||
|
Kevin Bullock
|
r14189 | |||
|
Ryan McElroy
|
r25349 | deactivate active bookmark using -i | ||
|
Kevin Bullock
|
r14189 | |||
| $ hg bookmark -i Y | ||||
| $ hg bookmarks | ||||
| Y 0:719295282060 | ||||
| Z 0:719295282060 | ||||
| $ hg up -q Y | ||||
|
Kevin Bullock
|
r17735 | $ hg bookmark -i | ||
| $ hg bookmarks | ||||
| Y 0:719295282060 | ||||
| Z 0:719295282060 | ||||
| $ hg bookmark -i | ||||
| no active bookmark | ||||
| $ hg up -q Y | ||||
|
Kevin Bullock
|
r14189 | $ hg bookmarks | ||
| * Y 0:719295282060 | ||||
| Z 0:719295282060 | ||||
|
Ryan McElroy
|
r25349 | deactivate active bookmark while renaming | ||
|
Kevin Bullock
|
r14189 | |||
| $ hg bookmark -i -m Y X | ||||
| $ hg bookmarks | ||||
| X 0:719295282060 | ||||
| Z 0:719295282060 | ||||
Idan Kamara
|
r16191 | |||
|
Sean Farley
|
r19110 | bare update moves the active bookmark forward and clear the divergent bookmarks | ||
|
Kevin Bullock
|
r16742 | |||
| $ echo a > a | ||||
| $ hg ci -Am1 | ||||
| adding a | ||||
|
Sean Farley
|
r19110 | $ echo b >> a | ||
| $ hg ci -Am2 | ||||
| $ hg bookmark X@1 -r 1 | ||||
| $ hg bookmark X@2 -r 2 | ||||
|
Kevin Bullock
|
r16742 | $ hg update X | ||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
Stephen Lee
|
r21503 | (activating bookmark X) | ||
|
Kevin Bullock
|
r16742 | $ hg bookmarks | ||
| * X 0:719295282060 | ||||
|
Sean Farley
|
r19110 | X@1 1:cc586d725fbe | ||
| X@2 2:49e1c4e84c58 | ||||
|
Kevin Bullock
|
r16742 | Z 0:719295282060 | ||
| $ hg update | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| updating bookmark X | ||||
| $ hg bookmarks | ||||
|
Sean Farley
|
r19110 | * X 2:49e1c4e84c58 | ||
|
Kevin Bullock
|
r16742 | Z 0:719295282060 | ||
|
Idan Kamara
|
r16191 | test deleting .hg/bookmarks.current when explicitly updating | ||
| to a revision | ||||
| $ echo a >> b | ||||
| $ hg ci -m. | ||||
| $ hg up -q X | ||||
| $ test -f .hg/bookmarks.current | ||||
| try to update to it again to make sure we don't | ||||
| set and then unset it | ||||
| $ hg up -q X | ||||
| $ test -f .hg/bookmarks.current | ||||
| $ hg up -q 1 | ||||
| $ test -f .hg/bookmarks.current | ||||
| [1] | ||||
| when a bookmark is active, hg up -r . is | ||||
Mads Kiilerich
|
r21024 | analogous to hg book -i <active bookmark> | ||
|
Idan Kamara
|
r16191 | |||
| $ hg up -q X | ||||
| $ hg up -q . | ||||
| $ test -f .hg/bookmarks.current | ||||
| [1] | ||||
|
Ryan McElroy
|
r25387 | |||
| issue 4552 -- simulate a pull moving the active bookmark | ||||
| $ hg up -q X | ||||
| $ printf "Z" > .hg/bookmarks.current | ||||
| $ hg log -T '{activebookmark}\n' -r Z | ||||
| Z | ||||
| $ hg log -T '{bookmarks % "{active}\n"}' -r Z | ||||
| Z | ||||
|
FUJIWARA Katsunori
|
r28385 | |||
| test that updating to closed branch head also advances active bookmark | ||||
| $ hg commit --close-branch -m "closed" | ||||
| $ hg update -q ".^1" | ||||
| $ hg bookmark Y | ||||
| $ hg bookmarks | ||||
| X 3:4d6bd4bfb1ae | ||||
| * Y 3:4d6bd4bfb1ae | ||||
| Z 0:719295282060 | ||||
| $ hg update | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| updating bookmark Y | ||||
| $ hg bookmarks | ||||
| X 3:4d6bd4bfb1ae | ||||
| * Y 4:8fa964221e8e | ||||
| Z 0:719295282060 | ||||
| $ hg parents -q | ||||
| 4:8fa964221e8e | ||||