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

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

author	Simon Sapin <simon.sapin@octobus.net>
	Fri, 16 Jul 2021 14:08:26 +0200
changeset 47683	284a20269a97
parent 47352	9d58e54b5966
child 48068	bf8837e3d7ce
permissions	-rw-r--r--