mercurial: tests/test-convert-svn-move.t@1a45e49a6bed (annotated)

22046 7a9cbb315d84 tests: replace exit 80 with #require Matt Mackall <mpm@selenic.com> parents: 20117 diff changeset	1	#require svn svn-bindings
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	2
13519 43b3b761d9d1 tests: don't overwrite HGRCPATH Martin Geisler <mg@aragost.com> parents: 13149 diff changeset	3	$ cat >> $HGRCPATH <<EOF
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	4	> [extensions]
17347 2da47de36b6f check-code: fix check for trailing whitespace on continued lines too Mads Kiilerich <mads@kiilerich.com> parents: 17033 diff changeset	5	> convert =
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	6	> EOF
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	7
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	8	$ svnadmin create svn-repo
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	9	$ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	10	$ SVNREPOPATH=`pwd`/svn-repo
0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	11	#if windows
22947 c63a09b6b337 tests: use $PYTHON instead of hardcoding python Augie Fackler <raf@durin42.com> parents: 22414 diff changeset	12	$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	13	#else
22947 c63a09b6b337 tests: use $PYTHON instead of hardcoding python Augie Fackler <raf@durin42.com> parents: 22414 diff changeset	14	$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	15	#endif
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	16
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	17	Convert trunk and branches
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	18
17033 0413f68da85c tests: cleanup of svn url handling Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	19	$ hg convert --datesort "$SVNREPOURL"/subproject A-hg
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	20	initializing destination A-hg repository
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	21	scanning source...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	22	sorting...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	23	converting...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	24	13 createtrunk
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	25	12 moved1
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	26	11 moved1
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	27	10 moved2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	28	9 changeb and rm d2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	29	8 changeb and rm d2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	30	7 moved1again
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	31	6 moved1again
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	32	5 copyfilefrompast
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	33	4 copydirfrompast
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	34	3 add d3
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	35	2 copy dir and remove subdir
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	36	1 add d4old
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	37	0 rename d4old into d4new
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	38
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	39	$ cd A-hg
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 18376 diff changeset	40	$ hg log -G --template '{rev} {desc\|firstline} files: {files}\n'
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	41	o 13 rename d4old into d4new files: d4new/g d4old/g
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	42	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	43	o 12 add d4old files: d4old/g
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	44	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	45	o 11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	46	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	47	o 10 add d3 files: d3/d31/e d3/f
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	48	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	49	o 9 copydirfrompast files: d2/d
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	50	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	51	o 8 copyfilefrompast files: d
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	52	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	53	o 7 moved1again files: d1/b d1/c
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	54	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	55	\| o 6 moved1again files:
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	56	\| \|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	57	o \| 5 changeb and rm d2 files: d1/b d2/d
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	58	\| \|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	59	\| o 4 changeb and rm d2 files: b
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	60	\| \|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	61	o \| 3 moved2 files: d2/d
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	62	\| \|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	63	o \| 2 moved1 files: d1/b d1/c
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	64	\| \|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	65	\| o 1 moved1 files: b c
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	66	\|
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	67	o 0 createtrunk files:
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	68
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	69
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	70	Check move copy records
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	71
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	72	$ hg st --rev 12:13 --copies
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	73	A d4new/g
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	74	d4old/g
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	75	R d4old/g
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	76
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	77	Check branches
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	78
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	79	$ hg branches
12377 a5b77eb0409b tests: various fixes for new unified test pattern format Matt Mackall <mpm@selenic.com> parents: 12370 diff changeset	80	default 13:* (glob)
a5b77eb0409b tests: various fixes for new unified test pattern format Matt Mackall <mpm@selenic.com> parents: 12370 diff changeset	81	d1 6:* (glob)
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	82	$ cd ..
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	83
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	84	$ mkdir test-replace
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	85	$ cd test-replace
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	86	$ svnadmin create svn-repo
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	87	$ svnadmin load -q svn-repo < "$TESTDIR/svn/replace.svndump"
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	88
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	89	Convert files being replaced by directories
5955 c4496b7c10ce convert: fix svn_source.latest() Patrick Mezard <pmezard@gmail.com> parents: diff changeset	90
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	91	$ hg convert svn-repo hg-repo
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	92	initializing destination hg-repo repository
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	93	scanning source...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	94	sorting...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	95	converting...
13052 5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	96	6 initial
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	97	5 clobber symlink
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	98	4 clobber1
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	99	3 clobber2
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	100	2 adddb
18376 13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	101	1 clobberdir
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	102	0 branch
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	103
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	104	$ cd hg-repo
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	105
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	106	Manifest before
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	107
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	108	$ hg -v manifest -r 1
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	109	644 a
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	110	644 d/b
13052 5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	111	644 d2/a
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	112	644 @ dlink
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	113	644 @ dlink2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	114	644 dlink3
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	115
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	116	Manifest after clobber1
11128 a9b427b5821e convert/svn: handle files/links replaced by dirs (issue2166) Patrick Mezard <pmezard@gmail.com> parents: 11124 diff changeset	117
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	118	$ hg -v manifest -r 2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	119	644 a/b
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	120	644 d/b
13052 5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	121	644 d2/a
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	122	644 dlink/b
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	123	644 @ dlink2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	124	644 dlink3
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	125
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	126	Manifest after clobber2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	127
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	128	$ hg -v manifest -r 3
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	129	644 a/b
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	130	644 d/b
13052 5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	131	644 d2/a
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	132	644 dlink/b
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	133	644 @ dlink2
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	134	644 @ dlink3
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	135
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	136	Manifest after clobberdir
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	137
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	138	$ hg -v manifest -r 6
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	139	644 a/b
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	140	644 d/b
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	141	644 d2/a
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	142	644 d2/c
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	143	644 dlink/b
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	144	644 @ dlink2
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	145	644 @ dlink3
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	146
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	147	Try updating
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	148
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	149	$ hg up -qC default
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	150	$ cd ..
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	151
22410 9fdbf96fc0e0 test-convert-svn-move.t: remove stray ' Augie Fackler <raf@durin42.com> parents: 22046 diff changeset	152	Test convert progress bar
11128 a9b427b5821e convert/svn: handle files/links replaced by dirs (issue2166) Patrick Mezard <pmezard@gmail.com> parents: 11124 diff changeset	153
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	154	$ cat >> $HGRCPATH <<EOF
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	155	> [extensions]
17347 2da47de36b6f check-code: fix check for trailing whitespace on continued lines too Mads Kiilerich <mads@kiilerich.com> parents: 17033 diff changeset	156	> progress =
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	157	> [progress]
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	158	> assume-tty = 1
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	159	> delay = 0
14838 5d261fd00446 progress: add a changedelay to prevent parallel topics from flapping (issue2698) Augie Fackler <durin42@gmail.com> parents: 13519 diff changeset	160	> changedelay = 0
13149 735dd8e8a208 progress using tests: disable time estimates to avoid flakiness Augie Fackler <durin42@gmail.com> parents: 13142 diff changeset	161	> format = topic bar number
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	162	> refresh = 0
13142 e9827c85c50b progress: test setting progress.width Martin Geisler <mg@aragost.com> parents: 13141 diff changeset	163	> width = 60
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	164	> EOF
11135 73a4ed3bfef8 convert: add progress support Patrick Mezard <pmezard@gmail.com> parents: 11128 diff changeset	165
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 17347 diff changeset	166	$ hg convert svn-repo hg-progress
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 17347 diff changeset	167	\r (no-eol) (esc)
22414 299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	168	scanning [=====> ] 1/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	169	scanning [===========> ] 2/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	170	scanning [=================> ] 3/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	171	scanning [========================> ] 4/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	172	scanning [==============================> ] 5/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	173	scanning [====================================> ] 6/7\r (no-eol) (esc)
299eaa09b41b convert: enable deterministic conversion progress bar for svn Augie Fackler <raf@durin42.com> parents: 22410 diff changeset	174	scanning [===========================================>] 7/7\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: 17347 diff changeset	175	\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: 17347 diff changeset	176	\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: 17347 diff changeset	177	converting [ ] 0/7\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: 17347 diff changeset	178	getting files [=====> ] 1/6\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: 17347 diff changeset	179	getting files [============> ] 2/6\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: 17347 diff changeset	180	getting files [==================> ] 3/6\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: 17347 diff changeset	181	getting files [=========================> ] 4/6\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: 17347 diff changeset	182	getting files [===============================> ] 5/6\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: 17347 diff changeset	183	getting files [======================================>] 6/6\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: 17347 diff changeset	184	\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: 17347 diff changeset	185	\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: 17347 diff changeset	186	converting [=====> ] 1/7\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: 17347 diff changeset	187	scanning paths [ ] 0/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: 17347 diff changeset	188	getting files [======================================>] 1/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: 17347 diff changeset	189	\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: 17347 diff changeset	190	\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: 17347 diff changeset	191	converting [===========> ] 2/7\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: 17347 diff changeset	192	scanning paths [ ] 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: 17347 diff changeset	193	scanning paths [==================> ] 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: 17347 diff changeset	194	getting files [========> ] 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: 17347 diff changeset	195	getting files [==================> ] 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: 17347 diff changeset	196	getting files [============================> ] 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: 17347 diff changeset	197	getting files [======================================>] 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: 17347 diff changeset	198	\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: 17347 diff changeset	199	\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: 17347 diff changeset	200	converting [=================> ] 3/7\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: 17347 diff changeset	201	scanning paths [ ] 0/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: 17347 diff changeset	202	getting files [======================================>] 1/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: 17347 diff changeset	203	\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: 17347 diff changeset	204	\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: 17347 diff changeset	205	converting [=======================> ] 4/7\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: 17347 diff changeset	206	scanning paths [ ] 0/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: 17347 diff changeset	207	getting files [======================================>] 1/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: 17347 diff changeset	208	\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: 17347 diff changeset	209	\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: 17347 diff changeset	210	converting [=============================> ] 5/7\r (no-eol) (esc)
18376 13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	211	scanning paths [ ] 0/1\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: 17347 diff changeset	212	getting files [===> ] 1/8\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: 17347 diff changeset	213	getting files [========> ] 2/8\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: 17347 diff changeset	214	getting files [=============> ] 3/8\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: 17347 diff changeset	215	getting files [==================> ] 4/8\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: 17347 diff changeset	216	getting files [=======================> ] 5/8\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: 17347 diff changeset	217	getting files [============================> ] 6/8\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: 17347 diff changeset	218	getting files [=================================> ] 7/8\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: 17347 diff changeset	219	getting files [======================================>] 8/8\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: 17347 diff changeset	220	\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: 17347 diff changeset	221	\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: 17347 diff changeset	222	converting [===================================> ] 6/7\r (no-eol) (esc)
18376 13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	223	scanning paths [ ] 0/3\r (no-eol) (esc)
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	224	scanning paths [===========> ] 1/3\r (no-eol) (esc)
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	225	scanning paths [========================> ] 2/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: 17347 diff changeset	226	getting files [===> ] 1/8\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: 17347 diff changeset	227	getting files [========> ] 2/8\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: 17347 diff changeset	228	getting files [=============> ] 3/8\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: 17347 diff changeset	229	getting files [==================> ] 4/8\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: 17347 diff changeset	230	getting files [=======================> ] 5/8\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: 17347 diff changeset	231	getting files [============================> ] 6/8\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: 17347 diff changeset	232	getting files [=================================> ] 7/8\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: 17347 diff changeset	233	getting files [======================================>] 8/8\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: 17347 diff changeset	234	\r (no-eol) (esc)
12370 f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	235	initializing destination hg-progress repository
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	236	scanning source...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	237	sorting...
f98010f57a5e tests: unify test-convert-svn-* Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11135 diff changeset	238	converting...
13052 5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	239	6 initial
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	240	5 clobber symlink
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	241	4 clobber1
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	242	3 clobber2
5fb924ee44d5 convert/svn: fix changed files list upon directory replacements Patrick Mezard <pmezard@gmail.com> parents: 12377 diff changeset	243	2 adddb
18376 13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	244	1 clobberdir
13d73bf6be29 convert: make toposort order stable when multiple orderings are possible Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	245	0 branch
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16350 diff changeset	246
f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16350 diff changeset	247	$ cd ..

author	Matt Mackall <mpm@selenic.com>
	Tue, 01 Sep 2015 16:08:07 -0500
branch	stable
changeset 26120	1a45e49a6bed
parent 22947	c63a09b6b337
child 28597	cd34bf29987e
permissions	-rw-r--r--