mercurial: tests/test-progress.t@1596f2d8f242 (annotated)

10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	1
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	2	$ cat > loop.py <<EOF
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	3	> from mercurial import commands
19619 4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	4	> import time
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	5	> class incrementingtime(object):
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	6	> def __init__(self):
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	7	> self._time = 0.0
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	8	> def __call__(self):
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	9	> self._time += 0.25
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	10	> return self._time
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	11	> time.time = incrementingtime()
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	12	>
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	13	> def loop(ui, loops, **opts):
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	14	> loops = int(loops)
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	15	> total = None
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	16	> if loops >= 0:
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	17	> total = loops
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	18	> if opts.get('total', None):
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	19	> total = int(opts.get('total'))
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	20	> nested = False
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	21	> if opts.get('nested', None):
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	22	> nested = True
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	23	> loops = abs(loops)
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	24	>
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	25	> for i in range(loops):
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	26	> ui.progress('loop', i, 'loop.%d' % i, 'loopnum', total)
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	27	> if opts.get('parallel'):
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	28	> ui.progress('other', i, 'other.%d' % i, 'othernum', total)
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	29	> if nested:
19619 4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	30	> nested_steps = 2
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	31	> if i and i % 4 == 0:
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	32	> nested_steps = 5
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	33	> for j in range(nested_steps):
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	34	> ui.progress(
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	35	> 'nested', j, 'nested.%d' % j, 'nestnum', nested_steps)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	36	> ui.progress(
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	37	> 'nested', None, 'nested.done', 'nestnum', nested_steps)
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	38	> ui.progress('loop', None, 'loop.done', 'loopnum', total)
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	39	>
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	40	> commands.norepo += " loop"
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	41	>
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	42	> cmdtable = {
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	43	> "loop": (loop, [('', 'total', '', 'override for total'),
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	44	> ('', 'nested', False, 'show nested results'),
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	45	> ('', 'parallel', False, 'show parallel sets of results'),
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	46	> ],
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	47	> 'hg loop LOOPS'),
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	48	> }
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	49	> EOF
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	50
15372 695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 14838 diff changeset	51	$ cp $HGRCPATH $HGRCPATH.orig
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	52	$ echo "[extensions]" >> $HGRCPATH
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	53	$ echo "progress=" >> $HGRCPATH
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	54	$ echo "loop=`pwd`/loop.py" >> $HGRCPATH
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	55	$ echo "[progress]" >> $HGRCPATH
16675 f29f187ee73d test-progress: fix whitespace typo Martin Geisler <mg@lazybytes.net> parents: 16350 diff changeset	56	$ echo "format = topic bar number" >> $HGRCPATH
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	57	$ echo "assume-tty=1" >> $HGRCPATH
13142 e9827c85c50b progress: test setting progress.width Martin Geisler <mg@aragost.com> parents: 13141 diff changeset	58	$ echo "width=60" >> $HGRCPATH
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	59
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	60	test default params, display nothing because of delay
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	61
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	62	$ hg -y loop 3
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	63	$ echo "delay=0" >> $HGRCPATH
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	64	$ echo "refresh=0" >> $HGRCPATH
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	65
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	66	test with delay=0, refresh=0
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	67
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	68	$ hg -y loop 3
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	69	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	70	loop [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	71	loop [===============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	72	loop [===============================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	73	\r (no-eol) (esc)
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	74
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	75
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	76	test nested short-lived topics (which shouldn't display with nestdelay):
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	77
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	78	$ hg -y loop 3 --nested
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	79	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	80	loop [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	81	loop [===============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	82	loop [===============================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	83	\r (no-eol) (esc)
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	84
19619 4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	85	Test nested long-lived topic which has the same name as a short-lived
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	86	peer. We shouldn't get stuck showing the short-lived inner steps, and
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	87	should go back to skipping the inner steps when the slow nested step
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	88	finishes.
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	89
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	90	$ hg -y loop 7 --nested
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	91	\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	92	loop [ ] 0/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	93	loop [=====> ] 1/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	94	loop [============> ] 2/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	95	loop [===================> ] 3/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	96	loop [==========================> ] 4/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	97	nested [==========================> ] 3/5\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	98	nested [===================================> ] 4/5\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	99	loop [=================================> ] 5/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	100	loop [========================================> ] 6/7\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	101	\r (no-eol) (esc)
4694ccd5d994 progress: stop getting stuck in a nested topic during a long inner step Augie Fackler <raf@durin42.com> parents: 19229 diff changeset	102
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	103
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	104	$ hg --config progress.changedelay=0 -y loop 3 --nested
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	105	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	106	loop [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	107	nested [ ] 0/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	108	nested [======================> ] 1/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	109	loop [===============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	110	nested [ ] 0/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	111	nested [======================> ] 1/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	112	loop [===============================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	113	nested [ ] 0/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	114	nested [======================> ] 1/2\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	115	\r (no-eol) (esc)
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	116
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	117
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	118	test two topics being printed in parallel (as when we're doing a local
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	119	--pull clone, where you get the unbundle and bundle progress at the
5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13236 diff changeset	120	same time):
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	121	$ hg loop 3 --parallel
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	122	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	123	loop [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	124	loop [===============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	125	loop [===============================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	126	\r (no-eol) (esc)
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	127	test refresh is taken in account
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	128
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	129	$ hg -y --config progress.refresh=100 loop 3
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	130
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	131	test format options 1
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	132
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	133	$ hg -y --config 'progress.format=number topic item+2' loop 2
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	134	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	135	0/2 loop lo\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	136	1/2 loop lo\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	137	\r (no-eol) (esc)
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	138
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	139	test format options 2
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	140
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	141	$ hg -y --config 'progress.format=number item-3 bar' loop 2
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	142	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	143	0/2 p.0 [ ]\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	144	1/2 p.1 [=======================> ]\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	145	\r (no-eol) (esc)
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	146
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	147	test format options and indeterminate progress
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	148
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	149	$ hg -y --config 'progress.format=number item bar' loop -- -2
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	150	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	151	0 loop.0 [ <=> ]\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	152	1 loop.1 [ <=> ]\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	153	\r (no-eol) (esc)
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	154
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	155	make sure things don't fall over if count > total
10465 5d7e84e7ac6d Add test for progress extension Patrick Mezard <pmezard@gmail.com> parents: diff changeset	156
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	157	$ hg -y loop --total 4 6
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	158	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	159	loop [ ] 0/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	160	loop [===========> ] 1/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	161	loop [=======================> ] 2/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	162	loop [===================================> ] 3/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	163	loop [===============================================>] 4/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	164	loop [ <=> ] 5/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	165	\r (no-eol) (esc)
10891 83af68e38be3 progress: fall back to indeterminate progress if position is >= total Augie Fackler <durin42@gmail.com> parents: 10788 diff changeset	166
12479 2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	167	test immediate progress completion
2f9ef3657730 tests: unify test-progress Matt Mackall <mpm@selenic.com> parents: 10891 diff changeset	168
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	169	$ hg -y loop 0
13145 ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	170
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	171	test delay time estimates
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	172
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	173	$ cat > mocktime.py <<EOF
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	174	> import os
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	175	> import time
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	176	>
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	177	> class mocktime(object):
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	178	> def __init__(self, increment):
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	179	> self.time = 0
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	180	> self.increment = increment
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	181	> def __call__(self):
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	182	> self.time += self.increment
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	183	> return self.time
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	184	>
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	185	> def uisetup(ui):
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	186	> time.time = mocktime(int(os.environ.get('MOCKTIME', '11')))
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	187	> EOF
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	188
15372 695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 14838 diff changeset	189	$ cp $HGRCPATH.orig $HGRCPATH
695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 14838 diff changeset	190	$ echo "[extensions]" >> $HGRCPATH
13145 ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	191	$ echo "mocktime=`pwd`/mocktime.py" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	192	$ echo "progress=" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	193	$ echo "loop=`pwd`/loop.py" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	194	$ echo "[progress]" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	195	$ echo "assume-tty=1" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	196	$ echo "delay=25" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	197	$ echo "width=60" >> $HGRCPATH
ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	198
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	199	$ hg -y loop 8
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	200	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	201	loop [=========> ] 2/8 1m07s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	202	loop [===============> ] 3/8 56s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	203	loop [=====================> ] 4/8 45s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	204	loop [==========================> ] 5/8 34s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	205	loop [================================> ] 6/8 23s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	206	loop [=====================================> ] 7/8 12s\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	207	\r (no-eol) (esc)
13145 ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	208
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	209	$ MOCKTIME=10000 hg -y loop 4
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	210	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	211	loop [ ] 0/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	212	loop [=========> ] 1/4 8h21m\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	213	loop [====================> ] 2/4 5h34m\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	214	loop [==============================> ] 3/4 2h47m\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	215	\r (no-eol) (esc)
13145 ce4cd176634e test-progress: test completion estimates and progress bar delay Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	216
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	217	$ MOCKTIME=1000000 hg -y loop 4
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	218	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	219	loop [ ] 0/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	220	loop [=========> ] 1/4 5w00d\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	221	loop [====================> ] 2/4 3w03d\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	222	loop [=============================> ] 3/4 11d14h\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	223	\r (no-eol) (esc)
13236 3f299f5d9a29 progress: handle days, weeks and years timeless <timeless@gmail.com> parents: 13154 diff changeset	224
3f299f5d9a29 progress: handle days, weeks and years timeless <timeless@gmail.com> parents: 13154 diff changeset	225
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	226	$ MOCKTIME=14000000 hg -y loop 4
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	227	\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	228	loop [ ] 0/4\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	229	loop [=========> ] 1/4 1y18w\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	230	loop [===================> ] 2/4 46w03d\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	231	loop [=============================> ] 3/4 23w02d\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	232	\r (no-eol) (esc)
13236 3f299f5d9a29 progress: handle days, weeks and years timeless <timeless@gmail.com> parents: 13154 diff changeset	233
13154 e11c14f14491 progress: don't compute estimate without a total Augie Fackler <durin42@gmail.com> parents: 13149 diff changeset	234	Time estimates should not fail when there's no end point:
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	235	$ hg -y loop -- -4
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	236	\r (no-eol) (esc)
19229 41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 18670 diff changeset	237	loop [ <=> ] 2\r (no-eol) (esc)
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 18670 diff changeset	238	loop [ <=> ] 3\r (no-eol) (esc)
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16675 diff changeset	239	\r (no-eol) (esc)

author	Matt Mackall <mpm@selenic.com>
	Sun, 20 Oct 2013 16:43:11 -0700
branch	stable
changeset 19937	1596f2d8f242
parent 19619	4694ccd5d994
child 21254	51e5c793a9f4
permissions	-rw-r--r--