##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

color: add additional changeset.phase label to log.changeset and log.parent...
color: add additional changeset.phase label to log.changeset and log.parent This allows the user to set different colors for each phase, e.g. [color] changeset.public = blue changeset.draft = green changeset.secret = red In addition, this doesn't affect current configuration for custom log.changeset colors, but rather adds the option for users that want to visually see which changesets are amendable.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r17704:3d1a781b merge default
r17788:9912baaa default
Show More
test-bookmarks.t
483 lines | 11.9 KiB | text/troff | Tads3Lexer
/ tests / test-bookmarks.t
History | Source | Raw |Copy content |Copy permalink
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
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
 r12942 \x1b[0;32m * X -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
second bookmark for rev 0
$ hg bookmark X2
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
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
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
$ 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
Martin Geisler
tests: unify test-bookmarks
 r11861 rename without new name
$ hg bookmark -m Y
abort: new bookmark name required
Matt Mackall
tests: add exit codes to unified tests
 r12316 [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 '
> '
abort: bookmark name cannot contain newlines
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Martin Geisler
tests: unify test-bookmarks
 r11861
bookmark with existing name
$ hg bookmark Z
Idan Kamara
bookmarks: change error messages to match those given by 'hg tag' commands
 r13911 abort: bookmark 'Z' 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 bookmark with existing name
$ hg bookmark -f Z
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
invalid bookmark
$ hg bookmark 'foo:bar'
abort: bookmark 'foo:bar' contains illegal character
[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
* Z 2:db815d6d32e6
x y 2:db815d6d32e6
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
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks 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
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)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-pull bookmarks
Kevin Bullock
bookmarks: clone non-divergent bookmarks with @ in them
 r16276 @ 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: clone non-divergent bookmarks with @ in them
 r16276 $ hg bookmark -d @
$ hg bookmark -d a@
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)
$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 3:125c9a1d6df6
x y 2:db815d6d32e6
Pierre-Yves David
bookmarks: more robust parsing of bookmarks file
 r14845 test wrongly formated bookmark
$ echo '' >> .hg/bookmarks
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* 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
Y 2:db815d6d32e6
* 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
$ hg --config extensions.graphlog= 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
$ 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 --config extensions.graphlog= 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