mercurial: tests/test-status.t@47ccab19bf9f (annotated)

47129 93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	1	#testcases dirstate-v1 dirstate-v1-tree
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	2
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	3	#if dirstate-v1-tree
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	4	#require rust
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	5	$ echo '[experimental]' >> $HGRCPATH
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	6	$ echo 'dirstate-tree.in-memory=1' >> $HGRCPATH
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	7	#endif
93eb6c8035a9 dirstate-tree: Add a dirstate-v1-tree variant of some tests Simon Sapin <simon.sapin@octobus.net> parents: 46489 diff changeset	8
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	9	$ hg init repo1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	10	$ cd repo1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	11	$ mkdir a b a/1 b/1 b/2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	12	$ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	13
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	14	hg status in repo root:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	15
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	16	$ hg status
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	17	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	18	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	19	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	20	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	21	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	22	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	23
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	24	hg status . in repo root:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	25
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	26	$ hg status .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	27	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	28	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	29	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	30	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	31	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	32	? in_root
1624 d9e576e55d81 Added test for relative paths and all status flags for 'hg status' Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	33
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	34	$ hg status --cwd a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	35	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	36	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	37	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	38	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	39	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	40	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	41	$ hg status --cwd a .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	42	? 1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	43	? in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	44	$ hg status --cwd a ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	45	? 1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	46	? in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	47	? ../b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	48	? ../b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	49	? ../b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	50	? ../in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	51
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	52	$ hg status --cwd b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	53	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	54	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	55	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	56	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	57	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	58	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	59	$ hg status --cwd b .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	60	? 1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	61	? 2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	62	? in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	63	$ hg status --cwd b ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	64	? ../a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	65	? ../a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	66	? 1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	67	? 2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	68	? in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	69	? ../in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	70
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	71	$ hg status --cwd a/1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	72	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	73	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	74	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	75	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	76	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	77	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	78	$ hg status --cwd a/1 .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	79	? in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	80	$ hg status --cwd a/1 ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	81	? in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	82	? ../in_a
1624 d9e576e55d81 Added test for relative paths and all status flags for 'hg status' Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	83
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	84	$ hg status --cwd b/1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	85	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	86	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	87	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	88	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	89	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	90	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	91	$ hg status --cwd b/1 .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	92	? in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	93	$ hg status --cwd b/1 ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	94	? in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	95	? ../2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	96	? ../in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	97
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	98	$ hg status --cwd b/2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	99	? a/1/in_a_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	100	? a/in_a
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	101	? b/1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	102	? b/2/in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	103	? b/in_b
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	104	? in_root
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	105	$ hg status --cwd b/2 .
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	106	? in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	107	$ hg status --cwd b/2 ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	108	? ../1/in_b_1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	109	? in_b_2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	110	? ../in_b
19107 fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	111
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	112	combining patterns with root and patterns without a root works
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	113
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	114	$ hg st a/in_a re:.*b$
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	115	? a/in_a
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	116	? b/in_b
fcf08023c011 match: fix root calculation for combining regexps with simple paths Mads Kiilerich <madski@unity3d.com> parents: 17377 diff changeset	117
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	118	tweaking defaults works
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	119	$ hg status --cwd a --config ui.tweakdefaults=yes
38762 fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	120	? 1/in_a_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	121	? in_a
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	122	? ../b/1/in_b_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	123	? ../b/2/in_b_2
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	124	? ../b/in_b
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	125	? ../in_root
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	126	$ HGPLAIN=1 hg status --cwd a --config ui.tweakdefaults=yes
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	127	? a/1/in_a_1 (glob)
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	128	? a/in_a (glob)
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	129	? b/1/in_b_1 (glob)
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	130	? b/2/in_b_2 (glob)
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	131	? b/in_b (glob)
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	132	? in_root
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	133	$ HGPLAINEXCEPT=tweakdefaults hg status --cwd a --config ui.tweakdefaults=yes
38762 fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	134	? 1/in_a_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	135	? in_a
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	136	? ../b/1/in_b_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	137	? ../b/2/in_b_2
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	138	? ../b/in_b
32887 28a0e6a4e824 test-status: glob fixes for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 32872 diff changeset	139	? ../in_root (glob)
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	140
31589 7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	141	relative paths can be requested
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	142
41577 5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	143	$ hg status --cwd a --config ui.relative-paths=yes
41492 02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	144	? 1/in_a_1
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	145	? in_a
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	146	? ../b/1/in_b_1
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	147	? ../b/2/in_b_2
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	148	? ../b/in_b
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	149	? ../in_root
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	150
41577 5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	151	$ hg status --cwd a . --config ui.relative-paths=legacy
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	152	? 1/in_a_1
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	153	? in_a
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	154	$ hg status --cwd a . --config ui.relative-paths=no
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	155	? a/1/in_a_1
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	156	? a/in_a
5f827e9ce870 status: if ui.relative-paths=no, don't use relative paths even with patterns Martin von Zweigbergk <martinvonz@google.com> parents: 41492 diff changeset	157
41492 02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	158	commands.status.relative overrides ui.relative-paths
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	159
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	160	$ cat >> $HGRCPATH <<EOF
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	161	> [ui]
02186c6871ac status: introduce higher-level ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 40278 diff changeset	162	> relative-paths = False
31589 7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	163	> [commands]
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	164	> status.relative = True
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	165	> EOF
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	166	$ hg status --cwd a
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	167	? 1/in_a_1
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	168	? in_a
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	169	? ../b/1/in_b_1
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	170	? ../b/2/in_b_2
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	171	? ../b/in_b
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	172	? ../in_root
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	173	$ HGPLAIN=1 hg status --cwd a
31766 bdcaf612e75a tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31589 diff changeset	174	? a/1/in_a_1 (glob)
bdcaf612e75a tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31589 diff changeset	175	? a/in_a (glob)
bdcaf612e75a tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31589 diff changeset	176	? b/1/in_b_1 (glob)
bdcaf612e75a tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31589 diff changeset	177	? b/2/in_b_2 (glob)
bdcaf612e75a tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 31589 diff changeset	178	? b/in_b (glob)
31589 7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	179	? in_root
7e3b145f8247 status: support commands.status.relative config Martin von Zweigbergk <martinvonz@google.com> parents: 31423 diff changeset	180
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	181	if relative paths are explicitly off, tweakdefaults doesn't change it
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	182	$ cat >> $HGRCPATH <<EOF
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	183	> [commands]
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	184	> status.relative = False
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	185	> EOF
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	186	$ hg status --cwd a --config ui.tweakdefaults=yes
38762 fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	187	? a/1/in_a_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	188	? a/in_a
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	189	? b/1/in_b_1
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	190	? b/2/in_b_2
fe3ca1e6f786 ui: remove commands.status.terse=u from ui.tweakdefaults Gregory Szorc <gregory.szorc@gmail.com> parents: 38545 diff changeset	191	? b/in_b
32872 9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	192	? in_root
9fcb6df413c9 ui: add support for a tweakdefaults knob Augie Fackler <augie@google.com> parents: 31766 diff changeset	193
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	194	$ cd ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	195
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	196	$ hg init repo2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	197	$ cd repo2
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	198	$ touch modified removed deleted ignored
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	199	$ echo "^ignored$" > .hgignore
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11782 diff changeset	200	$ hg ci -A -m 'initial checkin'
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	201	adding .hgignore
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	202	adding deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	203	adding modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	204	adding removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	205	$ touch modified added unknown ignored
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	206	$ hg add added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	207	$ hg remove removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	208	$ rm deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	209
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	210	hg status:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	211
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	212	$ hg status
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	213	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	214	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	215	! deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	216	? unknown
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	217
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	218	hg status modified added removed deleted unknown never-existed ignored:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	219
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	220	$ hg status modified added removed deleted unknown never-existed ignored
15521 117f9190c1ba tests: hide 'No such file or directory' messages Mads Kiilerich <mads@kiilerich.com> parents: 14155 diff changeset	221	never-existed: * (glob)
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	222	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	223	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	224	! deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	225	? unknown
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	226
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	227	$ hg copy modified copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	228
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	229	hg status -C:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	230
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	231	$ hg status -C
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	232	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	233	A copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	234	modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	235	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	236	! deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	237	? unknown
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	238
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	239	hg status -A:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	240
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	241	$ hg status -A
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	242	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	243	A copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	244	modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	245	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	246	! deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	247	? unknown
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	248	I ignored
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	249	C .hgignore
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	250	C modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	251
38545 85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	252	$ hg status -A -T '{status} {path} {node\|shortest}\n'
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	253	A added ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	254	A copied ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	255	R removed ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	256	! deleted ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	257	? unknown ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	258	I ignored ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	259	C .hgignore ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	260	C modified ffff
85e3aa21bcdc status: add support for log-like template keywords and functions Yuya Nishihara <yuya@tcha.org> parents: 38101 diff changeset	261
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	262	$ hg status -A -Tjson
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	263	[
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	264	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	265	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	266	"path": "added",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	267	"status": "A"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	268	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	269	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	270	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	271	"path": "copied",
39370 46f3ff64bea7 status: rename {copy} to {source} for compatibility with {file_copies} (BC) Yuya Nishihara <yuya@tcha.org> parents: 38762 diff changeset	272	"source": "modified",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	273	"status": "A"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	274	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	275	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	276	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	277	"path": "removed",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	278	"status": "R"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	279	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	280	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	281	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	282	"path": "deleted",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	283	"status": "!"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	284	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	285	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	286	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	287	"path": "unknown",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	288	"status": "?"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	289	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	290	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	291	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	292	"path": "ignored",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	293	"status": "I"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	294	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	295	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	296	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	297	"path": ".hgignore",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	298	"status": "C"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	299	},
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	300	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	301	"itemtype": "file",
22429 7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	302	"path": "modified",
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	303	"status": "C"
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	304	}
7a7eed5176a4 commands: add hidden -T option for files/manifest/status/tags Matt Mackall <mpm@selenic.com> parents: 22424 diff changeset	305	]
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	306
22430 968247e8f4ac formatter: add pickle format Matt Mackall <mpm@selenic.com> parents: 22429 diff changeset	307	$ hg status -A -Tpickle > pickle
29485 6a98f9408a50 py3: make files use absolute_import and print_function Pulkit Goyal <7895pulkit@gmail.com> parents: 29000 diff changeset	308	>>> from __future__ import print_function
41844 2105ed01c431 tests: make test-status.t compatible with test-check-module-imports.t Pulkit Goyal <pulkit@yandex-team.ru> parents: 41735 diff changeset	309	>>> from mercurial import util
2105ed01c431 tests: make test-status.t compatible with test-check-module-imports.t Pulkit Goyal <pulkit@yandex-team.ru> parents: 41735 diff changeset	310	>>> pickle = util.pickle
40278 125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	311	>>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	312	>>> for s, p in data: print("%s %s" % (s, p))
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	313	! deleted
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	314	? pickle
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	315	? unknown
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	316	A added
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	317	A copied
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	318	C .hgignore
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	319	C modified
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	320	I ignored
125fc478719f py3: fix test-status.t Mark Thomas <mbthomas@fb.com> parents: 40277 diff changeset	321	R removed
22430 968247e8f4ac formatter: add pickle format Matt Mackall <mpm@selenic.com> parents: 22429 diff changeset	322	$ rm pickle
968247e8f4ac formatter: add pickle format Matt Mackall <mpm@selenic.com> parents: 22429 diff changeset	323
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	324	$ echo "^ignoreddir$" > .hgignore
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	325	$ mkdir ignoreddir
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	326	$ touch ignoreddir/file
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	327
25515 e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	328	Test templater support:
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	329
39370 46f3ff64bea7 status: rename {copy} to {source} for compatibility with {file_copies} (BC) Yuya Nishihara <yuya@tcha.org> parents: 38762 diff changeset	330	$ hg status -AT "[{status}]\t{if(source, '{source} -> ')}{path}\n"
25515 e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	331	[M] .hgignore
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	332	[A] added
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	333	[A] modified -> copied
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	334	[R] removed
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	335	[!] deleted
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	336	[?] ignored
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	337	[?] unknown
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	338	[I] ignoreddir/file
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	339	[C] modified
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	340	$ hg status -AT default
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	341	M .hgignore
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	342	A added
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	343	A copied
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	344	modified
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	345	R removed
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	346	! deleted
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	347	? ignored
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	348	? unknown
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	349	I ignoreddir/file
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	350	C modified
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	351	$ hg status -T compact
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	352	abort: "status" not in template map
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	353	[255]
e8075329c5fb tests: test basic template support for status Matt Mackall <mpm@selenic.com> parents: 24663 diff changeset	354
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	355	hg status ignoreddir/file:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	356
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	357	$ hg status ignoreddir/file
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	358
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	359	hg status -i ignoreddir/file:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	360
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	361	$ hg status -i ignoreddir/file
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	362	I ignoreddir/file
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	363	$ cd ..
6200 acc40572da5b 'hg status -q' output skips non-tracked files. Zoran Bosnjak <zoran.bosnjak@via.si> parents: 6033 diff changeset	364
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	365	Check 'status -q' and some combinations
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	366
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	367	$ hg init repo3
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	368	$ cd repo3
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	369	$ touch modified removed deleted ignored
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	370	$ echo "^ignored$" > .hgignore
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	371	$ hg commit -A -m 'initial checkin'
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	372	adding .hgignore
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	373	adding deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	374	adding modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	375	adding removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	376	$ touch added unknown ignored
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	377	$ hg add added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	378	$ echo "test" >> modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	379	$ hg remove removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	380	$ rm deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	381	$ hg copy modified copied
6200 acc40572da5b 'hg status -q' output skips non-tracked files. Zoran Bosnjak <zoran.bosnjak@via.si> parents: 6033 diff changeset	382
24419 0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	383	Specify working directory revision explicitly, that should be the same as
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	384	"hg status"
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	385
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	386	$ hg status --change "wdir()"
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	387	M modified
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	388	A added
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	389	A copied
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	390	R removed
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	391	! deleted
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	392	? unknown
0e41f110e69e revset: add wdir() function to specify workingctx revision by command Yuya Nishihara <yuya@tcha.org> parents: 23402 diff changeset	393
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	394	Run status with 2 different flags.
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	395	Check if result is the same or different.
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	396	If result is not as expected, raise error
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	397
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	398	$ assert() {
12365 22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	399	> hg status $1 > ../a
22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	400	> hg status $2 > ../b
22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	401	> if diff ../a ../b > /dev/null; then
22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	402	> out=0
22f3353bcc36 tests: cleanup exit code handling in unified tests Matt Mackall <mpm@selenic.com> parents: 12328 diff changeset	403	> else
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	404	> out=1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	405	> fi
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	406	> if [ $3 -eq 0 ]; then
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	407	> df="same"
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	408	> else
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	409	> df="different"
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	410	> fi
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	411	> if [ $out -ne $3 ]; then
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	412	> echo "Error on $1 and $2, should be $df."
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	413	> fi
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	414	> }
6200 acc40572da5b 'hg status -q' output skips non-tracked files. Zoran Bosnjak <zoran.bosnjak@via.si> parents: 6033 diff changeset	415
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12156 diff changeset	416	Assert flag1 flag2 [0-same \| 1-different]
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	417
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	418	$ assert "-q" "-mard" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	419	$ assert "-A" "-marduicC" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	420	$ assert "-qA" "-mardcC" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	421	$ assert "-qAui" "-A" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	422	$ assert "-qAu" "-marducC" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	423	$ assert "-qAi" "-mardicC" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	424	$ assert "-qu" "-u" 0
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	425	$ assert "-q" "-u" 1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	426	$ assert "-m" "-a" 1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	427	$ assert "-r" "-d" 1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	428	$ cd ..
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	429
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	430	$ hg init repo4
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	431	$ cd repo4
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	432	$ touch modified removed deleted
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11782 diff changeset	433	$ hg ci -q -A -m 'initial checkin'
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	434	$ touch added unknown
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	435	$ hg add added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	436	$ hg remove removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	437	$ rm deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	438	$ echo x > modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	439	$ hg copy modified copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	440	$ hg ci -m 'test checkin' -d "1000001 0"
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	441	$ rm *
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	442	$ touch unrelated
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	443	$ hg ci -q -A -m 'unrelated checkin' -d "1000002 0"
6200 acc40572da5b 'hg status -q' output skips non-tracked files. Zoran Bosnjak <zoran.bosnjak@via.si> parents: 6033 diff changeset	444
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	445	hg status --change 1:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	446
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	447	$ hg status --change 1
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	448	M modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	449	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	450	A copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	451	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	452
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	453	hg status --change 1 unrelated:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	454
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	455	$ hg status --change 1 unrelated
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	456
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	457	hg status -C --change 1 added modified copied removed deleted:
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	458
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	459	$ hg status -C --change 1 added modified copied removed deleted
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	460	M modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	461	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	462	A copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	463	modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	464	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	465
15578 db0e277bdd37 status: support revsets with --change Patrick Mezard <pmezard@gmail.com> parents: 15521 diff changeset	466	hg status -A --change 1 and revset:
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	467
15578 db0e277bdd37 status: support revsets with --change Patrick Mezard <pmezard@gmail.com> parents: 15521 diff changeset	468	$ hg status -A --change '1\|1'
11782 992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	469	M modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	470	A added
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	471	A copied
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	472	modified
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	473	R removed
992506c14217 tests: unify test-status Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10014 diff changeset	474	C deleted
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	475
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	476	$ cd ..
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	477
27668 369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	478	hg status with --rev and reverted changes:
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	479
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	480	$ hg init reverted-changes-repo
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	481	$ cd reverted-changes-repo
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	482	$ echo a > file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	483	$ hg add file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	484	$ hg ci -m a
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	485	$ echo b > file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	486	$ hg ci -m b
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	487
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	488	reverted file should appear clean
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	489
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	490	$ hg revert -r 0 .
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	491	reverting file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	492	$ hg status -A --rev 0
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	493	C file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	494
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	495	#if execbit
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	496	reverted file with changed flag should appear modified
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	497
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	498	$ chmod +x file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	499	$ hg status -A --rev 0
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	500	M file
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	501
27743 5dcadc6c5aed test-status: stabilize for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 27720 diff changeset	502	$ hg revert -r 0 .
5dcadc6c5aed test-status: stabilize for no-execbit platforms Matt Harbison <matt_harbison@yahoo.com> parents: 27720 diff changeset	503	reverting file
27749 215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	504
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	505	reverted and committed file with changed flag should appear modified
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	506
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	507	$ hg co -C .
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	508	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	509	$ chmod +x file
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	510	$ hg ci -m 'change flag'
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	511	$ hg status -A --rev 1 --rev 2
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	512	M file
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	513	$ hg diff -r 1 -r 2
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	514
27668 369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	515	#endif
369c8f9453c2 status: revert + flag-change == modified Martin von Zweigbergk <martinvonz@google.com> parents: 25515 diff changeset	516
31423 568d80b24b3a tests: properly drop back to root dir in test-status.t Ryan McElroy <rmcelroy@fb.com> parents: 29485 diff changeset	517	$ cd ..
568d80b24b3a tests: properly drop back to root dir in test-status.t Ryan McElroy <rmcelroy@fb.com> parents: 29485 diff changeset	518
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	519	hg status of binary file starting with '\1\n', a separator for metadata:
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	520
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	521	$ hg init repo5
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	522	$ cd repo5
38017 6660b90805c6 py3: suppress the value returned by .write() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 36039 diff changeset	523	>>> open("010a", r"wb").write(b"\1\nfoo") and None
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	524	$ hg ci -q -A -m 'initial checkin'
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	525	$ hg status -A
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	526	C 010a
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	527
38017 6660b90805c6 py3: suppress the value returned by .write() calls Pulkit Goyal <7895pulkit@gmail.com> parents: 36039 diff changeset	528	>>> open("010a", r"wb").write(b"\1\nbar") and None
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	529	$ hg status -A
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	530	M 010a
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	531	$ hg ci -q -m 'modify 010a'
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	532	$ hg status -A --rev 0:1
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	533	M 010a
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	534
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	535	$ touch empty
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	536	$ hg ci -q -A -m 'add another file'
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	537	$ hg status -A --rev 1:2 010a
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 14155 diff changeset	538	C 010a
16144 4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	539
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	540	$ cd ..
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	541
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	542	test "hg status" with "directory pattern" which matches against files
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	543	only known on target revision.
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	544
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	545	$ hg init repo6
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	546	$ cd repo6
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	547
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	548	$ echo a > a.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	549	$ hg add a.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	550	$ hg commit -m '#0'
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	551	$ mkdir -p 1/2/3/4/5
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	552	$ echo b > 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	553	$ hg add 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	554	$ hg commit -m '#1'
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	555
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	556	$ hg update -C 0 > /dev/null
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	557	$ hg status -A
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	558	C a.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	559
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	560	the directory matching against specified pattern should be removed,
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	561	because directory existence prevents 'dirstate.walk()' from showing
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	562	warning message about such pattern.
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	563
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	564	$ test ! -d 1
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	565	$ hg status -A --rev 1 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	566	R 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	567	$ hg status -A --rev 1 1/2/3/4/5
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	568	R 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	569	$ hg status -A --rev 1 1/2/3
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	570	R 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	571	$ hg status -A --rev 1 1
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	572	R 1/2/3/4/5/b.txt
4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	573
22424 1f72226064b8 formatter: make debug style match Python syntax Matt Mackall <mpm@selenic.com> parents: 21972 diff changeset	574	$ hg status --config ui.formatdebug=True --rev 1 1
1f72226064b8 formatter: make debug style match Python syntax Matt Mackall <mpm@selenic.com> parents: 21972 diff changeset	575	status = [
40277 1159031ada1e formatter: make debug output prettier Yuya Nishihara <yuya@tcha.org> parents: 39370 diff changeset	576	{
43861 aac921f54554 status: outputting structured unfinished-operation information Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42502 diff changeset	577	'itemtype': 'file',
40277 1159031ada1e formatter: make debug output prettier Yuya Nishihara <yuya@tcha.org> parents: 39370 diff changeset	578	'path': '1/2/3/4/5/b.txt',
1159031ada1e formatter: make debug output prettier Yuya Nishihara <yuya@tcha.org> parents: 39370 diff changeset	579	'status': 'R'
1159031ada1e formatter: make debug output prettier Yuya Nishihara <yuya@tcha.org> parents: 39370 diff changeset	580	},
22424 1f72226064b8 formatter: make debug style match Python syntax Matt Mackall <mpm@selenic.com> parents: 21972 diff changeset	581	]
1f72226064b8 formatter: make debug style match Python syntax Matt Mackall <mpm@selenic.com> parents: 21972 diff changeset	582
17377 a10f7eeb2588 test-status.t: test ui.slash on Windows Patrick Mezard <patrick@mezard.eu> parents: 16144 diff changeset	583	#if windows
a10f7eeb2588 test-status.t: test ui.slash on Windows Patrick Mezard <patrick@mezard.eu> parents: 16144 diff changeset	584	$ hg --config ui.slash=false status -A --rev 1 1
a10f7eeb2588 test-status.t: test ui.slash on Windows Patrick Mezard <patrick@mezard.eu> parents: 16144 diff changeset	585	R 1\2\3\4\5\b.txt
a10f7eeb2588 test-status.t: test ui.slash on Windows Patrick Mezard <patrick@mezard.eu> parents: 16144 diff changeset	586	#endif
a10f7eeb2588 test-status.t: test ui.slash on Windows Patrick Mezard <patrick@mezard.eu> parents: 16144 diff changeset	587
16144 4546a8513dcd localrepository: use 'changectx.dirs()' in 'status()' for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16098 diff changeset	588	$ cd ..
23402 2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	589
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	590	Status after move overwriting a file (issue4458)
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	591	=================================================
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	592
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	593
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	594	$ hg init issue4458
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	595	$ cd issue4458
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	596	$ echo a > a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	597	$ echo b > b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	598	$ hg commit -Am base
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	599	adding a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	600	adding b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	601
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	602
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	603	with --force
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	604
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	605	$ hg mv b --force a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	606	$ hg st --copies
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	607	M a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	608	b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	609	R b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	610	$ hg revert --all
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	611	reverting a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	612	undeleting b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	613	$ rm *.orig
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	614
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	615	without force
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	616
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	617	$ hg rm a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	618	$ hg st --copies
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	619	R a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	620	$ hg mv b a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	621	$ hg st --copies
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	622	M a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	623	b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	624	R b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	625
24663 7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	626	using ui.statuscopies setting
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	627	$ hg st --config ui.statuscopies=true
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	628	M a
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	629	b
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	630	R b
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	631	$ hg st --config ui.statuscopies=false
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	632	M a
7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	633	R b
35067 929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 32887 diff changeset	634	$ hg st --config ui.tweakdefaults=yes
929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 32887 diff changeset	635	M a
929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 32887 diff changeset	636	b
929858db4d22 tweakdefaults: turn on ui.statuscopies Martin von Zweigbergk <martinvonz@google.com> parents: 32887 diff changeset	637	R b
24663 7d01371e6358 commands: add ui.statuscopies config knob Mathias De Maré <mathias.demare@gmail.com> parents: 24419 diff changeset	638
29000 2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	639	using log status template (issue5155)
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	640	$ hg log -Tstatus -r 'wdir()' -C
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	641	changeset: 2147483647:ffffffffffff
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	642	parent: 0:8c55c58b4c0e
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	643	user: test
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	644	date: * (glob)
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	645	files:
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	646	M a
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	647	b
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	648	R b
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	649
42501 75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	650	$ hg log -GTstatus -r 'wdir()' -C
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	651	o changeset: 2147483647:ffffffffffff
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	652	\| parent: 0:8c55c58b4c0e
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	653	~ user: test
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	654	date: * (glob)
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	655	files:
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	656	M a
42502 c929f612afac logcmdutil: also check for copies in null revision and working copy Martin von Zweigbergk <martinvonz@google.com> parents: 42501 diff changeset	657	b
42501 75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	658	R b
75334e5b519e tests: demonstrate missing copy information in working copy with graphlog Martin von Zweigbergk <martinvonz@google.com> parents: 41844 diff changeset	659
29000 2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	660
23402 2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	661	Other "bug" highlight, the revision status does not report the copy information.
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	662	This is buggy behavior.
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	663
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	664	$ hg commit -m 'blah'
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	665	$ hg st --copies --change .
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	666	M a
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	667	R b
2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	668
29000 2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	669	using log status template, the copy information is displayed correctly.
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	670	$ hg log -Tstatus -r. -C
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	671	changeset: 1:6685fde43d21
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	672	tag: tip
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	673	user: test
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	674	date: * (glob)
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	675	summary: blah
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	676	files:
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	677	M a
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	678	b
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	679	R b
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	680
2d3837a4bded log: fix status template to list copy source per dest (issue5155) Yuya Nishihara <yuya@tcha.org> parents: 27749 diff changeset	681
23402 2963d5c9d90b rename: properly report removed and added file as modified (issue4458) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23037 diff changeset	682	$ cd ..
44748 a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	683
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	684	Make sure .hg doesn't show up even as a symlink
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	685
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	686	$ hg init repo0
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	687	$ mkdir symlink-repo0
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	688	$ cd symlink-repo0
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	689	$ ln -s ../repo0/.hg
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300) Raphaël Gomès <rgomes@octobus.net> parents: 43861 diff changeset	690	$ hg status
46488 40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	691
47132 65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	692	If the size hasn’t changed but mtime has, status needs to read the contents
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	693	of the file to check whether it has changed
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	694
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	695	$ echo 1 > a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	696	$ echo 1 > b
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	697	$ touch -t 200102030000 a b
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	698	$ hg commit -Aqm '#0'
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	699	$ echo 2 > a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	700	$ touch -t 200102040000 a b
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	701	$ hg status
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	702	M a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	703
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	704	Asking specifically for the status of a deleted/removed file
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	705
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	706	$ rm a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	707	$ rm b
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	708	$ hg status a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	709	! a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	710	$ hg rm a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	711	$ hg rm b
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	712	$ hg status a
65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	713	R a
47193 47ccab19bf9f dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry` Simon Sapin <simon.sapin@octobus.net> parents: 47180 diff changeset	714	$ hg commit -qm '#1'
47ccab19bf9f dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry` Simon Sapin <simon.sapin@octobus.net> parents: 47180 diff changeset	715	$ hg status a
47ccab19bf9f dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry` Simon Sapin <simon.sapin@octobus.net> parents: 47180 diff changeset	716	a: $ENOENT$
47132 65e6970042c5 status: Add tests for some more edge cases Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	717
46488 40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	718	Check using include flag with pattern when status does not need to traverse
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	719	the working directory (issue6483)
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	720
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	721	$ cd ..
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	722	$ hg init issue6483
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	723	$ cd issue6483
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	724	$ touch a.py b.rs
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	725	$ hg add a.py b.rs
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	726	$ hg st -aI "*.py"
40c8ae49561d status: add test that shows that the Rust implementation has a bug Raphaël Gomès <rgomes@octobus.net> parents: 44748 diff changeset	727	A a.py
47130 cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	728
47131 46c6be5f1efa status: Extend issue 6483 test to exclude patterns Simon Sapin <simon.sapin@octobus.net> parents: 47130 diff changeset	729	Also check exclude pattern
46c6be5f1efa status: Extend issue 6483 test to exclude patterns Simon Sapin <simon.sapin@octobus.net> parents: 47130 diff changeset	730
46c6be5f1efa status: Extend issue 6483 test to exclude patterns Simon Sapin <simon.sapin@octobus.net> parents: 47130 diff changeset	731	$ hg st -aX "*.rs"
46c6be5f1efa status: Extend issue 6483 test to exclude patterns Simon Sapin <simon.sapin@octobus.net> parents: 47130 diff changeset	732	A a.py
46c6be5f1efa status: Extend issue 6483 test to exclude patterns Simon Sapin <simon.sapin@octobus.net> parents: 47130 diff changeset	733
47130 cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	734	issue6335
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	735	When a directory containing a tracked file gets symlinked, as of 5.8
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	736	`hg st` only gives the correct answer about clean (or deleted) files
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	737	if also listing unknowns.
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	738	The tree-based dirstate and status algorithm fix this:
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	739
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	740	#if symlink no-dirstate-v1
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	741
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	742	$ cd ..
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	743	$ hg init issue6335
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	744	$ cd issue6335
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	745	$ mkdir foo
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	746	$ touch foo/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	747	$ hg ci -Ama
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	748	adding foo/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	749	$ mv foo bar
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	750	$ ln -s bar foo
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	751	$ hg status
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	752	! foo/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	753	? bar/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	754	? foo
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	755
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	756	$ hg status -c # incorrect output with `dirstate-v1`
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	757	$ hg status -cu
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	758	? bar/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	759	? foo
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	760	$ hg status -d # incorrect output with `dirstate-v1`
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	761	! foo/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	762	$ hg status -du
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	763	! foo/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	764	? bar/a
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	765	? foo
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	766
cfbbafb04037 dirstate-tree: Add a test showing that issue 6335 is fixed Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	767	#endif
47180 df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	768
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	769
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	770	Create a repo with files in each possible status
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	771
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	772	$ cd ..
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	773	$ hg init repo7
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	774	$ cd repo7
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	775	$ mkdir subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	776	$ touch clean modified deleted removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	777	$ touch subdir/clean subdir/modified subdir/deleted subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	778	$ echo ignored > .hgignore
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	779	$ hg ci -Aqm '#0'
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	780	$ echo 1 > modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	781	$ echo 1 > subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	782	$ rm deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	783	$ rm subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	784	$ hg rm removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	785	$ hg rm subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	786	$ touch unknown ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	787	$ touch subdir/unknown subdir/ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	788
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	789	Check the output
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	790
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	791	$ hg status
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	792	M modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	793	M subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	794	R removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	795	R subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	796	! deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	797	! subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	798	? subdir/unknown
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	799	? unknown
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	800
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	801	$ hg status -mard
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	802	M modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	803	M subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	804	R removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	805	R subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	806	! deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	807	! subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	808
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	809	$ hg status -A
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	810	M modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	811	M subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	812	R removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	813	R subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	814	! deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	815	! subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	816	? subdir/unknown
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	817	? unknown
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	818	I ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	819	I subdir/ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	820	C .hgignore
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	821	C clean
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	822	C subdir/clean
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	823
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	824	Note: `hg status some-name` creates a patternmatcher which is not supported
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	825	yet by the Rust implementation of status, but includematcher is supported.
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	826	--include is used below for that reason
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	827
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	828	Remove a directory that contains tracked files
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	829
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	830	$ rm -r subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	831	$ hg status --include subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	832	R subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	833	! subdir/clean
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	834	! subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	835	! subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	836
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	837	… and replace it by a file
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	838
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	839	$ touch subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	840	$ hg status --include subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	841	R subdir/removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	842	! subdir/clean
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	843	! subdir/deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	844	! subdir/modified
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	845	? subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	846
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	847	Replaced a deleted or removed file with a directory
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	848
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	849	$ mkdir deleted removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	850	$ touch deleted/1 removed/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	851	$ hg status --include deleted --include removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	852	R removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	853	! deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	854	? deleted/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	855	? removed/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	856	$ hg add removed/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	857	$ hg status --include deleted --include removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	858	A removed/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	859	R removed
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	860	! deleted
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	861	? deleted/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	862
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	863	Deeply nested files in an ignored directory are still listed on request
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	864
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	865	$ echo ignored-dir >> .hgignore
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	866	$ mkdir ignored-dir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	867	$ mkdir ignored-dir/subdir
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	868	$ touch ignored-dir/subdir/1
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	869	$ hg status --ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	870	I ignored
df2bf38ac382 status: Add some more tests Simon Sapin <simon.sapin@octobus.net> parents: 47132 diff changeset	871	I ignored-dir/subdir/1

author	Simon Sapin <simon.sapin@octobus.net>
	Mon, 10 May 2021 21:59:13 +0200
changeset 47193	47ccab19bf9f
parent 47180	df2bf38ac382
child 47281	6763913fa175
permissions	-rw-r--r--