upstream/mercurial-mirror Commit - r17743:6047947a

tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup

Mads Kiilerich -

r17743:6047947a default

parent child

tests/test-archive.t

0 +13 -13

@@ -224,19 +224,19 b' enable progress extension:'
224	> width = 60	224	> width = 60
225	> EOF	225	> EOF
226		226
227	$ hg archive ../with-progress 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	227	$ hg archive ../with-progress
228		228	\r (no-eol) (esc)
229	archiving [ ] 0/4	229	archiving [ ] 0/4\r (no-eol) (esc)
230	archiving [ ] 0/4	230	archiving [ ] 0/4\r (no-eol) (esc)
231	archiving [=========> ] 1/4	231	archiving [=========> ] 1/4\r (no-eol) (esc)
232	archiving [=========> ] 1/4	232	archiving [=========> ] 1/4\r (no-eol) (esc)
233	archiving [====================> ] 2/4	233	archiving [====================> ] 2/4\r (no-eol) (esc)
234	archiving [====================> ] 2/4	234	archiving [====================> ] 2/4\r (no-eol) (esc)
235	archiving [===============================> ] 3/4	235	archiving [===============================> ] 3/4\r (no-eol) (esc)
236	archiving [===============================> ] 3/4	236	archiving [===============================> ] 3/4\r (no-eol) (esc)
237	archiving [==========================================>] 4/4	237	archiving [==========================================>] 4/4\r (no-eol) (esc)
238	archiving [==========================================>] 4/4	238	archiving [==========================================>] 4/4\r (no-eol) (esc)
239	\r (esc)	239	\r (no-eol) (esc)
240		240
241	cleanup after progress extension test:	241	cleanup after progress extension test:
242		242

tests/test-convert-svn-move.t

0 +69 -63

