Mercurial: tests/test-bookmarks.t@d07834e52b4e (annotated)

11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	1	$ hg init
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	3	no bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	4
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	5	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	6	no bookmarks set
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	7
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	8	bookmark rev -1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	9
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	10	$ hg bookmark X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	11
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	12	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	13
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	14	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	15	* X -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	16
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	17	list bookmarks with color
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	18
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	19	$ hg --config extensions.color= --config color.mode=ansi \
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	20	> bookmarks --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12822 diff changeset	21	\x1b[0;32m * X -1:000000000000\x1b[0m (esc)
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	22
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	23	$ echo a > a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	24	$ hg add a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	25	$ hg commit -m 0
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 7261 diff changeset	26
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	27	bookmark X moved to rev 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	28
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	29	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	30	* X 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	31
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	32	look up bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	33
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	34	$ hg log -r X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	35	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	36	bookmark: X
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	37	tag: tip
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	38	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	39	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	40	summary: 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	41
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	42
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	43	second bookmark for rev 0, command should work even with ui.strict on
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	44
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	45	$ hg --config ui.strict=1 bookmark X2
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	46
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	47	bookmark rev -1 again
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	48
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	49	$ hg bookmark -r null Y
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	50
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	51	list bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	52
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	53	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	54	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	55	* X2 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	56	Y -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	57
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	58	$ echo b > b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	59	$ hg add b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	60	$ hg commit -m 1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	61
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	62	bookmarks revset
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	63
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	64	$ hg log -r 'bookmark()'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	65	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	66	bookmark: X
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	67	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	68	date: Thu Jan 01 00:00:00 1970 +0000
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	69	summary: 0
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	70
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	71	changeset: 1:925d80f479bb
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	72	bookmark: X2
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	73	tag: tip
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	74	user: test
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	75	date: Thu Jan 01 00:00:00 1970 +0000
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	76	summary: 1
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	77
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	78	$ hg log -r 'bookmark(Y)'
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	79	$ hg log -r 'bookmark(X2)'
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	80	changeset: 1:925d80f479bb
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	81	bookmark: X2
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	82	tag: tip
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	83	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	84	date: Thu Jan 01 00:00:00 1970 +0000
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	85	summary: 1
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	86
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	87	$ hg log -r 'bookmark("re:X")'
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	88	changeset: 0:f7b1eb17ad24
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	89	bookmark: X
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	90	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	91	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	92	summary: 0
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	93
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	94	changeset: 1:925d80f479bb
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	95	bookmark: X2
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	96	tag: tip
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	97	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	98	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	99	summary: 1
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	100
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	101	$ hg log -r 'bookmark(unknown)'
c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	102	abort: bookmark 'unknown' does not exist
c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	103	[255]
c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	104
12822 f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	105	$ hg help revsets \| grep 'bookmark('
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	106	"bookmark([name])"
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	107
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	108	bookmarks X and X2 moved to rev 1, Y at rev -1
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	109
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	110	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	111	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	112	* X2 1:925d80f479bb
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	113	Y -1:000000000000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	114
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	115	bookmark rev 0 again
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	116
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	117	$ hg bookmark -r 0 Z
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	118
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	119	$ hg update X
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	120	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	121	$ echo c > c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	122	$ hg add c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	123	$ hg commit -m 2
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	124	created new head
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	125
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	126	bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	127
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	128	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	129	* X 2:db815d6d32e6
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	130	X2 1:925d80f479bb
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13386 diff changeset	131	Y -1:000000000000
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	132	Z 0:f7b1eb17ad24
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	133
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	134	rename nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	135
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	136	$ hg bookmark -m A B
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	137	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	138	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	139
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	140	rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	141
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	142	$ hg bookmark -m X Y
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	143	abort: bookmark 'Y' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	144	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	145
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	146	force rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	147
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	148	$ hg bookmark -f -m X Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	149
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	150	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	151
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	152	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	153	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	154	* Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	155	Z 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	156
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	157	bookmarks from a revset
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	158	$ hg bookmark -r '.^1' REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	159	$ hg bookmark -r ':tip' TIP
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	160	$ hg bookmarks
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	161	REVSET 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	162	* TIP 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	163	X2 1:925d80f479bb
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	164	Y 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	165	Z 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	166
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	167	$ hg bookmark -d REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	168	$ hg bookmark -d TIP
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	169
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	170	rename without new name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	171
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	172	$ hg bookmark -m Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	173	abort: new bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	174	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	175
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	176	delete without name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	177
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	178	$ hg bookmark -d
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	179	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	180	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	181
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	182	delete nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	183
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	184	$ hg bookmark -d A
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	185	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	186	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	187
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	188	bookmark name with spaces should be stripped
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	189
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	190	$ hg bookmark ' x y '
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	191
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	192	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	193
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	194	$ hg bookmarks
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	195	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	196	Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	197	Z 0:f7b1eb17ad24
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	198	* x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	199
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	200	look up stripped bookmark name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	201
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	202	$ hg log -r '"x y"'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	203	changeset: 2:db815d6d32e6
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	204	bookmark: Y
f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	205	bookmark: x y
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	206	tag: tip
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	207	parent: 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	208	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	209	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	210	summary: 2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	211
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	212
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	213	reject bookmark name with newline
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	214
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	215	$ hg bookmark '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	216	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	217	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	218	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	219
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	220	$ hg bookmark -m Z '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	221	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	222	abort: bookmark names cannot consist entirely of whitespace
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	223	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	224
17816 19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	225	bookmark with reserved name
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	226
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	227	$ hg bookmark tip
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	228	abort: the name 'tip' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	229	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	230
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	231	$ hg bookmark .
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	232	abort: the name '.' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	233	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	234
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	235	$ hg bookmark null
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	236	abort: the name 'null' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	237	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	238
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	239
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	240	bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	241
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	242	$ hg bookmark Z
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	243	abort: bookmark 'Z' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	244	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	245
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	246	$ hg bookmark -m Y Z
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	247	abort: bookmark 'Z' already exists (use -f to force)
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	248	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	249
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	250	bookmark with name of branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	251
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	252	$ hg bookmark default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	253	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	254	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	255
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	256	$ hg bookmark -m Y default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	257	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	258	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	259
17790 0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	260	incompatible options
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	261
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	262	$ hg bookmark -m Y -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	263	abort: --delete and --rename are incompatible
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	264	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	265
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	266	$ hg bookmark -r 1 -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	267	abort: --rev is incompatible with --delete
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	268	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	269
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	270	$ hg bookmark -r 1 -m Z Y
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	271	abort: --rev is incompatible with --rename
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	272	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	273
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	274	force bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	275
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	276	$ hg bookmark -f Z
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	277
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	278	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	279
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	280	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	281	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	282	Y 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	283	* Z 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	284	x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	285
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	286	revision but no bookmark name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	287
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	288	$ hg bookmark -r .
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	289	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	290	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	291
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	292	bookmark name with whitespace only
11704 18c47562d331 bookmarks: don't allow name to contain whitespaces only Idan Kamara <idankk86@gmail.com> parents: 11282 diff changeset	293
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	294	$ hg bookmark ' '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	295	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	296	[255]
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	297
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	298	$ hg bookmark -m Y ' '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	299	abort: bookmark names cannot consist entirely of whitespace
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	300	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	301
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	302	invalid bookmark
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	303
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	304	$ hg bookmark 'foo:bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	305	abort: ':' cannot be used in a name
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	306	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	307
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	308	$ hg bookmark 'foo
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	309	> bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	310	abort: '\n' cannot be used in a name
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	311	[255]
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	312
13474 6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	313	the bookmark extension should be ignored now that it is part of core
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	314
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	315	$ echo "[extensions]" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	316	$ echo "bookmarks=" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	317	$ hg bookmarks
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	318	X2 1:925d80f479bb
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	319	Y 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	320	* Z 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	321	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	322
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	323	test summary
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	324
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	325	$ hg summary
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	326	parent: 2:db815d6d32e6 tip
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	327	2
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	328	branch: default
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	329	bookmarks: *Z Y x y
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	330	commit: (clean)
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	331	update: 1 new changesets, 2 branch heads (merge)
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	332
13477 0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	333	test id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	334
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	335	$ hg id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	336	db815d6d32e6 tip Y/Z/x y
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	337
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	338	test rollback
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	339
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	340	$ echo foo > f1
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	341	$ hg ci -Amr
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	342	adding f1
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	343	$ hg bookmark -f Y -r 1
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	344	$ hg bookmark -f Z -r 1
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	345	$ hg rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	346	repository tip rolled back to revision 2 (undo commit)
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	347	working directory now based on revision 2
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	348	$ hg bookmarks
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	349	X2 1:925d80f479bb
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	350	Y 2:db815d6d32e6
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	351	* Z 2:db815d6d32e6
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	352	x y 2:db815d6d32e6
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	353
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	354	test clone
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	355
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	356	$ hg bookmark -r 2 -i @
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	357	$ hg bookmark -r 2 -i a@
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	358	$ hg bookmarks
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	359	@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	360	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	361	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	362	* Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	363	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	364	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	365	$ hg clone . cloned-bookmarks
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	366	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	367	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	368	$ hg -R cloned-bookmarks bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	369	* @ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	370	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	371	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	372	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	373	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	374	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	375
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	376	test clone with pull protocol
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	377
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	378	$ hg clone --pull . cloned-bookmarks-pull
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	379	requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	380	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	381	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	382	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	383	added 3 changesets with 3 changes to 3 files (+1 heads)
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	384	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	385	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	386	$ hg -R cloned-bookmarks-pull bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	387	* @ 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	388	X2 1:925d80f479bb
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	389	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	390	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	391	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	392	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	393
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	394	$ hg bookmark -d @
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	395	$ hg bookmark -d a@
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	396
17868 04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	397	test clone with a bookmark named "default" (issue3677)
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	398
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	399	$ hg bookmark -r 1 -f -i default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	400	$ hg clone . cloned-bookmark-default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	401	updating to branch default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	402	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	403	$ hg -R cloned-bookmark-default bookmarks
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	404	X2 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	405	Y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	406	Z 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	407	default 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	408	x y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	409	$ hg -R cloned-bookmark-default parents -q
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	410	2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	411	$ hg bookmark -d default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	412
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	413	test clone with a specific revision
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	414
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	415	$ hg clone -r 925d80 . cloned-bookmarks-rev
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	416	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	417	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	418	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	419	added 2 changesets with 2 changes to 2 files
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	420	updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	421	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	422	$ hg -R cloned-bookmarks-rev bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	423	X2 1:925d80f479bb
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	424
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	425	test clone with update to a bookmark
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	426
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	427	$ hg clone -u Z . cloned-bookmarks-update
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	428	updating to branch default
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	429	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	430	$ hg -R cloned-bookmarks-update bookmarks
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	431	X2 1:925d80f479bb
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	432	Y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	433	* Z 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	434	x y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	435
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	436	create bundle with two heads
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	437
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	438	$ hg clone . tobundle
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	439	updating to branch default
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	440	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	441	$ echo x > tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	442	$ hg -R tobundle add tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	443	$ hg -R tobundle commit -m'x'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	444	$ hg -R tobundle update -r -2
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	445	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	446	$ echo y > tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	447	$ hg -R tobundle branch test
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	448	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14906 diff changeset	449	(branches are permanent and global, did you want a bookmark?)
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	450	$ hg -R tobundle add tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	451	$ hg -R tobundle commit -m'y'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	452	$ hg -R tobundle bundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	453	searching for changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	454	2 changesets found
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	455	$ hg unbundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	456	adding changesets
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	457	adding manifests
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	458	adding file changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	459	added 2 changesets with 2 changes to 2 files (+1 heads)
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	460	(run 'hg heads' to see heads, 'hg merge' to merge)
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	461
2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	462	update to current bookmark if it's not the parent
2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	463
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	464	$ hg update
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	465	updating to active bookmark Z
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	466	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	467	$ hg bookmarks
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	468	X2 1:925d80f479bb
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	469	Y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	470	* Z 3:125c9a1d6df6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	471	x y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	472
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	473	test wrongly formated bookmark
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	474
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	475	$ echo '' >> .hg/bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	476	$ hg bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	477	X2 1:925d80f479bb
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	478	Y 2:db815d6d32e6
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	479	* Z 3:125c9a1d6df6
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	480	x y 2:db815d6d32e6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	481	$ echo "Ican'thasformatedlines" >> .hg/bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	482	$ hg bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	483	malformed line in .hg/bookmarks: "Ican'thasformatedlines"
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	484	X2 1:925d80f479bb
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	485	Y 2:db815d6d32e6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	486	* Z 3:125c9a1d6df6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	487	x y 2:db815d6d32e6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	488
16573 5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	489	test missing revisions
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	490
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	491	$ echo "925d80f479bc z" > .hg/bookmarks
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	492	$ hg book
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	493	no bookmarks set
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	494
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	495	test stripping a non-checked-out but bookmarked revision
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	496
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	497	$ hg --config extensions.graphlog= log --graph
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	498	o changeset: 4:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	499	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	500	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	501	\| parent: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	502	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	503	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	504	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	505	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	506	\| @ changeset: 3:125c9a1d6df6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	507	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	508	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	509	\| summary: x
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	510	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	511	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	512	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	513	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	514	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	515	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	516	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	517	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	518	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	519	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	520	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	521	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	522	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	523	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	524	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	525	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	526
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	527	$ hg book should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	528	$ hg co --clean 4
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	529	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	530	$ hg book four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	531	$ hg --config extensions.mq= strip 3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	532	saved backup bundle to * (glob)
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	533	should-end-on-two should end up pointing to revision 2, as that's the
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	534	tipmost surviving ancestor of the stripped revision.
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	535	$ hg --config extensions.graphlog= log --graph
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	536	@ changeset: 3:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	537	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	538	\| bookmark: four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	539	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	540	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	541	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	542	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	543	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	544	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	545	\| bookmark: should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	546	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	547	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	548	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	549	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	550	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	551	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	552	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	553	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	554	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	555	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	556	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	557	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	558	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	559	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	560

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
	Tue, 29 Jan 2013 15:25:33 +0100
branch	stable
changeset 18499	d07834e52b4e
parent 18471	2096e025a728
child 18566	341868ef0cf6
permissions	-rw-r--r--