Mercurial: tests/test-subrepo-deep-nested-change.t@b962ae0a0a05 (annotated)

28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1	$ cat >> $HGRCPATH <<EOF
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	2	> [extdiff]
b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	3	> # for portability:
b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	4	> pdiff = sh "$RUNTESTDIR/pdiff"
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	5	> [progress]
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	6	> disable=False
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	7	> assume-tty = 1
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	8	> delay = 0
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	9	> # set changedelay really large so we don't see nested topics
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	10	> changedelay = 30000
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	11	> format = topic bar number
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	12	> refresh = 0
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	13	> width = 60
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	14	> EOF
0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	15
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	16	Preparing the subrepository 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	17
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	18	$ hg init sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	19	$ echo sub2 > sub2/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	20	$ hg add -R sub2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	21	adding sub2/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	22	$ hg commit -R sub2 -m "sub2 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	23
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	24	Preparing the 'sub1' repo which depends on the subrepo 'sub2'
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	25
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	26	$ hg init sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	27	$ echo sub1 > sub1/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	28	$ echo "sub2 = ../sub2" > sub1/.hgsub
12107 497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11913 diff changeset	29	$ hg clone sub2 sub1/sub2
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	30	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	31	linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	32	linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	33	linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	34	linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	35	linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	36	linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	37	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	38	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	39	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	40	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	41	updating to branch default
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	42	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	43	$ hg add -R sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	44	adding sub1/.hgsub (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	45	adding sub1/sub1 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	46	$ hg commit -R sub1 -m "sub1 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	47
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	48	Preparing the 'main' repo which depends on the subrepo 'sub1'
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	49
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	50	$ hg init main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	51	$ echo main > main/main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	52	$ echo "sub1 = ../sub1" > main/.hgsub
12107 497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11913 diff changeset	53	$ hg clone sub1 main/sub1
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	54	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	55	linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	56	linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	57	linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	58	linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	59	linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	60	linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	61	linking [ <=> ] 7\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	62	linking [ <=> ] 8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	63	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	64	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	65	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	66	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	67	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	68	updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	69	cloning subrepo sub2 from $TESTTMP/sub2
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	70	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	71	$ hg add -R main
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	72	adding main/.hgsub (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	73	adding main/main (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	74	$ hg commit -R main -m "main import"
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	75
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	76	Cleaning both repositories, just as a clone -U
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	77
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	78	$ hg up -C -R sub2 null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	79	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	80	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	81	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	82	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	83	$ hg up -C -R sub1 null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	84	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	85	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	86	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	87	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	88	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	89	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	90	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	91	$ hg up -C -R main null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	92	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	93	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	94	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	95	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	96	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	97	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	98	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	99	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	100	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	101	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	102	$ rm -rf main/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	103	$ rm -rf sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	104
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	105	Clone main
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	106
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	107	$ hg --config extensions.largefiles= clone main cloned
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	108	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	109	linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	110	linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	111	linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	112	linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	113	linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	114	linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	115	linking [ <=> ] 7\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	116	linking [ <=> ] 8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	117	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	118	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	119	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	120	updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	121	updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	122	\r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	123	updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	124	cloning subrepo sub1 from $TESTTMP/sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	125	cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	126	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	127
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	128	Largefiles is NOT enabled in the clone if the source repo doesn't require it
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	129	$ cat cloned/.hg/hgrc
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	130	# example repository config (see "hg help config" for more info)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	131	[paths]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	132	default = $TESTTMP/main (glob)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	133
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	134	# path aliases to other clones of this repo in URLs or filesystem paths
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	135	# (see "hg help config.paths" for more info)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	136	#
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	137	# default-push = ssh://jdoe@example.net/hg/jdoes-fork
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	138	# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	139	# my-clone = /home/jdoe/jdoes-clone
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	140
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	141	[ui]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	142	# name and email (local to this repository, optional), e.g.
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	143	# username = Jane Doe <jdoe@example.com>
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	144
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	145	Checking cloned repo ids
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	146
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	147	$ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	148	cloned 7f491f53a367 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	149	$ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	150	cloned/sub1 fc3b4ce2696f tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	151	$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	152	cloned/sub1/sub2 c57a0840e3ba tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	153
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	154	debugsub output for main and sub1
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	155
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	156	$ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	157	path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	158	source ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	159	revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	160	$ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	161	path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	162	source ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	163	revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	164
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	165	Modifying deeply nested 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	166
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	167	$ echo modified > cloned/sub1/sub2/sub2
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 14281 diff changeset	168	$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	169	committing subrepository sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	170	committing subrepository sub1/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	171
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	172	Checking modified node ids
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	173
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	174	$ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	175	cloned ffe6649062fe tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	176	$ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	177	cloned/sub1 2ecb03bf44a9 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	178	$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	179	cloned/sub1/sub2 53dd3430bcaf tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	180
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	181	debugsub output for main and sub1
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	182
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	183	$ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	184	path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	185	source ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	186	revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	187	$ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	188	path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	189	source ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	190	revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	191
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	192	Check that deep archiving works
17346 2944a6d35158 check-code: fix check for trailing whitespace on empty lines Mads Kiilerich <mads@kiilerich.com> parents: 17113 diff changeset	193
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	194	$ cd cloned
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	195	$ echo 'test' > sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	196	$ hg --config extensions.largefiles=! add sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	197	$ mkdir sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	198	$ echo 'subfolder' > sub1/sub2/folder/test.txt
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	199	$ hg ci -ASm "add test.txt"
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	200	adding sub1/sub2/folder/test.txt
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	201	committing subrepository sub1
17112 f690402e80fb tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17108 diff changeset	202	committing subrepository sub1/sub2 (glob)
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	203
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	204	.. but first take a detour through some deep removal testing
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	205
23327 bd296bb4b5c8 remove: avoid a bogus warning about no tracked files when removing '.' Matt Harbison <matt_harbison@yahoo.com> parents: 23326 diff changeset	206	$ hg remove -S -I 're:.*.txt' .
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	207	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	208	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	209	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	210	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	211	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	212	deleting [=====================> ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	213	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	214	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	215	deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	216	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	217	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	218	\r (no-eol) (esc)
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	219	removing sub1/sub2/folder/test.txt (glob)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	220	removing sub1/sub2/test.txt (glob)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	221	$ hg status -S
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	222	R sub1/sub2/folder/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	223	R sub1/sub2/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	224	$ hg update -Cq
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	225	$ hg remove -I 're:.*.txt' sub1
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	226	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	227	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	228	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	229	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	230	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	231	\r (no-eol) (esc)
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	232	$ hg status -S
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	233	$ hg remove sub1/sub2/folder/test.txt
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	234	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	235	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	236	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	237	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	238	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	239	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	240	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	241	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	242	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	243	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	244	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	245	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	246	\r (no-eol) (esc)
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	247	$ hg remove sub1/.hgsubstate
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	248	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	249	searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	250	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	251	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	252	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	253	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	254	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	255	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	256	\r (no-eol) (esc)
24645 b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	257	$ mv sub1/.hgsub sub1/x.hgsub
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	258	$ hg status -S
25865 a48a7c2d1fea test-subrepo: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 25863 diff changeset	259	warning: subrepo spec file 'sub1/.hgsub' not found
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	260	R sub1/.hgsubstate
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	261	R sub1/sub2/folder/test.txt
24645 b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	262	! sub1/.hgsub
b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	263	? sub1/x.hgsub
b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	264	$ mv sub1/x.hgsub sub1/.hgsub
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	265	$ hg update -Cq
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	266	$ touch sub1/foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	267	$ hg forget sub1/sub2/folder/test.txt
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	268	$ rm sub1/sub2/test.txt
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	269
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	270	Test relative path printing + subrepos
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	271	$ mkdir -p foo/bar
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	272	$ cd foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	273	$ touch bar/abc
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	274	$ hg addremove -S ..
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	275	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	276	searching for exact renames [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	277	\r (no-eol) (esc)
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	278	adding ../sub1/sub2/folder/test.txt (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	279	removing ../sub1/sub2/test.txt (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	280	adding ../sub1/foo (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	281	adding bar/abc (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	282	$ cd ..
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	283	$ hg status -S
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	284	A foo/bar/abc
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	285	A sub1/foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	286	R sub1/sub2/test.txt
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	287
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	288	Archive wdir() with subrepos
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	289	$ hg rm main
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	290	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	291	deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	292	\r (no-eol) (esc)
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	293	$ hg archive -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	294	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	295	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	296	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	297	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	298	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	299	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	300	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	301	archiving (sub1) [ ] 0/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	302	archiving (sub1) [========> ] 1/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	303	archiving (sub1) [=================> ] 2/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	304	archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	305	archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	306	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	307	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	308	archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	309	archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	310	archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	311	\r (no-eol) (esc)
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	312	$ diff -r . ../wdir \| egrep -v '\.hg$\|^Common subdirectories:'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	313	Only in ../wdir: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	314
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	315	$ find ../wdir -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	316	../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	317	../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	318	../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	319	../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	320	../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	321	../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	322	../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	323	../wdir/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	324	../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	325	../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	326
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	327	$ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	328	repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	329	node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	330	branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	331	latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	332	latesttagdistance: 4
25690 98064baab877 archive: fix changesincelatesttag with wdir() Matt Mackall <mpm@selenic.com> parents: 25615 diff changeset	333	changessincelatesttag: 4
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	334
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	335	Attempting to archive 'wdir()' with a missing file is handled gracefully
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	336	$ rm sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	337	$ rm -r ../wdir
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	338	$ hg archive -v -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	339	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	340	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	341	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	342	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	343	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	344	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	345	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	346	archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	347	archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	348	archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	349	archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	350	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	351	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	352	archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	353	archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	354	archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	355	\r (no-eol) (esc)
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	356	$ find ../wdir -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	357	../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	358	../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	359	../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	360	../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	361	../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	362	../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	363	../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	364	../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	365	../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	366
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	367	Continue relative path printing + subrepos
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	368	$ hg update -Cq
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	369	$ rm -r ../wdir
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	370	$ hg archive -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	371	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	372	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	373	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	374	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	375	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	376	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	377	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	378	archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	379	archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	380	archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	381	archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	382	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	383	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	384	archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	385	archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	386	archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	387	archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	388	\r (no-eol) (esc)
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	389	$ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	390	repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	391	node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	392	branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	393	latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	394	latesttagdistance: 4
25690 98064baab877 archive: fix changesincelatesttag with wdir() Matt Mackall <mpm@selenic.com> parents: 25615 diff changeset	395	changessincelatesttag: 4
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	396
23539 cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	397	$ touch sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	398	$ hg addremove sub1/sub2
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	399	adding sub1/sub2/folder/bar (glob)
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	400	$ hg status -S
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	401	A sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	402	? foo/bar/abc
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	403	? sub1/foo
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	404	$ hg update -Cq
23540 f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	405	$ hg addremove sub1
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	406	adding sub1/sub2/folder/bar (glob)
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	407	adding sub1/foo (glob)
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	408	$ hg update -Cq
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	409	$ rm sub1/sub2/folder/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	410	$ rm sub1/sub2/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	411	$ hg ci -ASm "remove test.txt"
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	412	adding sub1/sub2/folder/bar
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	413	removing sub1/sub2/folder/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	414	removing sub1/sub2/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	415	adding sub1/foo
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	416	adding foo/bar/abc
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	417	committing subrepository sub1
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	418	committing subrepository sub1/sub2 (glob)
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	419
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	420	$ hg forget sub1/sub2/sub2
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	421	$ echo x > sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	422	$ hg add sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	423
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	424	Files sees uncommitted adds and removes in subrepos
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	425	$ hg files -S
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	426	.hgsub
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	427	.hgsubstate
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	428	foo/bar/abc (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	429	main
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	430	sub1/.hgsub (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	431	sub1/.hgsubstate (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	432	sub1/foo (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	433	sub1/sub1 (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	434	sub1/sub2/folder/bar (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	435	sub1/sub2/x.txt (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	436
25122 755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	437	$ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	438	.hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	439	.hgsubstate
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	440	foo/bar/abc (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	441	main
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	442	sub1/.hgsub (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	443	sub1/.hgsubstate (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	444	sub1/foo (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	445	sub1/sub1 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	446	sub1/sub2/folder/bar (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	447	sub1/sub2/x.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	448
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	449	$ hg files -r '.^' -S "set:eol('dos') or eol('unix')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	450	.hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	451	.hgsubstate
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	452	main
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	453	sub1/.hgsub (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	454	sub1/.hgsubstate (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	455	sub1/sub1 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	456	sub1/sub2/folder/test.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	457	sub1/sub2/sub2 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	458	sub1/sub2/test.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	459
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	460	$ hg files sub1
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	461	sub1/.hgsub (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	462	sub1/.hgsubstate (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	463	sub1/foo (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	464	sub1/sub1 (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	465	sub1/sub2/folder/bar (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	466	sub1/sub2/x.txt (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	467
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	468	$ hg files sub1/sub2
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	469	sub1/sub2/folder/bar (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	470	sub1/sub2/x.txt (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	471
28387 97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	472	$ hg files
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	473	.hgsub
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	474	.hgsubstate
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	475	foo/bar/abc (glob)
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	476	main
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	477
25193 ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	478	$ hg files -S -r '.^' sub1/sub2/folder
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	479	sub1/sub2/folder/test.txt (glob)
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	480
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	481	$ hg files -S -r '.^' sub1/sub2/missing
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	482	sub1/sub2/missing: no such file in rev 78026e779ea6 (glob)
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	483	[1]
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	484
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	485	$ hg files -r '.^' sub1/
25194 ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	486	sub1/.hgsub (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	487	sub1/.hgsubstate (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	488	sub1/sub1 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	489	sub1/sub2/folder/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	490	sub1/sub2/sub2 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	491	sub1/sub2/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	492
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	493	$ hg files -r '.^' sub1/sub2
25194 ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	494	sub1/sub2/folder/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	495	sub1/sub2/sub2 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	496	sub1/sub2/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	497
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	498	$ hg rollback -q
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	499	$ hg up -Cq
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	500
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	501	$ hg --config extensions.largefiles=! archive -S ../archive_all
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	502	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	503	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	504	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	505	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	506	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	507	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	508	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	509	archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	510	archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	511	archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	512	archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	513	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	514	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	515	archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	516	archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	517	archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	518	archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	519	\r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	520	$ find ../archive_all \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	521	../archive_all
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	522	../archive_all/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	523	../archive_all/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	524	../archive_all/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	525	../archive_all/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	526	../archive_all/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	527	../archive_all/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	528	../archive_all/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	529	../archive_all/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	530	../archive_all/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	531	../archive_all/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	532	../archive_all/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	533	../archive_all/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	534	../archive_all/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	535
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	536	Check that archive -X works in deep subrepos
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	537
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	538	$ hg --config extensions.largefiles=! archive -S -X '*test' ../archive_exclude
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	539	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	540	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	541	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	542	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	543	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	544	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	545	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	546	archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	547	archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	548	archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	549	archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	550	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	551	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	552	archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	553	archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	554	\r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	555	$ find ../archive_exclude \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	556	../archive_exclude
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	557	../archive_exclude/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	558	../archive_exclude/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	559	../archive_exclude/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	560	../archive_exclude/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	561	../archive_exclude/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	562	../archive_exclude/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	563	../archive_exclude/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	564	../archive_exclude/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	565	../archive_exclude/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	566	../archive_exclude/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	567
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	568	$ hg --config extensions.largefiles=! archive -S -I '*test' ../archive_include
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	569	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	570	archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	571	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	572	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	573	archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	574	archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	575	archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	576	\r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	577	$ find ../archive_include \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	578	../archive_include
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	579	../archive_include/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	580	../archive_include/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	581	../archive_include/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	582	../archive_include/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	583	../archive_include/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	584
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	585	Check that deep archive works with largefiles (which overrides hgsubrepo impl)
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	586	This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	587	subrepos are archived properly.
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	588	Note that add --large through a subrepo currently adds the file as a normal file
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	589
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	590	$ echo "large" > sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	591	$ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	592	$ echo "large" > large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	593	$ hg --config extensions.largefiles= add --large large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	594	$ hg --config extensions.largefiles= ci -S -m "add large files"
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	595	committing subrepository sub1
17112 f690402e80fb tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17108 diff changeset	596	committing subrepository sub1/sub2 (glob)
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	597
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	598	$ hg --config extensions.largefiles= archive -S ../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	599	$ find ../archive_lf \| sort
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	600	../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	601	../archive_lf/.hg_archival.txt
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	602	../archive_lf/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	603	../archive_lf/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	604	../archive_lf/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	605	../archive_lf/main
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	606	../archive_lf/sub1
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	607	../archive_lf/sub1/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	608	../archive_lf/sub1/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	609	../archive_lf/sub1/sub1
17106 4d0e81dca75f largefiles: fix the directory structure when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 17105 diff changeset	610	../archive_lf/sub1/sub2
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	611	../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	612	../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	613	../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	614	../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	615	../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	616	$ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	617
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	618	Exclude large files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	619
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	620	$ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	621	$ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	622	../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	623	../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	624	../archive_lf/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	625	../archive_lf/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	626	../archive_lf/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	627	../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	628	../archive_lf/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	629	../archive_lf/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	630	../archive_lf/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	631	../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	632	../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	633	../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	634	../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	635	../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	636	$ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	637
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	638	Exclude normal files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	639
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	640	$ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz
24924 41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24645 diff changeset	641	$ tar -tzf ../archive_lf.tgz \| sort
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	642	.hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	643	.hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	644	large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	645	main
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	646	sub1/.hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	647	sub1/.hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	648	sub1/sub1
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	649	sub1/sub2/large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	650	sub1/sub2/sub2
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	651
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	652	Include normal files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	653
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	654	$ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	655	$ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	656	../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	657	../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	658	../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	659	../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	660	../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	661	../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	662	../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	663	$ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	664
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	665	Include large files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	666
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	667	$ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	668	$ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	669	../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	670	../archive_lf/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	671	../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	672	../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	673	../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	674	$ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	675
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	676	Find an exact largefile match in a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	677
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	678	$ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	679	$ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	680	../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	681	../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	682	../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	683	../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	684	$ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	685
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	686	The local repo enables largefiles if a largefiles repo is cloned
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	687	$ hg showconfig extensions
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	688	abort: repository requires features unknown to this Mercurial: largefiles!
26421 4b0fc75f9403 urls: bulk-change primary website URLs Matt Mackall <mpm@selenic.com> parents: 25865 diff changeset	689	(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	690	[255]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	691	$ hg --config extensions.largefiles= clone -qU . ../lfclone
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	692	$ cat ../lfclone/.hg/hgrc
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	693	# example repository config (see "hg help config" for more info)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	694	[paths]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	695	default = $TESTTMP/cloned (glob)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	696
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	697	# path aliases to other clones of this repo in URLs or filesystem paths
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	698	# (see "hg help config.paths" for more info)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	699	#
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	700	# default-push = ssh://jdoe@example.net/hg/jdoes-fork
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	701	# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	702	# my-clone = /home/jdoe/jdoes-clone
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	703
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	704	[ui]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	705	# name and email (local to this repository, optional), e.g.
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	706	# username = Jane Doe <jdoe@example.com>
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	707
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	708	[extensions]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	709	largefiles=
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	710
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	711	Find an exact match to a standin (should archive nothing)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	712	$ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
17113 d7493da233c8 tests: remove GNU quoting in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17112 diff changeset	713	$ find ../archive_lf 2> /dev/null \| sort
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	714
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	715	$ cat >> $HGRCPATH <<EOF
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	716	> [extensions]
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	717	> largefiles=
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	718	> [largefiles]
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	719	> patterns=glob:**.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	720	> EOF
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	721
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	722	Test forget through a deep subrepo with the largefiles extension, both a
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	723	largefile and a normal file. Then a largefile that hasn't been committed yet.
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	724	$ touch sub1/sub2/untracked.txt
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	725	$ touch sub1/sub2/large.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	726	$ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	727	not removing sub1/sub2/untracked.txt: file is already untracked (glob)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	728	[1]
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	729	$ hg add --large --dry-run -v sub1/sub2/untracked.txt
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	730	adding sub1/sub2/untracked.txt as a largefile (glob)
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	731	$ hg add --large -v sub1/sub2/untracked.txt
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	732	adding sub1/sub2/untracked.txt as a largefile (glob)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	733	$ hg add --normal -v sub1/sub2/large.dat
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	734	adding sub1/sub2/large.dat (glob)
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	735	$ hg forget -v sub1/sub2/untracked.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	736	removing sub1/sub2/untracked.txt (glob)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	737	$ hg status -S
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	738	A sub1/sub2/large.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	739	R sub1/sub2/large.bin
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	740	R sub1/sub2/test.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	741	? foo/bar/abc
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	742	? sub1/sub2/untracked.txt
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	743	? sub1/sub2/x.txt
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	744	$ hg add sub1/sub2
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	745
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	746	$ hg archive -S -r 'wdir()' ../wdir2
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	747	$ diff -r . ../wdir2 \| egrep -v '\.hg$\|^Common subdirectories:'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	748	Only in ../wdir2: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	749	Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	750	Only in .: foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	751	Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	752	Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	753	Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	754	Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	755	$ find ../wdir2 -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	756	../wdir2/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	757	../wdir2/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	758	../wdir2/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	759	../wdir2/large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	760	../wdir2/main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	761	../wdir2/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	762	../wdir2/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	763	../wdir2/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	764	../wdir2/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	765	../wdir2/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	766	../wdir2/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	767	$ hg status -S -mac -n \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	768	.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	769	.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	770	large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	771	main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	772	sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	773	sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	774	sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	775	sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	776	sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	777	sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	778
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	779	$ hg ci -Sqm 'forget testing'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	780
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	781	Test 'wdir()' modified file archiving with largefiles
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	782	$ echo 'mod' > main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	783	$ echo 'mod' > large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	784	$ echo 'mod' > sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	785	$ hg archive -S -r 'wdir()' ../wdir3
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	786	$ diff -r . ../wdir3 \| egrep -v '\.hg$\|^Common subdirectories'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	787	Only in ../wdir3: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	788	Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	789	Only in .: foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	790	Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	791	Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	792	Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	793	Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	794	$ find ../wdir3 -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	795	../wdir3/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	796	../wdir3/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	797	../wdir3/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	798	../wdir3/large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	799	../wdir3/main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	800	../wdir3/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	801	../wdir3/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	802	../wdir3/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	803	../wdir3/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	804	../wdir3/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	805	../wdir3/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	806	$ hg up -Cq
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	807
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	808	Test issue4330: commit a directory where only normal files have changed
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	809	$ touch foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	810	$ hg add --large foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	811	$ hg ci -m 'add foo/bar/large.dat'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	812	$ touch a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	813	$ touch a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	814	$ hg add -v foo/bar/abc a.txt a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	815	adding a.dat as a largefile
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	816	adding a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	817	adding foo/bar/abc (glob)
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	818	$ hg ci -m 'dir commit with only normal file deltas' foo/bar
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	819	$ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	820	A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	821	A a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	822
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	823	Test a directory commit with a changed largefile and a changed normal file
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	824	$ echo changed > foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	825	$ echo changed > foo/bar/abc
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	826	$ hg ci -m 'dir commit with normal and lf file deltas' foo
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	827	$ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	828	A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	829	A a.txt
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	830
24230 23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	831	$ hg ci -m "add a.*"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	832	$ hg mv a.dat b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	833	$ hg mv foo/bar/abc foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	834	$ hg status -C
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	835	A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	836	a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	837	A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	838	foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	839	R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	840	R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	841
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	842	$ hg ci -m "move large and normal"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	843	$ hg status -C --rev '.^' --rev .
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	844	A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	845	a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	846	A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	847	foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	848	R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	849	R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	850
24446 582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	851
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	852	$ echo foo > main
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	853	$ hg ci -m "mod parent only"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	854	$ hg init sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	855	$ echo "sub3 = sub3" >> .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	856	$ echo xyz > sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	857	$ hg add sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	858	$ hg ci -Sm "add sub3"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	859	committing subrepository sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	860	$ cat .hgsub \| grep -v sub3 > .hgsub1
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	861	$ mv .hgsub1 .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	862	$ hg ci -m "remove sub3"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	863
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	864	$ hg log -r "subrepo()" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	865	0 7f491f53a367 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	866	main import
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	867
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	868	1 ffe6649062fe 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	869	deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	870
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	871	2 9bb10eebee29 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	872	add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	873
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	874	3 7c64f035294f 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	875	add large files
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	876
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	877	4 f734a59e2e35 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	878	forget testing
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	879
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	880	11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	881	add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	882
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	883	12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	884	remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	885
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	886	$ hg log -r "subrepo('sub3')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	887	11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	888	add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	889
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	890	12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	891	remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	892
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	893	$ hg log -r "subrepo('bogus')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	894
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	895
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	896	Test .hgsubstate in the R state
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	897
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	898	$ hg rm .hgsub .hgsubstate
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	899	\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	900	deleting [=====================> ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	901	deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	902	\r (no-eol) (esc)
24446 582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	903	$ hg ci -m 'trash subrepo tracking'
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	904
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	905	$ hg log -r "subrepo('re:sub\d+')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	906	0 7f491f53a367 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	907	main import
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	908
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	909	1 ffe6649062fe 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	910	deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	911
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	912	2 9bb10eebee29 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	913	add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	914
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	915	3 7c64f035294f 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	916	add large files
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	917
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	918	4 f734a59e2e35 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	919	forget testing
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	920
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	921	11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	922	add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	923
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	924	12 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	925	remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	926
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	927	13[tip] a68b2c361653 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	928	trash subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	929
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	930
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	931	Restore the trashed subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	932
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	933	$ hg rollback -q
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	934	$ hg update -Cq .
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	935
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	936	Interaction with extdiff, largefiles and subrepos
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	937
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	938	$ hg --config extensions.extdiff= pdiff -S
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	939
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	940	$ hg --config extensions.extdiff= pdiff -r '.^' -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	941	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	942	archiving [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	943	archiving [====================> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	944	archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	945	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	946	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	947	archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	948	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	949	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	950	archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	951	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	952	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	953	archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	954	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	955	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	956	archiving [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	957	archiving [====================> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	958	archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	959	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	960	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	961	archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	962	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	963	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	964	archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	965	\r (no-eol) (esc)
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	966	diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
28034 e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	967	--- cloned./.hgsub (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	968	+++ cloned/.hgsub * (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	969	@@ -1,2 +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	970	sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	971	-sub3 = sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	972	diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
28034 e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	973	--- cloned./.hgsubstate (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	974	+++ cloned/.hgsubstate * (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	975	@@ -1,2 +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	976	7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	977	-b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	978	[1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	979
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	980	$ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	981	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	982	archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	983	archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	984	archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	985	archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	986	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	987	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	988	archiving (sub1) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	989	archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	990	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	991	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	992	archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	993	archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	994	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	995	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	996	archiving [ ] 0/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	997	archiving [====> ] 1/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	998	archiving [=========> ] 2/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	999	archiving [===============> ] 3/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1000	archiving [====================> ] 4/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1001	archiving [=========================> ] 5/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1002	archiving [===============================> ] 6/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1003	archiving [====================================> ] 7/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1004	archiving [==========================================>] 8/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1005	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1006	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1007	archiving (sub1) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1008	archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1009	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1010	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1011	archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1012	archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1013	archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1014	archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1015	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1016	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1017	archiving (sub3) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1018	archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1019	\r (no-eol) (esc)
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1020	diff -Nru cloned./.hglf/b.dat cloned./.hglf/b.dat (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1021	--- cloned./.hglf/b.dat (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1022	+++ cloned./.hglf/b.dat (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1023	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1024	+da39a3ee5e6b4b0d3255bfef95601890afd80709
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1025	diff -Nru cloned./.hglf/foo/bar/large.dat cloned./.hglf/foo/bar/large.dat (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1026	--- cloned./.hglf/foo/bar/large.dat (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1027	+++ cloned./.hglf/foo/bar/large.dat (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1028	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1029	+2f6933b5ee0f5fdd823d9717d8729f3c2523811b
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1030	diff -Nru cloned./.hglf/large.bin cloned./.hglf/large.bin (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1031	--- cloned./.hglf/large.bin (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1032	+++ cloned./.hglf/large.bin (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1033	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1034	+7f7097b041ccf68cc5561e9600da4655d21c6d18
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1035	diff -Nru cloned./.hgsub cloned./.hgsub (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1036	--- cloned./.hgsub (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1037	+++ cloned./.hgsub (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1038	@@ -1* +1,2 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1039	sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1040	+sub3 = sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1041	diff -Nru cloned./.hgsubstate cloned./.hgsubstate (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1042	--- cloned./.hgsubstate (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1043	+++ cloned./.hgsubstate (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1044	@@ -1* +1,2 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1045	-fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1046	+7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1047	+b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1048	diff -Nru cloned./foo/bar/def cloned./foo/bar/def (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1049	--- cloned./foo/bar/def (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1050	+++ cloned./foo/bar/def (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1051	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1052	+changed
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1053	diff -Nru cloned./main cloned./main (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1054	--- cloned./main (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1055	+++ cloned./main (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1056	@@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1057	-main
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1058	+foo
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1059	diff -Nru cloned./sub1/.hgsubstate cloned./sub1/.hgsubstate (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1060	--- cloned./sub1/.hgsubstate (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1061	+++ cloned./sub1/.hgsubstate (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1062	@@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1063	-c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1064	+c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1065	diff -Nru cloned./sub1/sub2/folder/test.txt cloned./sub1/sub2/folder/test.txt (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1066	--- cloned./sub1/sub2/folder/test.txt (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1067	+++ cloned./sub1/sub2/folder/test.txt (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1068	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1069	+subfolder
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1070	diff -Nru cloned./sub1/sub2/sub2 cloned./sub1/sub2/sub2 (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1071	--- cloned./sub1/sub2/sub2 (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1072	+++ cloned./sub1/sub2/sub2 (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1073	@@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1074	-sub2
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1075	+modified
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1076	diff -Nru cloned./sub3/a.txt cloned./sub3/a.txt (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1077	--- cloned./sub3/a.txt (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1078	+++ cloned./sub3/a.txt (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1079	@@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1080	+xyz
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1081	[1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1082
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1083	$ echo mod > sub1/sub2/sub2
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	1084	$ hg --config extensions.extdiff= pdiff -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1085	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1086	archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1087	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1088	\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1089	archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1090	archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1091	\r (no-eol) (esc)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1092	--- /cloned./sub1/sub2/sub2 * (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1093	+++ /cloned/sub1/sub2/sub2 (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1094	@@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1095	-modified
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1096	+mod
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1097	[1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1098
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	1099	$ cd ..

author	Matt Mackall <mpm@selenic.com>
	Thu, 28 Apr 2016 16:38:15 -0500
branch	stable
changeset 29041	b962ae0a0a05
parent 28608	62e73d42bd14
child 29089	222b8170d69e
child 29102	22c53b3a390d
permissions	-rw-r--r--