@@ -165,68 +165,75 b" Test convert progress bar'"
165	> width = 60	165	> width = 60
166	> EOF	166	> EOF
167		167
168	$ hg convert svn-repo hg-progress 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	168	$ hg convert svn-repo hg-progress
169		169	\r (no-eol) (esc)
170	scanning [ <=> ] 1	170	scanning [ <=> ] 1\r (no-eol) (esc)
171	scanning [ <=> ] 2	171	scanning [ <=> ] 2\r (no-eol) (esc)
172	scanning [ <=> ] 3	172	scanning [ <=> ] 3\r (no-eol) (esc)
173	scanning [ <=> ] 4	173	scanning [ <=> ] 4\r (no-eol) (esc)
174	scanning [ <=> ] 5	174	scanning [ <=> ] 5\r (no-eol) (esc)
175	scanning [ <=> ] 6	175	scanning [ <=> ] 6\r (no-eol) (esc)
176	scanning [ <=> ] 7	176	scanning [ <=> ] 7\r (no-eol) (esc)
177		177	\r (no-eol) (esc)
178	converting [ ] 0/7	178	\r (no-eol) (esc)
179	~~getting~~ ~~files~~ [~~=====>~~ ] 1/6	179	converting [ ] 0/7\r (no-eol) (esc)
180	getting files [=====~~=======~~> ] 2/6	180	getting files [=====> ] 1/6\r (no-eol) (esc)
181	getting files [============~~======~~> ] 3/6	181	getting files [============> ] 2/6\r (no-eol) (esc)
182	getting files [==================~~=======~~> ] 4/6	182	getting files [==================> ] 3/6\r (no-eol) (esc)
183	getting files [========================~~======~~=> ] 5/6	183	getting files [=========================> ] 4/6\r (no-eol) (esc)
184	getting files [===============================~~=======~~>] 6/6	184	getting files [===============================> ] 5/6\r (no-eol) (esc)
185		185	getting files [======================================>] 6/6\r (no-eol) (esc)
186	converting [=====> ] 1/7	186	\r (no-eol) (esc)
187	scanning paths [ ] 0/1	187	\r (no-eol) (esc)
188	getting files [======================================>] 1/1	188	converting [=====> ] 1/7\r (no-eol) (esc)
189		189	scanning paths [ ] 0/1\r (no-eol) (esc)
190	converting [===========> ] 2/7	190	getting files [======================================>] 1/1\r (no-eol) (esc)
191	scanning paths [ ] 0/2	191	\r (no-eol) (esc)
192	scanning paths [==================> ] 1/2	192	\r (no-eol) (esc)
193	~~getting~~ ~~files~~ [========> ] 1/4	193	converting [===========> ] 2/7\r (no-eol) (esc)
194	getting files [==================> ] 2/4	194	scanning paths [ ] 0/2\r (no-eol) (esc)
195	getting files [============================> ] 3/4	195	scanning paths [==================> ] 1/2\r (no-eol) (esc)
196	getting files [======================================>] 4/4	196	getting files [========> ] 1/4\r (no-eol) (esc)
197		197	getting files [==================> ] 2/4\r (no-eol) (esc)
198	converting [=================> ] 3/7	198	getting files [============================> ] 3/4\r (no-eol) (esc)
199	scanning paths [ ] 0/1	199	getting files [======================================>] 4/4\r (no-eol) (esc)
200	getting files [======================================>] 1/1	200	\r (no-eol) (esc)
201		201	\r (no-eol) (esc)
202	converting [================~~======~~=> ] 4/7	202	converting [=================> ] 3/7\r (no-eol) (esc)
203	scanning paths [ ] 0/1	203	scanning paths [ ] 0/1\r (no-eol) (esc)
204	getting files [======================================>] 1/1	204	getting files [======================================>] 1/1\r (no-eol) (esc)
205		205	\r (no-eol) (esc)
206	converting [=============================> ] 5/7	206	\r (no-eol) (esc)
207	scanning paths [ ] 0/3	207	converting [=======================> ] 4/7\r (no-eol) (esc)
208	scanning paths [~~===========>~~ ] 1/3	208	scanning paths [ ] 0/1\r (no-eol) (esc)
209	scanning paths [========================> ] 2/3	209	getting files [======================================>] 1/1\r (no-eol) (esc)
210	getting files [===> ] 1/8	210	\r (no-eol) (esc)
211	getting files [========> ] 2/8	211	\r (no-eol) (esc)
212	getting files [=============> ] 3/8	212	converting [=============================> ] 5/7\r (no-eol) (esc)
213	getting files [==================> ] 4/8	213	scanning paths [ ] 0/3\r (no-eol) (esc)
214	getting files [=======================> ] 5/8	214	scanning paths [===========> ] 1/3\r (no-eol) (esc)
215	~~gett~~ing ~~file~~s [========================~~====~~> ] 6/8	215	scanning paths [========================> ] 2/3\r (no-eol) (esc)
216	getting files [=================================> ] 7/8	216	getting files [===> ] 1/8\r (no-eol) (esc)
217	getting files [======================================>] 8/8	217	getting files [========> ] 2/8\r (no-eol) (esc)
218		218	getting files [=============> ] 3/8\r (no-eol) (esc)
219	converting [===================================> ] 6/7	219	getting files [==================> ] 4/8\r (no-eol) (esc)
220	scanning paths [ ] 0/1	220	getting files [=======================> ] 5/8\r (no-eol) (esc)
221	getting files [===> ] 1/8	221	getting files [============================> ] 6/8\r (no-eol) (esc)
222	getting files [========> ] 2/8	222	getting files [=================================> ] 7/8\r (no-eol) (esc)
223	getting files [=============> ] 3/8	223	getting files [======================================>] 8/8\r (no-eol) (esc)
224	getting files [==================> ] 4/8	224	\r (no-eol) (esc)
225	getting files [=======================> ] 5/8	225	\r (no-eol) (esc)
226	~~getting~~ ~~files~~ [============================> ] 6/8	226	converting [===================================> ] 6/7\r (no-eol) (esc)
227	getting files [=================================> ] 7/8	227	scanning paths [ ] 0/1\r (no-eol) (esc)
228	getting files [======================================>] 8/8	228	getting files [===> ] 1/8\r (no-eol) (esc)
229		229	getting files [========> ] 2/8\r (no-eol) (esc)
		230	getting files [=============> ] 3/8\r (no-eol) (esc)
		231	getting files [==================> ] 4/8\r (no-eol) (esc)
		232	getting files [=======================> ] 5/8\r (no-eol) (esc)
		233	getting files [============================> ] 6/8\r (no-eol) (esc)
		234	getting files [=================================> ] 7/8\r (no-eol) (esc)
		235	getting files [======================================>] 8/8\r (no-eol) (esc)
		236	\r (no-eol) (esc)
