hg-stable: tests/test-bookmarks.t@b2be4ccaff1d (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
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	8	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	9	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	10	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	11
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	12	bookmark rev -1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	13
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	14	$ hg bookmark X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	15
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	16	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	17
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	18	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	19	* X -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	20
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	21	list bookmarks with color
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	22
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	23	$ hg --config extensions.color= --config color.mode=ansi \
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	24	> bookmarks --color=always
22775 b59c2c8c45df bookmarks: split ui.write() so that it can be easily ported to formatter api Yuya Nishihara <yuya@tcha.org> parents: 22105 diff changeset	25	\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	26
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	27	$ echo a > a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	28	$ hg add a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	29	$ 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	30
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	31	bookmark X moved to rev 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	32
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	33	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	34	* X 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	35
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	36	look up bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	37
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	38	$ hg log -r X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	39	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	40	bookmark: X
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	41	tag: tip
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	42	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	43	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	44	summary: 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	45
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	46
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	47	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	48
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	49	$ hg --config ui.strict=1 bookmark X2
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	50
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	51	bookmark rev -1 again
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 bookmark -r null Y
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	54
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	55	list bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	56
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	57	$ 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	58	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	59	* X2 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	60	Y -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	61
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	62	$ echo b > b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	63	$ hg add b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	64	$ hg commit -m 1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	65
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	66	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	67	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	68	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	69	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	70	"bookmark": "X",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	71	"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	72	"rev": 0
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	73	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	74	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	75	"active": true,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	76	"bookmark": "X2",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	77	"node": "925d80f479bb026b0fb3deb27503780b13f74123",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	78	"rev": 1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	79	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	80	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	81	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	82	"bookmark": "Y",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	83	"node": "0000000000000000000000000000000000000000",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	84	"rev": -1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	85	}
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	86	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	87
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	88	bookmarks revset
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	89
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	90	$ 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	91	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	92	bookmark: X
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	93	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	94	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	95	summary: 0
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	96
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	97	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	98	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	99	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	100	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	101	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	102	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	103
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	104	$ hg log -r 'bookmark(Y)'
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	105	$ 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	106	changeset: 1:925d80f479bb
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	107	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	108	tag: tip
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	109	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	110	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	111	summary: 1
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	112
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	113	$ 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	114	changeset: 0:f7b1eb17ad24
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	115	bookmark: X
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	116	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	117	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	118	summary: 0
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	119
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	120	changeset: 1:925d80f479bb
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	121	bookmark: X2
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	122	tag: tip
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	123	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	124	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	125	summary: 1
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	126
22105 3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	127	$ hg log -r 'bookmark("literal:X")'
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	128	changeset: 0:f7b1eb17ad24
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	129	bookmark: X
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	130	user: test
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	131	date: Thu Jan 01 00:00:00 1970 +0000
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	132	summary: 0
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	133
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	134
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	135	$ hg log -r 'bookmark(unknown)'
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	136	abort: bookmark 'unknown' does not exist!
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	137	[255]
26538 5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	138	$ hg log -r 'bookmark("literal:unknown")'
5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	139	abort: bookmark 'unknown' does not exist!
5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	140	[255]
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	141	$ hg log -r 'bookmark("re:unknown")'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	142	abort: no bookmarks exist that match 'unknown'!
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	143	[255]
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	144	$ hg log -r 'present(bookmark("literal:unknown"))'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	145	$ hg log -r 'present(bookmark("re:unknown"))'
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	146
12822 f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	147	$ hg help revsets \| grep 'bookmark('
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	148	"bookmark([name])"
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	149
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	150	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	151
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	152	$ 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	153	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	154	* X2 1:925d80f479bb
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	155	Y -1:000000000000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	156
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	157	bookmark rev 0 again
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	158
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	159	$ hg bookmark -r 0 Z
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	160
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	161	$ 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	162	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	163	(activating bookmark X)
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	164	$ echo c > c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	165	$ hg add c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	166	$ 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	167	created new head
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	168
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	169	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	170
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	171	$ 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	172	* 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	173	X2 1:925d80f479bb
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13386 diff changeset	174	Y -1:000000000000
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	175	Z 0:f7b1eb17ad24
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	176
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	177	rename nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	178
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	179	$ 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	180	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	181	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	182
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	183	rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	184
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	185	$ 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	186	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	187	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	188
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	189	force rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	190
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	191	$ hg bookmark -f -m X Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	192
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	193	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	194
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	195	$ 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	196	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	197	* Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	198	Z 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	199
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	200	bookmarks from a revset
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	201	$ hg bookmark -r '.^1' REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	202	$ hg bookmark -r ':tip' TIP
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	203	$ hg up -q TIP
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	204	$ hg bookmarks
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	205	REVSET 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	206	* TIP 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	207	X2 1:925d80f479bb
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	208	Y 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	209	Z 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	210
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	211	$ hg bookmark -d REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	212	$ hg bookmark -d TIP
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	213
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	214	rename without new name or multiple names
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	215
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	216	$ hg bookmark -m Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	217	abort: new bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	218	[255]
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	219	$ hg bookmark -m Y Y2 Y3
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	220	abort: only one new bookmark name allowed
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	221	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	222
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	223	delete without name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	224
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	225	$ hg bookmark -d
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	226	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	227	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	228
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	229	delete nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	230
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	231	$ 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	232	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	233	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	234
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	235	bookmark name with spaces should be stripped
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	236
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	237	$ hg bookmark ' x y '
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	238
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	239	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	240
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	241	$ 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	242	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	243	Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	244	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	245	* x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	246
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	247	look up stripped bookmark name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	248
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	249	$ 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	250	changeset: 2:db815d6d32e6
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	251	bookmark: Y
f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	252	bookmark: x y
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	253	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	254	parent: 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	255	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	256	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	257	summary: 2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	258
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	259
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	260	reject bookmark name with newline
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	261
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	262	$ hg bookmark '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	263	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	264	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	265	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	266
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	267	$ hg bookmark -m Z '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	268	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	269	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	270	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	271
17816 19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	272	bookmark with reserved name
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	273
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	274	$ hg bookmark tip
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	275	abort: the name 'tip' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	276	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	277
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	278	$ hg bookmark .
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	279	abort: the name '.' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	280	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	281
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	282	$ hg bookmark null
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	283	abort: the name 'null' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	284	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	285
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	286
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	287	bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	288
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	289	$ hg bookmark X2
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	290	abort: bookmark 'X2' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	291	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	292
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	293	$ hg bookmark -m Y Z
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	294	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	295	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	296
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	297	bookmark with name of branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	298
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	299	$ hg bookmark default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	300	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	301	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	302
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	303	$ hg bookmark -m Y default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	304	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	305	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	306
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	307	bookmark with integer name
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	308
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	309	$ hg bookmark 10
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18782 diff changeset	310	abort: cannot use an integer as a name
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	311	[255]
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	312
17790 0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	313	incompatible options
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	314
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	315	$ 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	316	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	317	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	318
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	319	$ 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	320	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	321	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	322
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	323	$ 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	324	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	325	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	326
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	327	force bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	328
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	329	$ hg bookmark -f X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	330
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	331	force bookmark back to where it was, should deactivate it
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	332
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	333	$ hg bookmark -fr1 X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	334	$ hg bookmarks
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	335	X2 1:925d80f479bb
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	336	Y 2:db815d6d32e6
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	337	Z 0:f7b1eb17ad24
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	338	x y 2:db815d6d32e6
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	339
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	340	forward bookmark to descendant without --force
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	341
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	342	$ hg bookmark Z
18774 b616c9b8001d bookmarks: fix test broken by 0bba1ff2ac7b Kevin Bullock <kbullock@ringworld.org> parents: 18773 diff changeset	343	moving bookmark 'Z' forward from f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	344
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	345	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	346
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	347	$ 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	348	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	349	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	350	* 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	351	x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	352
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	353	revision but no bookmark name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	354
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	355	$ hg bookmark -r .
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	356	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	357	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	358
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	359	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	360
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	361	$ hg bookmark ' '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	362	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	363	[255]
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	364
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	365	$ hg bookmark -m Y ' '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	366	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	367	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	368
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	369	invalid bookmark
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	370
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	371	$ hg bookmark 'foo:bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	372	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	373	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	374
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	375	$ hg bookmark 'foo
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	376	> bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	377	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	378	[255]
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	379
13474 6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	380	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	381
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	382	$ echo "[extensions]" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	383	$ echo "bookmarks=" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	384	$ hg bookmarks
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	385	X2 1:925d80f479bb
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	386	Y 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	387	* Z 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	388	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	389
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	390	test summary
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	391
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	392	$ hg summary
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	393	parent: 2:db815d6d32e6 tip
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	394	2
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	395	branch: default
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	396	bookmarks: *Z Y x y
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	397	commit: (clean)
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	398	update: 1 new changesets, 2 branch heads (merge)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	399	phases: 3 draft
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	400
13477 0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	401	test id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	402
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	403	$ hg id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	404	db815d6d32e6 tip Y/Z/x y
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	405
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	406	test rollback
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	407
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	408	$ echo foo > f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	409	$ hg bookmark tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	410	$ hg ci -Amr
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	411	adding f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	412	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	413	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	414	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	415	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	416	* tmp-rollback 3:2bf5cfec5864
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	417	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	418	$ hg rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	419	repository tip rolled back to revision 2 (undo commit)
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	420	working directory now based on revision 2
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	421	$ hg bookmarks
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	422	X2 1:925d80f479bb
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	423	Y 2:db815d6d32e6
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	424	Z 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	425	* tmp-rollback 2:db815d6d32e6
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	426	x y 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	427	$ hg bookmark -f Z -r 1
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	428	$ hg rollback
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	429	repository tip rolled back to revision 2 (undo bookmark)
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	430	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	431	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	432	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	433	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	434	* tmp-rollback 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	435	x y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	436	$ hg bookmark -d tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	437
18781 99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	438	activate bookmark on working dir parent without --force
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	439
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	440	$ hg bookmark --inactive Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	441	$ hg bookmark Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	442
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	443	test clone
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	444
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	445	$ hg bookmark -r 2 -i @
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	446	$ hg bookmark -r 2 -i a@
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	447	$ hg bookmarks
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	448	@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	449	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	450	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	451	* Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	452	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	453	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	454	$ hg clone . cloned-bookmarks
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	455	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	456	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	457	$ hg -R cloned-bookmarks bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	458	* @ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	459	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	460	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	461	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	462	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	463	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	464
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	465	test clone with pull protocol
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	466
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	467	$ hg clone --pull . cloned-bookmarks-pull
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	468	requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	469	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	470	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	471	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	472	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	473	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	474	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	475	$ 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	476	* @ 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	477	X2 1:925d80f479bb
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	478	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	479	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	480	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	481	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	482
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	483	delete multiple bookmarks at once
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	484
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	485	$ hg bookmark -d @ a@
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	486
17868 04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	487	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	488
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	489	$ 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	490	$ 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	491	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	492	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	493	$ 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	494	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	495	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	496	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	497	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	498	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	499	$ 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	500	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	501	$ 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	502
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	503	test clone with a specific revision
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	504
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	505	$ hg clone -r 925d80 . cloned-bookmarks-rev
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	506	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	507	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	508	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	509	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	510	updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	511	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	512	$ hg -R cloned-bookmarks-rev bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	513	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	514
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	515	test clone with update to a bookmark
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	516
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	517	$ hg clone -u Z . ../cloned-bookmarks-update
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	518	updating to branch default
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	519	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	520	$ hg -R ../cloned-bookmarks-update bookmarks
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	521	X2 1:925d80f479bb
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	522	Y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	523	* Z 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	524	x y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	525
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	526	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	527
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	528	$ 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	529	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	530	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	531	$ 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	532	$ 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	533	$ 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	534	$ 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	535	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	536	$ 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	537	$ 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	538	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14906 diff changeset	539	(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	540	$ 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	541	$ 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	542	$ 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	543	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	544	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	545	$ 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	546	adding changesets
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	547	adding manifests
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	548	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	549	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	550	(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	551
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 25111 diff changeset	552	update to active bookmark if it's not the parent
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	553
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	554	$ hg summary
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	555	parent: 2:db815d6d32e6
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	556	2
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	557	branch: default
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	558	bookmarks: *Z Y x y
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	559	commit: 1 added, 1 unknown (new branch head)
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	560	update: 2 new changesets (update)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	561	phases: 5 draft
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	562	$ hg update
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	563	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	564	updating 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	565	$ hg bookmarks
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	566	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	567	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	568	* 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	569	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	570
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	571	pull --update works the same as pull && update
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	572
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	573	$ hg bookmark -r3 Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	574	moving bookmark 'Y' forward from db815d6d32e6
30562 c059286a0f9c tests: replace "cp -r" with "cp -R" Jun Wu <quark@fb.com> parents: 30342 diff changeset	575	$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
c059286a0f9c tests: replace "cp -r" with "cp -R" Jun Wu <quark@fb.com> parents: 30342 diff changeset	576	$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	577
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	578	(manual version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	579
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	580	$ hg -R ../cloned-bookmarks-manual-update update Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	581	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	582	(activating bookmark Y)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	583	$ hg -R ../cloned-bookmarks-manual-update pull .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	584	pulling from .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	585	searching for changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	586	adding changesets
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	587	adding manifests
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	588	adding file changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	589	added 2 changesets with 2 changes to 2 files (+1 heads)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	590	updating bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	591	updating bookmark Z
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	592	(run 'hg heads' to see heads, 'hg merge' to merge)
26286 4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	593
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	594	(# tests strange but with --date crashing when bookmark have to move)
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	595
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	596	$ hg -R ../cloned-bookmarks-manual-update update -d 1986
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	597	abort: revision matching date not found
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	598	[255]
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	599	$ hg -R ../cloned-bookmarks-manual-update update
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	600	updating to active bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	601	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	602
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	603	(all in one version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	604
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	605	$ hg -R ../cloned-bookmarks-update update Y
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	606	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	607	(activating bookmark Y)
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	608	$ hg -R ../cloned-bookmarks-update pull --update .
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	609	pulling from .
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	610	searching for changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	611	adding changesets
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	612	adding manifests
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	613	adding file changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	614	added 2 changesets with 2 changes to 2 files (+1 heads)
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	615	updating bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	616	updating bookmark Z
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	617	updating to active bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	618	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	619
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	620	We warn about divergent during bare update to the active bookmark
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	621
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	622	$ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	623	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	624	(activating bookmark Y)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	625	$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	626	$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	627	X2 1:925d80f479bb
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	628	* Y 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	629	Y@1 1:925d80f479bb
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	630	Z 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	631	x y 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	632	$ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	633	pulling from $TESTTMP
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	634	searching for changes
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	635	adding changesets
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	636	adding manifests
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	637	adding file changes
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	638	added 2 changesets with 2 changes to 2 files (+1 heads)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	639	updating bookmark Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	640	updating bookmark Z
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	641	(run 'hg heads' to see heads, 'hg merge' to merge)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	642	$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	643	updating to active bookmark Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	644	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	645	1 other divergent bookmarks for "Y"
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	646
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	647	test wrongly formated bookmark
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	648
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	649	$ echo '' >> .hg/bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	650	$ hg bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	651	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	652	Y 3:125c9a1d6df6
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	653	* Z 3:125c9a1d6df6
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	654	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	655	$ 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	656	$ hg bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	657	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	658	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	659	Y 3:125c9a1d6df6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	660	* 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	661	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	662
16573 5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	663	test missing revisions
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	664
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	665	$ echo "925d80f479bc z" > .hg/bookmarks
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	666	$ hg book
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	667	no bookmarks set
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	668
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	669	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	670
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	671	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	672	o changeset: 4:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	673	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	674	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	675	\| parent: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	676	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	677	\| 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	678	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	679	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	680	\| @ changeset: 3:125c9a1d6df6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	681	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	682	\| 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	683	\| summary: x
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	684	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	685	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	686	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	687	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	688	\| 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	689	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	690	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	691	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	692	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	693	\| 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	694	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	695	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	696	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	697	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	698	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	699	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	700
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	701	$ hg book should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	702	$ hg co --clean 4
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	703	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
21404 ca275f7ec576 update: when deactivating a bookmark, print a message Siddharth Agarwal <sid0@fb.com> parents: 20117 diff changeset	704	(leaving bookmark should-end-on-two)
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	705	$ hg book four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	706	$ hg --config extensions.mq= strip 3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	707	saved backup bundle to * (glob)
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	708	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	709	tipmost surviving ancestor of the stripped revision.
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	710	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	711	@ changeset: 3:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	712	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	713	\| bookmark: four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	714	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	715	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	716	\| 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	717	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	718	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	719	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	720	\| bookmark: should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	721	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	722	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	723	\| 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	724	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	725	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	726	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	727	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	728	\| 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	729	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	730	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	731	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	732	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	733	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	734	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	735
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	736
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 28830 diff changeset	737	no-op update doesn't deactivate bookmarks
26676 71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	738
28500 2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	739	$ hg bookmarks
2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	740	* four 3:9ba5f110a0b3
2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	741	should-end-on-two 2:db815d6d32e6
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	742	$ hg up four
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	743	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
26676 71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	744	$ hg up
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	745	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	746	$ hg sum
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	747	parent: 3:9ba5f110a0b3 tip
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	748	y
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	749	branch: test
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	750	bookmarks: *four
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	751	commit: 2 unknown (clean)
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	752	update: (current)
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	753	phases: 4 draft
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	754
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	755	test clearing divergent bookmarks of linear ancestors
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	756
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	757	$ hg bookmark Z -r 0
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	758	$ hg bookmark Z@1 -r 1
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	759	$ hg bookmark Z@2 -r 2
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	760	$ hg bookmark Z@3 -r 3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	761	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	762	Z 0:f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	763	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	764	Z@2 2:db815d6d32e6
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	765	Z@3 3:9ba5f110a0b3
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	766	* four 3:9ba5f110a0b3
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	767	should-end-on-two 2:db815d6d32e6
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	768	$ hg bookmark Z
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	769	moving bookmark 'Z' forward from f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	770	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	771	* Z 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	772	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	773	four 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	774	should-end-on-two 2:db815d6d32e6
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	775
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	776	test clearing only a single divergent bookmark across branches
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	777
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	778	$ hg book foo -r 1
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	779	$ hg book foo@1 -r 0
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	780	$ hg book foo@2 -r 2
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	781	$ hg book foo@3 -r 3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	782	$ hg book foo -r foo@3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	783	$ hg book
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	784	* Z 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	785	Z@1 1:925d80f479bb
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	786	foo 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	787	foo@1 0:f7b1eb17ad24
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	788	foo@2 2:db815d6d32e6
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	789	four 3:9ba5f110a0b3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	790	should-end-on-two 2:db815d6d32e6
27948 7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	791
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	792	pull --update works the same as pull && update (case #2)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	793
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	794	It is assumed that "hg pull" itself doesn't update current active
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	795	bookmark ('Y' in tests below).
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	796
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	797	$ hg pull -q ../cloned-bookmarks-update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	798	divergent bookmark Z stored as Z@2
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	799
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	800	(pulling revision on another named branch with --update updates
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	801	neither the working directory nor current active bookmark: "no-op"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	802	case)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	803
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	804	$ echo yy >> y
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	805	$ hg commit -m yy
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	806
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	807	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	808	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	809	$ hg -R ../cloned-bookmarks-update pull . --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	810	pulling from .
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	811	searching for changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	812	adding changesets
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	813	adding manifests
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	814	adding file changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	815	added 1 changesets with 1 changes to 1 files
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	816	divergent bookmark Z stored as Z@default
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	817	adding remote bookmark foo
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	818	adding remote bookmark four
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	819	adding remote bookmark should-end-on-two
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	820	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	821	$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node\|short}\n"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	822	3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	823	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	824	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	825
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	826	(pulling revision on current named/topological branch with --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	827	updates the working directory and current active bookmark)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	828
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	829	$ hg update -C -q 125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	830	$ echo xx >> x
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	831	$ hg commit -m xx
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	832
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	833	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	834	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	835	$ hg -R ../cloned-bookmarks-update pull . --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	836	pulling from .
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	837	searching for changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	838	adding changesets
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	839	adding manifests
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	840	adding file changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	841	added 1 changesets with 1 changes to 1 files
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	842	divergent bookmark Z stored as Z@default
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	843	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	844	updating bookmark Y
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	845	$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node\|short}\n"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	846	6:81dcce76aa0b
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	847	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	848	* Y 6:81dcce76aa0b
28830 a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	849
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	850	$ cd ..
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	851
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	852	ensure changelog is written before bookmarks
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	853	$ hg init orderrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	854	$ cd orderrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	855	$ touch a
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	856	$ hg commit -Aqm one
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	857	$ hg book mybook
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	858	$ echo a > a
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	859
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	860	$ cat > $TESTTMP/pausefinalize.py <<EOF
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	861	> from mercurial import extensions, localrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	862	> import os, time
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	863	> def transaction(orig, self, desc, report=None):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	864	> tr = orig(self, desc, report)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	865	> def sleep(args, *kwargs):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	866	> retry = 20
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	867	> while retry > 0 and not os.path.exists("$TESTTMP/unpause"):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	868	> retry -= 1
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	869	> time.sleep(0.5)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	870	> if os.path.exists("$TESTTMP/unpause"):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	871	> os.remove("$TESTTMP/unpause")
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	872	> # It is important that this finalizer start with 'a', so it runs before
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	873	> # the changelog finalizer appends to the changelog.
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	874	> tr.addfinalize('a-sleep', sleep)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	875	> return tr
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	876	>
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	877	> def extsetup(ui):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	878	> # This extension inserts an artifical pause during the transaction
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	879	> # finalizer, so we can run commands mid-transaction-close.
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	880	> extensions.wrapfunction(localrepo.localrepository, 'transaction',
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	881	> transaction)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	882	> EOF
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	883	$ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	884	$ sleep 2
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	885	$ hg log -r .
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	886	changeset: 0:867bc5792c8c
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	887	bookmark: mybook
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	888	tag: tip
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	889	user: test
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	890	date: Thu Jan 01 00:00:00 1970 +0000
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	891	summary: one
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	892
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	893	$ hg bookmarks
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	894	* mybook 0:867bc5792c8c
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	895	$ touch $TESTTMP/unpause
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	896
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	897	$ cd ..

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
	Fri, 18 Nov 2016 18:18:15 +0100
changeset 30657	b2be4ccaff1d
parent 30562	c059286a0f9c
child 31071	96eaefd350ae
permissions	-rw-r--r--