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

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

author	Simon Sapin <simon.sapin@octobus.net>
	Fri, 16 Jul 2021 18:42:20 +0200
changeset 48223	b4f83c9e7905
parent 48068	bf8837e3d7ce
child 48235	5c567aca080d
permissions	-rw-r--r--