230	initializing destination hg-progress repository	237	initializing destination hg-progress repository
231	scanning source...	238	scanning source...
232	sorting...	239	sorting...
@@ -238,6 +245,5 b" Test convert progress bar'"
238	2 adddb	245	2 adddb
239	1 branch	246	1 branch
240	0 clobberdir	247	0 clobberdir
241
242		248
243	$ cd ..	249	$ cd ..

tests/test-debugbuilddag.t

0 +37 -38

@@ -8,44 +8,43 b' plain'
8	> --config extensions.progress= --config progress.assume-tty=1 \	8	> --config extensions.progress= --config progress.assume-tty=1 \
9	> --config progress.delay=0 --config progress.refresh=0 \	9	> --config progress.delay=0 --config progress.refresh=0 \
10	> --config progress.format=topic,bar,number \	10	> --config progress.format=topic,bar,number \
11	> --config progress.width=60 2>&1 \| \	11	> --config progress.width=60
12	> python "$TESTDIR/filtercr.py"	12	\r (no-eol) (esc)
13		13	building [ ] 0/12\r (no-eol) (esc)
14	building [ ] 0/12	14	building [ ] 0/12\r (no-eol) (esc)
15	building [ ] 0/12	15	building [ ] 0/12\r (no-eol) (esc)
16	building [ ] 0/12	16	building [ ] 0/12\r (no-eol) (esc)
17	building [ ] 0/12	17	building [==> ] 1/12\r (no-eol) (esc)
18	building [==> ] 1/12	18	building [==> ] 1/12\r (no-eol) (esc)
19	building [==> ] 1/12	19	building [==> ] 1/12\r (no-eol) (esc)
20	building [==> ] 1/12	20	building [==> ] 1/12\r (no-eol) (esc)
21	building [==> ] 1/12	21	building [======> ] 2/12\r (no-eol) (esc)
22	building [======> ] 2/12	22	building [======> ] 2/12\r (no-eol) (esc)
23	building [======> ] 2/12	23	building [=========> ] 3/12\r (no-eol) (esc)
24	building [=========> ] 3/12	24	building [=========> ] 3/12\r (no-eol) (esc)
25	building [=========> ] 3/12	25	building [=============> ] 4/12\r (no-eol) (esc)
26	building [=============> ] 4/12	26	building [=============> ] 4/12\r (no-eol) (esc)
27	building [=============> ] 4/12	27	building [=============> ] 4/12\r (no-eol) (esc)
28	building [=============> ] 4/12	28	building [=============> ] 4/12\r (no-eol) (esc)
29	building [=============> ] 4/12	29	building [=============> ] 4/12\r (no-eol) (esc)
30	building [=============> ] 4/12	30	building [=============> ] 4/12\r (no-eol) (esc)
31	building [=============> ] 4/12	31	building [================> ] 5/12\r (no-eol) (esc)
32	building [================> ] 5/12	32	building [================> ] 5/12\r (no-eol) (esc)
33	building [================> ] 5/12	33	building [====================> ] 6/12\r (no-eol) (esc)
34	building [====================> ] 6/12	34	building [====================> ] 6/12\r (no-eol) (esc)
35	building [====================> ] 6/12	35	building [=======================> ] 7/12\r (no-eol) (esc)
36	building [=======================> ] 7/12	36	building [=======================> ] 7/12\r (no-eol) (esc)
37	building [=======================> ] 7/12	37	building [===========================> ] 8/12\r (no-eol) (esc)
38	building [===========================> ] 8/12	38	building [===========================> ] 8/12\r (no-eol) (esc)
39	building [===========================> ] 8/12	39	building [===========================> ] 8/12\r (no-eol) (esc)
40	building [===========================> ] 8/12	40	building [===========================> ] 8/12\r (no-eol) (esc)
41	building [===========================> ] 8/12	41	building [==============================> ] 9/12\r (no-eol) (esc)
42	building [==============================> ] 9/12	42	building [==============================> ] 9/12\r (no-eol) (esc)
43	building [==============================> ] 9/12	43	building [==================================> ] 10/12\r (no-eol) (esc)
44	building [==================================> ] 10/12	44	building [==================================> ] 10/12\r (no-eol) (esc)
45	building [==================================> ] 10/12	45	building [=====================================> ] 11/12\r (no-eol) (esc)
46	building [=====================================> ] 11/12	46	building [=====================================> ] 11/12\r (no-eol) (esc)
47	building [=====================================> ] 11/12	47	\r (no-eol) (esc)
48	\r (esc)
49		48
50	tags	49	tags
51	$ cat .hg/localtags	50	$ cat .hg/localtags

