##// END OF EJS Templates
bookmarks: split ui.write() so that it can be easily ported to formatter api...
bookmarks: split ui.write() so that it can be easily ported to formatter api Test output changes because color labels are applied separately.

File last commit:

r22775:b59c2c8c default
r22775:b59c2c8c default
Show More
test-bookmarks.t
663 lines | 16.5 KiB | text/troff | Tads3Lexer
Martin Geisler
tests: unify test-bookmarks
r11861 $ hg init
no bookmarks
$ hg bookmarks
no bookmarks set
bookmark rev -1
$ hg bookmark X
list bookmarks
$ hg bookmarks
* X -1:000000000000
list bookmarks with color
$ hg --config extensions.color= --config color.mode=ansi \
> bookmarks --color=always
Yuya Nishihara
bookmarks: split ui.write() so that it can be easily ported to formatter api...
r22775 \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
Martin Geisler
tests: unify test-bookmarks
r11861
$ echo a > a
$ hg add a
$ hg commit -m 0
bookmark X moved to rev 0
$ hg bookmarks
* X 0:f7b1eb17ad24
look up bookmark
$ hg log -r X
changeset: 0:f7b1eb17ad24
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmark: X
Martin Geisler
tests: unify test-bookmarks
r11861 tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
Kevin Bullock
commands: 'hg bookmark NAME' should work even with ui.strict=True...
r18075 second bookmark for rev 0, command should work even with ui.strict on
Martin Geisler
tests: unify test-bookmarks
r11861
Kevin Bullock
commands: 'hg bookmark NAME' should work even with ui.strict=True...
r18075 $ hg --config ui.strict=1 bookmark X2
Martin Geisler
tests: unify test-bookmarks
r11861
bookmark rev -1 again
$ hg bookmark -r null Y
list bookmarks
$ hg bookmarks
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 X 0:f7b1eb17ad24
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 * X2 0:f7b1eb17ad24
Martin Geisler
tests: unify test-bookmarks
r11861 Y -1:000000000000
$ echo b > b
$ hg add b
$ hg commit -m 1
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714 bookmarks revset
$ hg log -r 'bookmark()'
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 changeset: 0:f7b1eb17ad24
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmark: X
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714 user: test
date: Thu Jan 01 00:00:00 1970 +0000
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 summary: 0
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 changeset: 1:925d80f479bb
bookmark: X2
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714 $ hg log -r 'bookmark(Y)'
$ hg log -r 'bookmark(X2)'
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 changeset: 1:925d80f479bb
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmark: X2
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 tag: tip
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714 user: test
date: Thu Jan 01 00:00:00 1970 +0000
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 summary: 1
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822 $ 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
Michael O'Connor
revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)
r22105 $ hg log -r 'bookmark("literal:X")'
changeset: 0:f7b1eb17ad24
bookmark: X
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
Idan Kamara
tests: add tests for non-existant branch/tag/bookmark
r13925 $ hg log -r 'bookmark(unknown)'
abort: bookmark 'unknown' does not exist
[255]
Patrick Mezard
Fix and unify transplant and bookmarks revsets doc registration
r12822 $ hg help revsets | grep 'bookmark('
"bookmark([name])"
Augie Fackler
bookmarks: add revset for referencing bookmarks
r12714
Martin Geisler
tests: unify test-bookmarks
r11861 bookmarks X and X2 moved to rev 1, Y at rev -1
$ hg bookmarks
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 X 0:f7b1eb17ad24
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 * X2 1:925d80f479bb
Martin Geisler
tests: unify test-bookmarks
r11861 Y -1:000000000000
bookmark rev 0 again
$ hg bookmark -r 0 Z
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 $ hg update X
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Stephen Lee
update: show message when a bookmark is activated by update...
r21503 (activating bookmark X)
Martin Geisler
tests: unify test-bookmarks
r11861 $ echo c > c
$ hg add c
$ hg commit -m 2
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 created new head
Martin Geisler
tests: unify test-bookmarks
r11861
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
Martin Geisler
tests: unify test-bookmarks
r11861
$ hg bookmarks
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 * X 2:db815d6d32e6
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 X2 1:925d80f479bb
David Soria Parra
localrepo: sort hg bookmark output...
r13388 Y -1:000000000000
Martin Geisler
tests: unify test-bookmarks
r11861 Z 0:f7b1eb17ad24
rename nonexistent bookmark
$ hg bookmark -m A B
Idan Kamara
bookmarks: change error messages to match those given by 'hg tag' commands
r13911 abort: bookmark 'A' does not exist
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
rename to existent bookmark
$ hg bookmark -m X Y
Idan Kamara
bookmarks: change error messages to match those given by 'hg tag' commands
r13911 abort: bookmark 'Y' already exists (use -f to force)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
force rename to existent bookmark
$ hg bookmark -f -m X Y
list bookmarks
$ hg bookmark
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 X2 1:925d80f479bb
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 * Y 2:db815d6d32e6
Martin Geisler
tests: unify test-bookmarks
r11861 Z 0:f7b1eb17ad24
David Soria Parra
bookmarks: teach the -r option to use revsets
r17686 bookmarks from a revset
$ hg bookmark -r '.^1' REVSET
$ hg bookmark -r ':tip' TIP
Sean Farley
bookmarks: fix bug that activated a bookmark even with -r passed...
r19112 $ hg up -q TIP
David Soria Parra
bookmarks: teach the -r option to use revsets
r17686 $ 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
Kevin Bullock
bookmarks: allow bookmark command to take multiple arguments...
r19147 rename without new name or multiple names
Martin Geisler
tests: unify test-bookmarks
r11861
$ hg bookmark -m Y
abort: new bookmark name required
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Kevin Bullock
bookmarks: allow bookmark command to take multiple arguments...
r19147 $ hg bookmark -m Y Y2 Y3
abort: only one new bookmark name allowed
[255]
Martin Geisler
tests: unify test-bookmarks
r11861
delete without name
$ hg bookmark -d
abort: bookmark name required
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
delete nonexistent bookmark
$ hg bookmark -d A
Idan Kamara
bookmarks: change error messages to match those given by 'hg tag' commands
r13911 abort: bookmark 'A' does not exist
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
bookmark name with spaces should be stripped
$ hg bookmark ' x y '
list bookmarks
$ hg bookmarks
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 X2 1:925d80f479bb
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 Y 2:db815d6d32e6
Martin Geisler
tests: unify test-bookmarks
r11861 Z 0:f7b1eb17ad24
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 * x y 2:db815d6d32e6
Martin Geisler
tests: unify test-bookmarks
r11861
look up stripped bookmark name
$ hg log -r '"x y"'
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 changeset: 2:db815d6d32e6
David Soria Parra
templater: add bookmarks to templates and default output...
r13386 bookmark: Y
bookmark: x y
Martin Geisler
tests: unify test-bookmarks
r11861 tag: tip
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 parent: 0:f7b1eb17ad24
Martin Geisler
tests: unify test-bookmarks
r11861 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
reject bookmark name with newline
$ hg bookmark '
> '
Kevin Bullock
bookmarks: remove redundant check for newline...
r17814 abort: bookmark names cannot consist entirely of whitespace
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
David Soria Parra
bookmarks: check bookmark format during rename (issue3662)
r17789 $ hg bookmark -m Z '
> '
Kevin Bullock
bookmarks: remove redundant check for newline...
r17814 abort: bookmark names cannot consist entirely of whitespace
David Soria Parra
bookmarks: check bookmark format during rename (issue3662)
r17789 [255]
Kevin Bullock
bookmarks: disallow bookmarks named 'tip', '.', or 'null'...
r17816 bookmark with reserved name
$ hg bookmark tip
abort: the name 'tip' is reserved
[255]
$ hg bookmark .
abort: the name '.' is reserved
[255]
$ hg bookmark null
abort: the name 'null' is reserved
[255]
Martin Geisler
tests: unify test-bookmarks
r11861 bookmark with existing name
Kevin Bullock
bookmarks: allow moving a bookmark forward to a descendant...
r18773 $ hg bookmark X2
abort: bookmark 'X2' already exists (use -f to force)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
David Soria Parra
bookmarks: check bookmark format during rename (issue3662)
r17789 $ 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]
Durham Goode
bookmark: don't allow integers as bookmark/branch/tag names...
r18566 bookmark with integer name
$ hg bookmark 10
Durham Goode
translations: change label integer error to not specify the kind of label...
r19070 abort: cannot use an integer as a name
Durham Goode
bookmark: don't allow integers as bookmark/branch/tag names...
r18566 [255]
David Soria Parra
bookmarks: abort when incompatible options are used (issue3663)...
r17790 incompatible options
$ hg bookmark -m Y -d Z
abort: --delete and --rename are incompatible
[255]
$ hg bookmark -r 1 -d Z
abort: --rev is incompatible with --delete
[255]
$ hg bookmark -r 1 -m Z Y
abort: --rev is incompatible with --rename
[255]
Martin Geisler
tests: unify test-bookmarks
r11861 force bookmark with existing name
Kevin Bullock
bookmarks: allow moving a bookmark forward to a descendant...
r18773 $ hg bookmark -f X2
Kevin Bullock
bookmarks: moving the active bookmark deactivates it...
r18782
force bookmark back to where it was, should deactivate it
Kevin Bullock
bookmarks: allow moving a bookmark forward to a descendant...
r18773 $ hg bookmark -fr1 X2
Kevin Bullock
bookmarks: moving the active bookmark deactivates it...
r18782 $ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 0:f7b1eb17ad24
x y 2:db815d6d32e6
Kevin Bullock
bookmarks: allow moving a bookmark forward to a descendant...
r18773
forward bookmark to descendant without --force
$ hg bookmark Z
Kevin Bullock
bookmarks: fix test broken by 0bba1ff2ac7b...
r18774 moving bookmark 'Z' forward from f7b1eb17ad24
Martin Geisler
tests: unify test-bookmarks
r11861
list bookmarks
$ hg bookmark
David Soria Parra
bookmarks: mark new bookmark as current if it points to the current dirstate...
r13448 X2 1:925d80f479bb
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
r13416 Y 2:db815d6d32e6
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
Martin Geisler
tests: unify test-bookmarks
r11861
revision but no bookmark name
$ hg bookmark -r .
abort: bookmark name required
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bookmarks
r11861
bookmark name with whitespace only
$ hg bookmark ' '
abort: bookmark names cannot consist entirely of whitespace
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
David Soria Parra
bookmarks: forbid \0 \r \n : in bookmark names (BC)...
r13425
David Soria Parra
bookmarks: check bookmark format during rename (issue3662)
r17789 $ hg bookmark -m Y ' '
abort: bookmark names cannot consist entirely of whitespace
[255]
David Soria Parra
bookmarks: forbid \0 \r \n : in bookmark names (BC)...
r13425 invalid bookmark
$ hg bookmark 'foo:bar'
Wagner Bruna
scmutil: generalize message to make it more i18n-friendly
r17850 abort: ':' cannot be used in a name
Kevin Bullock
scmutil: add bad character checking to checknewlabel...
r17821 [255]
$ hg bookmark 'foo
> bar'
Wagner Bruna
scmutil: generalize message to make it more i18n-friendly
r17850 abort: '\n' cannot be used in a name
David Soria Parra
bookmarks: forbid \0 \r \n : in bookmark names (BC)...
r13425 [255]
David Soria Parra
tests: check if the bookmarks extension is ignored
r13474 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
Alexander Solovyov
fix bookmarks rollback behavior...
r14266
David Soria Parra
summary: add bookmarks to summary
r13454 test summary
$ hg summary
Augie Fackler
summary: show bookmarks separate from tags and note active mark (issue2892)
r14906 parent: 2:db815d6d32e6 tip
David Soria Parra
summary: add bookmarks to summary
r13454 2
branch: default
Augie Fackler
summary: show bookmarks separate from tags and note active mark (issue2892)
r14906 bookmarks: *Z Y x y
David Soria Parra
summary: add bookmarks to summary
r13454 commit: (clean)
update: 1 new changesets, 2 branch heads (merge)
Kevin Bullock
id: add bookmarks to id...
r13477 test id
$ hg id
db815d6d32e6 tip Y/Z/x y
Alexander Solovyov
fix bookmarks rollback behavior...
r14266
test rollback
Matt Mackall
merge with stable
r14268 $ echo foo > f1
$ hg ci -Amr
adding f1
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 $ hg bookmark -f Y -r 1
$ hg bookmark -f Z -r 1
$ hg rollback
Matt Mackall
merge with stable
r14268 repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
Kevin Bullock
bookmarks: moving the active bookmark deactivates it...
r18782 Z 2:db815d6d32e6
Matt Mackall
merge with stable
r14268 x y 2:db815d6d32e6
Kevin Bullock
bookmarks: allow (re-)activating a bookmark on the current changeset...
r18781 activate bookmark on working dir parent without --force
$ hg bookmark --inactive Z
$ hg bookmark Z
David Soria Parra
hg: add support for cloning bookmarks
r13604 test clone
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276 $ hg bookmark -r 2 -i @
$ hg bookmark -r 2 -i a@
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 $ hg bookmarks
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276 @ 2:db815d6d32e6
David Soria Parra
hg: add support for cloning bookmarks
r13604 X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276 a@ 2:db815d6d32e6
David Soria Parra
hg: add support for cloning bookmarks
r13604 x y 2:db815d6d32e6
$ hg clone . cloned-bookmarks
Adrian Buehlmann
clone: show status "updating to bookmark @"...
r17882 updating to bookmark @
David Soria Parra
hg: add support for cloning bookmarks
r13604 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
Thomas Arendsen Hein
clone: activate @ bookmark if updating to it...
r17870 * @ 2:db815d6d32e6
David Soria Parra
hg: add support for cloning bookmarks
r13604 X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276 a@ 2:db815d6d32e6
David Soria Parra
hg: add support for cloning bookmarks
r13604 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)
Adrian Buehlmann
clone: show status "updating to bookmark @"...
r17882 updating to bookmark @
David Soria Parra
hg: add support for cloning bookmarks
r13604 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-pull bookmarks
Thomas Arendsen Hein
clone: activate @ bookmark if updating to it...
r17870 * @ 2:db815d6d32e6
Alexander Solovyov
fix bookmarks rollback behavior...
r14266 X2 1:925d80f479bb
David Soria Parra
hg: add support for cloning bookmarks
r13604 Y 2:db815d6d32e6
Z 2:db815d6d32e6
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276 a@ 2:db815d6d32e6
David Soria Parra
hg: add support for cloning bookmarks
r13604 x y 2:db815d6d32e6
Kevin Bullock
bookmarks: allow bookmark command to take multiple arguments...
r19147 delete multiple bookmarks at once
$ hg bookmark -d @ a@
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
r16276
Thomas Arendsen Hein
test-bookmarks.t: check that bookmark "default" is not automatically checked out...
r17868 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
David Soria Parra
hg: add support for cloning bookmarks
r13604 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
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
David Soria Parra
bundle: update current bookmark to most recent revision on current branch...
r13663
Thomas Arendsen Hein
clone: activate bookmark specified with --updaterev
r17703 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
David Soria Parra
bundle: update current bookmark to most recent revision on current branch...
r13663 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
Matt Mackall
branch: warn on branching
r15615 (branches are permanent and global, did you want a bookmark?)
David Soria Parra
bundle: update current bookmark to most recent revision on current branch...
r13663 $ 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)
(run 'hg heads' to see heads, 'hg merge' to merge)
Kevin Bullock
update: update to current bookmark if it moved out from under us (issue3682)...
r18471
update to current bookmark if it's not the parent
Kevin Bullock
summary: test that current bookmark isn't shown...
r18620 $ hg summary
parent: 2:db815d6d32e6
2
branch: default
Matt Mackall
unbundle: don't advance bookmarks (issue4322) (BC)...
r22091 bookmarks: *Z Y x y
Kevin Bullock
summary: test that current bookmark isn't shown...
r18620 commit: 1 added, 1 unknown (new branch head)
update: 2 new changesets (update)
David Soria Parra
bundle: update current bookmark to most recent revision on current branch...
r13663 $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
unbundle: don't advance bookmarks (issue4322) (BC)...
r22091 updating bookmark Z
David Soria Parra
bundle: update current bookmark to most recent revision on current branch...
r13663 $ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 3:125c9a1d6df6
x y 2:db815d6d32e6
Kevin Bullock
bookmarks: pull --update updates to active bookmark if it moved (issue4007)...
r19523 pull --update works the same as pull && update
$ hg bookmark -r3 Y
moving bookmark 'Y' forward from db815d6d32e6
$ hg -R cloned-bookmarks-update update Y
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Stephen Lee
update: show message when a bookmark is activated by update...
r21503 (activating bookmark Y)
Kevin Bullock
bookmarks: pull --update updates to active bookmark if it moved (issue4007)...
r19523 $ hg -R cloned-bookmarks-update pull --update .
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
updating bookmark Y
updating bookmark Z
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Pierre-Yves David
bookmarks: more robust parsing of bookmarks file
r14845 test wrongly formated bookmark
$ echo '' >> .hg/bookmarks
$ hg bookmarks
X2 1:925d80f479bb
Kevin Bullock
bookmarks: pull --update updates to active bookmark if it moved (issue4007)...
r19523 Y 3:125c9a1d6df6
Pierre-Yves David
bookmarks: more robust parsing of bookmarks file
r14845 * Z 3:125c9a1d6df6
x y 2:db815d6d32e6
Pierre-Yves David
bookmarks: add a warning for non empty malformed line
r14846 $ echo "Ican'thasformatedlines" >> .hg/bookmarks
$ hg bookmarks
malformed line in .hg/bookmarks: "Ican'thasformatedlines"
X2 1:925d80f479bb
Kevin Bullock
bookmarks: pull --update updates to active bookmark if it moved (issue4007)...
r19523 Y 3:125c9a1d6df6
Pierre-Yves David
bookmarks: add a warning for non empty malformed line
r14846 * Z 3:125c9a1d6df6
x y 2:db815d6d32e6
Matt Mackall
bookmarks: catch the proper exception for missing revisions...
r16573 test missing revisions
$ echo "925d80f479bc z" > .hg/bookmarks
$ hg book
no bookmarks set
Augie Fackler
strip: move bookmarks to nearest ancestor rather than '.'...
r17264
test stripping a non-checked-out but bookmarked revision
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log --graph
Augie Fackler
strip: move bookmarks to nearest ancestor rather than '.'...
r17264 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
Siddharth Agarwal
update: when deactivating a bookmark, print a message...
r21404 (leaving bookmark should-end-on-two)
Augie Fackler
strip: move bookmarks to nearest ancestor rather than '.'...
r17264 $ 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.
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log --graph
Augie Fackler
strip: move bookmarks to nearest ancestor rather than '.'...
r17264 @ 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
Sean Farley
bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant...
r19109
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
Sean Farley
bookmarks: fix bug that activated a bookmark even with -r passed...
r19112 Z@3 3:9ba5f110a0b3
* four 3:9ba5f110a0b3
Sean Farley
bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant...
r19109 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
Sean Farley
bookmarks: resolve divergent bookmark when moving across a branch...
r19111
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
Sean Farley
bookmarks: fix bug that activated a bookmark even with -r passed...
r19112 * Z 3:9ba5f110a0b3
Sean Farley
bookmarks: resolve divergent bookmark when moving across a branch...
r19111 Z@1 1:925d80f479bb
Sean Farley
bookmarks: fix bug that activated a bookmark even with -r passed...
r19112 foo 3:9ba5f110a0b3
Sean Farley
bookmarks: resolve divergent bookmark when moving across a branch...
r19111 foo@1 0:f7b1eb17ad24
foo@2 2:db815d6d32e6
four 3:9ba5f110a0b3
should-end-on-two 2:db815d6d32e6