tests/test-largefiles.t

0 +1 -2

               $ hg clone -U . ../empty
               $ cd ../empty
-              $ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 | "$TESTDIR/filtercr.py"
+              $ hg archive --subrepos -r tip ../archive.tar.gz
               cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
               $ cd ..
             Test that addremove picks up largefiles prior to the initial commit (issue3541)

tests/test-patchbomb.t

0 +16 -14

               $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
               > --config extensions.progress= --config progress.assume-tty=1 \
               > --config progress.delay=0 --config progress.refresh=0 \
-              > --config progress.width=60 2>&1 | \
+              > --config progress.width=60
-              > python "$TESTDIR/filtercr.py"
               this patch series consists of 2 patches.
               Write the introductory message for the patch series.
+              \r (no-eol) (esc)
-              sending [                                             ] 0/3
+              sending [                                             ] 0/3\r (no-eol) (esc)
-              sending [                                             ] 0/3
+              sending [                                             ] 0/3\r (no-eol) (esc)
+                                                                          \r (no-eol) (esc)
+              \r (no-eol) (esc)
-              sending [==============>                              ] 1/3
+                                                                          \r (no-eol) (esc)
-              sending [==============>                              ] 1/3
+              \r (no-eol) (esc)
+              sending [==============>                              ] 1/3\r (no-eol) (esc)
+              sending [==============>                              ] 1/3\r (no-eol) (esc)
-              sending [=============================>               ] 2/3
+                                                                          \r (no-eol) (esc)
-              sending [=============================>               ] 2/3
+              \r (no-eol) (esc)
+                                                                          \r (no-eol) (esc)
+              \r (no-eol) (esc)
+              sending [=============================>               ] 2/3\r (no-eol) (esc)
+              sending [=============================>               ] 2/3\r (no-eol) (esc)
                                                                           \r (esc)
               sending [PATCH 0 of 2] test ...
               sending [PATCH 1 of 2] a ...
               sending [PATCH 2 of 2] b ...
               $ cd ..

tests/test-progress.t

0 +92 -100

@@ -46,104 +46,96 b''
46		46
47	test default params, display nothing because of delay	47	test default params, display nothing because of delay
48		48
49	$ hg -y loop 3 2>&1 \| "$TESTDIR/filtercr.py"	49	$ hg -y loop 3
50
51	$ echo "delay=0" >> $HGRCPATH	50	$ echo "delay=0" >> $HGRCPATH
52	$ echo "refresh=0" >> $HGRCPATH	51	$ echo "refresh=0" >> $HGRCPATH
53		52
54	test with delay=0, refresh=0	53	test with delay=0, refresh=0
55		54
56	$ hg -y loop 3 2>&1 \| "$TESTDIR/filtercr.py"	55	$ hg -y loop 3
57		56	\r (no-eol) (esc)
58	loop [ ] 0/3	57	loop [ ] 0/3\r (no-eol) (esc)
59	loop [===============> ] 1/3	58	loop [===============> ] 1/3\r (no-eol) (esc)
60	loop [===============================> ] 2/3	59	loop [===============================> ] 2/3\r (no-eol) (esc)
61	\r (esc)	60	\r (no-eol) (esc)
62		61
63		62
64	test nested short-lived topics (which shouldn't display with nestdelay):	63	test nested short-lived topics (which shouldn't display with nestdelay):
65		64
66	$ hg -y loop 3 --nested ~~2>&1 \|~~ \	65	$ hg -y loop 3 --nested
67	> python "$TESTDIR/filtercr.py"	66	\r (no-eol) (esc)
68		67	loop [ ] 0/3\r (no-eol) (esc)
69	loop [ ~~] 0/3~~	68	loop [===============> ] 1/3\r (no-eol) (esc)
70	loop [===============> ~~] 1/3~~	69	loop [===============================> ] 2/3\r (no-eol) (esc)
71	loop [===============================> ] 2/3	70	\r (no-eol) (esc)
72	\r (esc)
73		71
74		72
75	$ hg --config progress.changedelay=0 -y loop 3 --nested ~~2>&1 \|~~ \	73	$ hg --config progress.changedelay=0 -y loop 3 --nested
76	> python "$TESTDIR/filtercr.py"	74	\r (no-eol) (esc)
77		75	loop [ ] 0/3\r (no-eol) (esc)
78	~~loop [~~ ] 0/3	76	nested [ ] 0/2\r (no-eol) (esc)
79	nested [ ] 0/2	77	nested [======================> ] 1/2\r (no-eol) (esc)
80	~~nested [=======~~===============> ~~] 1/2~~	78	loop [===============> ] 1/3\r (no-eol) (esc)
81	loop [===============> ] 1/3	79	nested [ ] 0/2\r (no-eol) (esc)
82	nested [ ] 0/2	80	nested [======================> ] 1/2\r (no-eol) (esc)
83	~~nested [~~======================> ~~] 1/2~~	81	loop [===============================> ] 2/3\r (no-eol) (esc)
84	loop [===============================> ] 2/3	82	nested [ ] 0/2\r (no-eol) (esc)
85	nested [ ] 0/2	83	nested [======================> ] 1/2\r (no-eol) (esc)
86	nested [======================> ] 1/2	84	\r (no-eol) (esc)
87	\r (esc)
88		85
89		86
90	test two topics being printed in parallel (as when we're doing a local	87	test two topics being printed in parallel (as when we're doing a local
91	--pull clone, where you get the unbundle and bundle progress at the	88	--pull clone, where you get the unbundle and bundle progress at the
92	same time):	89	same time):
93	$ hg loop 3 --parallel 2>&1 \| python "$TESTDIR/filtercr.py"	90	$ hg loop 3 --parallel
94		91	\r (no-eol) (esc)
95	loop [ ] 0/3	92	loop [ ] 0/3\r (no-eol) (esc)
96	loop [===============> ] 1/3	93	loop [===============> ] 1/3\r (no-eol) (esc)
97	loop [===============================> ] 2/3	94	loop [===============================> ] 2/3\r (no-eol) (esc)
98	\r (esc)	95	\r (no-eol) (esc)
99	test refresh is taken in account	96	test refresh is taken in account
100		97
101	$ hg -y --config progress.refresh=100 loop 3 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	98	$ hg -y --config progress.refresh=100 loop 3
102
103		99
104	test format options 1	100	test format options 1
105		101
106	$ hg -y --config 'progress.format=number topic item+2' loop 2 2>&1 \	102	$ hg -y --config 'progress.format=number topic item+2' loop 2
107	> \| "$TESTDIR/filtercr.py"	103	\r (no-eol) (esc)
108		104	0/2 loop lo\r (no-eol) (esc)
109	0/2 loop lo	105	1/2 loop lo\r (no-eol) (esc)
110	1/2 loop lo	106	\r (no-eol) (esc)
111	\r (esc)
112		107
113	test format options 2	108	test format options 2
114		109
115	$ hg -y --config 'progress.format=number item-3 bar' loop 2 2>&1 \	110	$ hg -y --config 'progress.format=number item-3 bar' loop 2
116	> \| "$TESTDIR/filtercr.py"	111	\r (no-eol) (esc)
117		112	0/2 p.0 [ ]\r (no-eol) (esc)
118	0/2 p.0 [ ]	113	1/2 p.1 [=======================> ]\r (no-eol) (esc)
119	1/2 p.1 [=======================> ]	114	\r (no-eol) (esc)
120	\r (esc)
121		115
122	test format options and indeterminate progress	116	test format options and indeterminate progress
123		117
124	$ hg -y --config 'progress.format=number item bar' loop -- -2 2>&1 \	118	$ hg -y --config 'progress.format=number item bar' loop -- -2
125	> \| "$TESTDIR/filtercr.py"	119	\r (no-eol) (esc)
126		120	0 loop.0 [ <=> ]\r (no-eol) (esc)
127	0 loop.0 [ <=> ]	121	1 loop.1 [ <=> ]\r (no-eol) (esc)
128	1 loop.1 [ <=> ]	122	\r (no-eol) (esc)
129	\r (esc)
130		123
131	make sure things don't fall over if count > total	124	make sure things don't fall over if count > total
132		125
133	$ hg -y loop --total 4 6 ~~2>&1 \| "$TESTDIR/filtercr.py"~~	126	$ hg -y loop --total 4 6
134		127	\r (no-eol) (esc)
135	loop [ ] 0/4	128	loop [ ] 0/4\r (no-eol) (esc)
136	loop [===========> ] 1/4	129	loop [===========> ] 1/4\r (no-eol) (esc)
137	loop [=======================> ] 2/4	130	loop [=======================> ] 2/4\r (no-eol) (esc)
138	loop [===================================> ] 3/4	131	loop [===================================> ] 3/4\r (no-eol) (esc)
139	loop [===============================================>] 4/4	132	loop [===============================================>] 4/4\r (no-eol) (esc)
140	loop [ <=> ] 5/4	133	loop [ <=> ] 5/4\r (no-eol) (esc)
141	\r (esc)	134	\r (no-eol) (esc)
142		135
143	test immediate progress completion	136	test immediate progress completion
144		137
145	$ hg -y loop 0 2>&1 \| "$TESTDIR/filtercr.py"	138	$ hg -y loop 0
146
147		139
148	test delay time estimates	140	test delay time estimates
149		141
@@ -173,44 +165,44 b' test delay time estimates'
173	$ echo "delay=25" >> $HGRCPATH	165	$ echo "delay=25" >> $HGRCPATH
174	$ echo "width=60" >> $HGRCPATH	166	$ echo "width=60" >> $HGRCPATH
175		167
176	$ hg -y loop 8 2>&1 \| python "$TESTDIR/filtercr.py"	168	$ hg -y loop 8
177		169	\r (no-eol) (esc)
178	loop [=========> ] 2/8 1m07s	170	loop [=========> ] 2/8 1m07s\r (no-eol) (esc)
179	loop [===============> ] 3/8 56s	171	loop [===============> ] 3/8 56s\r (no-eol) (esc)
180	loop [=====================> ] 4/8 45s	172	loop [=====================> ] 4/8 45s\r (no-eol) (esc)
181	loop [==========================> ] 5/8 34s	173	loop [==========================> ] 5/8 34s\r (no-eol) (esc)
182	loop [================================> ] 6/8 23s	174	loop [================================> ] 6/8 23s\r (no-eol) (esc)
183	loop [=====================================> ] 7/8 12s	175	loop [=====================================> ] 7/8 12s\r (no-eol) (esc)
184	\r (esc)	176	\r (no-eol) (esc)
185		177
186	$ MOCKTIME=10000 hg -y loop 4 2>&1 \| ~~python~~ ~~"$TESTDIR/filtercr.py"~~	178	$ MOCKTIME=10000 hg -y loop 4
187		179	\r (no-eol) (esc)
188	loop [ ] 0/4	180	loop [ ] 0/4\r (no-eol) (esc)
189	loop [=========> ] 1/4 8h21m	181	loop [=========> ] 1/4 8h21m\r (no-eol) (esc)
190	loop [====================> ] 2/4 5h34m	182	loop [====================> ] 2/4 5h34m\r (no-eol) (esc)
191	loop [==============================> ] 3/4 2h47m	183	loop [==============================> ] 3/4 2h47m\r (no-eol) (esc)
192	\r (esc)	184	\r (no-eol) (esc)
193		185
194	$ MOCKTIME=1000000 hg -y loop 4 2>&1 \| ~~python~~ ~~"$TESTDIR/filtercr.py"~~	186	$ MOCKTIME=1000000 hg -y loop 4
195		187	\r (no-eol) (esc)
196	loop [ ] 0/4	188	loop [ ] 0/4\r (no-eol) (esc)
197	loop [=========> ] 1/4 5w00d	189	loop [=========> ] 1/4 5w00d\r (no-eol) (esc)
198	loop [====================> ] 2/4 3w03d	190	loop [====================> ] 2/4 3w03d\r (no-eol) (esc)
199	loop [=============================> ] 3/4 11d14h	191	loop [=============================> ] 3/4 11d14h\r (no-eol) (esc)
200	\r (esc)	192	\r (no-eol) (esc)
201		193
202		194
203	$ MOCKTIME=14000000 hg -y loop 4 2>&1 \| ~~python~~ ~~"$TESTDIR/filtercr.py"~~	195	$ MOCKTIME=14000000 hg -y loop 4
204		196	\r (no-eol) (esc)
205	loop [ ] 0/4	197	loop [ ] 0/4\r (no-eol) (esc)
206	loop [=========> ] 1/4 1y18w	198	loop [=========> ] 1/4 1y18w\r (no-eol) (esc)
207	loop [===================> ] 2/4 46w03d	199	loop [===================> ] 2/4 46w03d\r (no-eol) (esc)
208	loop [=============================> ] 3/4 23w02d	200	loop [=============================> ] 3/4 23w02d\r (no-eol) (esc)
209	\r (esc)	201	\r (no-eol) (esc)
210		202
211	Time estimates should not fail when there's no end point:	203	Time estimates should not fail when there's no end point:
212	$ hg -y loop -- -4 2>&1 \| python "$TESTDIR/filtercr.py"	204	$ hg -y loop -- -4
213		205	\r (no-eol) (esc)
214	loop [ <=> ] 2	206	loop [ <=> ] 2\r (no-eol) (esc)
215	loop [ <=> ] 3	207	loop [ <=> ] 3\r (no-eol) (esc)
216	\r (esc)	208	\r (no-eol) (esc)

tests/test-subrepo-recursion.t

0 +82 -76

@@ -260,31 +260,33 b' Enable progress extension for archive te'
260	Test archiving to a directory tree (the doubled lines in the output	260	Test archiving to a directory tree (the doubled lines in the output
261	only show up in the test output, not in real usage):	261	only show up in the test output, not in real usage):
262		262
263	$ hg archive --subrepos ../archive 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	263	$ hg archive --subrepos ../archive
264		264	\r (no-eol) (esc)
265	archiving [ ] 0/3	265	archiving [ ] 0/3\r (no-eol) (esc)
266	archiving [ ] 0/3	266	archiving [ ] 0/3\r (no-eol) (esc)
267	archiving [=============> ] 1/3	267	archiving [=============> ] 1/3\r (no-eol) (esc)
268	archiving [=============> ] 1/3	268	archiving [=============> ] 1/3\r (no-eol) (esc)
269	archiving [===========================> ] 2/3	269	archiving [===========================> ] 2/3\r (no-eol) (esc)
270	archiving [===========================> ] 2/3	270	archiving [===========================> ] 2/3\r (no-eol) (esc)
271	archiving [==========================================>] 3/3	271	archiving [==========================================>] 3/3\r (no-eol) (esc)
272	archiving [==========================================>] 3/3	272	archiving [==========================================>] 3/3\r (no-eol) (esc)
273		273	\r (no-eol) (esc)
274	archiving (foo) [ ] 0/3	274	\r (no-eol) (esc)
275	archiving (foo) [ ] 0/3	275	archiving (foo) [ ] 0/3\r (no-eol) (esc)
276	archiving (foo) [~~===========>~~ ] 1/3	276	archiving (foo) [ ] 0/3\r (no-eol) (esc)
277	archiving (foo) [===========> ] 1/3	277	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
278	archiving (foo) [==========~~============~~=> ] 2/3	278	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
279	archiving (foo) [=======================> ] 2/3	279	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
280	archiving (foo) [=======================~~=============~~>] 3/3	280	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
281	archiving (foo) [====================================>] 3/3	281	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
282		282	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
283	archiving (foo/bar) [ ] 0/1 (glob)	283	\r (no-eol) (esc)
284	archiving (foo/bar) [ ] 0/1 (glob)	284	\r (no-eol) (esc)
285	archiving (foo/bar) [================================>] 1/1 (glob)	285	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
286	archiving (foo/bar) [================================>] 1/1 (glob)	286	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
287	\r (esc)	287	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		288	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		289	\r (no-eol) (esc)
288	$ find ../archive \| sort	290	$ find ../archive \| sort
289	../archive	291	../archive
290	../archive/.hg_archival.txt	292	../archive/.hg_archival.txt
@@ -300,65 +302,69 b' only show up in the test output, not in '
300		302
301	Test archiving to zip file (unzip output is unstable):	303	Test archiving to zip file (unzip output is unstable):
302		304
303	$ hg archive --subrepos ../archive.zip 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	305	$ hg archive --subrepos ../archive.zip
304		306	\r (no-eol) (esc)
305	archiving [ ] 0/3	307	archiving [ ] 0/3\r (no-eol) (esc)
306	archiving [ ] 0/3	308	archiving [ ] 0/3\r (no-eol) (esc)
307	archiving [=============> ] 1/3	309	archiving [=============> ] 1/3\r (no-eol) (esc)
308	archiving [=============> ] 1/3	310	archiving [=============> ] 1/3\r (no-eol) (esc)
309	archiving [===========================> ] 2/3	311	archiving [===========================> ] 2/3\r (no-eol) (esc)
310	archiving [===========================> ] 2/3	312	archiving [===========================> ] 2/3\r (no-eol) (esc)
311	archiving [==========================================>] 3/3	313	archiving [==========================================>] 3/3\r (no-eol) (esc)
312	archiving [==========================================>] 3/3	314	archiving [==========================================>] 3/3\r (no-eol) (esc)
313		315	\r (no-eol) (esc)
314	archiving (foo) [ ] 0/3	316	\r (no-eol) (esc)
315	archiving (foo) [ ] 0/3	317	archiving (foo) [ ] 0/3\r (no-eol) (esc)
316	archiving (foo) [~~===========>~~ ] 1/3	318	archiving (foo) [ ] 0/3\r (no-eol) (esc)
317	archiving (foo) [===========> ] 1/3	319	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
318	archiving (foo) [==========~~============~~=> ] 2/3	320	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
319	archiving (foo) [=======================> ] 2/3	321	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
320	archiving (foo) [=======================~~=============~~>] 3/3	322	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
321	archiving (foo) [====================================>] 3/3	323	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
322		324	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
323	archiving (foo/bar) [ ] 0/1 (glob)	325	\r (no-eol) (esc)
324	archiving (foo/bar) [ ] 0/1 (glob)	326	\r (no-eol) (esc)
325	archiving (foo/bar) [================================>] 1/1 (glob)	327	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
326	archiving (foo/bar) [================================>] 1/1 (glob)	328	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
327	\r (esc)	329	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		330	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		331	\r (no-eol) (esc)
328		332
329	Test archiving a revision that references a subrepo that is not yet	333	Test archiving a revision that references a subrepo that is not yet
330	cloned:	334	cloned:
331		335
332	$ hg clone -U . ../empty	336	$ hg clone -U . ../empty
333	$ cd ../empty	337	$ cd ../empty
334	$ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 \| ~~"$TESTDIR/filtercr.py"~~	338	$ hg archive --subrepos -r tip ../archive.tar.gz
335		339	\r (no-eol) (esc)
336	archiving [ ] 0/3	340	archiving [ ] 0/3\r (no-eol) (esc)
337	archiving [ ] 0/3	341	archiving [ ] 0/3\r (no-eol) (esc)
338	archiving [=============> ] 1/3	342	archiving [=============> ] 1/3\r (no-eol) (esc)
339	archiving [=============> ] 1/3	343	archiving [=============> ] 1/3\r (no-eol) (esc)
340	archiving [===========================> ] 2/3	344	archiving [===========================> ] 2/3\r (no-eol) (esc)
341	archiving [===========================> ] 2/3	345	archiving [===========================> ] 2/3\r (no-eol) (esc)
342	archiving [==========================================>] 3/3	346	archiving [==========================================>] 3/3\r (no-eol) (esc)
343	archiving [==========================================>] 3/3	347	archiving [==========================================>] 3/3\r (no-eol) (esc)
344		348	\r (no-eol) (esc)
345	archiving (foo) [ ] 0/3	349	\r (no-eol) (esc)
346	archiving (foo) [ ] 0/3	350	archiving (foo) [ ] 0/3\r (no-eol) (esc)
347	archiving (foo) [~~===========>~~ ] 1/3	351	archiving (foo) [ ] 0/3\r (no-eol) (esc)
348	archiving (foo) [===========> ] 1/3	352	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
349	archiving (foo) [==========~~============~~=> ] 2/3	353	archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
350	archiving (foo) [=======================> ] 2/3	354	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
351	archiving (foo) [=======================~~=============~~>] 3/3	355	archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
352	archiving (foo) [====================================>] 3/3	356	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
353		357	archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
354	archiving (foo/bar) [ ] 0/1 (glob)	358	\r (no-eol) (esc)
355	archiving (foo/bar) [ ] 0/1 (glob)	359	\r (no-eol) (esc)
356	archiving (foo/bar) [================================>] 1/1 (glob)	360	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
357	archiving (foo/bar) [================================>] 1/1 (glob)	361	archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
358		362	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		363	archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
		364	\r (no-eol) (esc)
359	cloning subrepo foo from $TESTTMP/repo/foo	365	cloning subrepo foo from $TESTTMP/repo/foo
360	cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)	366	cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
361		367
362	The newly cloned subrepos contain no working copy:	368	The newly cloned subrepos contain no working copy:
363		369
364	$ hg -R foo summary	370	$ hg -R foo summary

tests/filtercr.py

0 removed 0 -10

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages