Mercurial > hg
annotate tests/test-convert-svn-move.t @ 12749:338b4b615d33
patchbomb: move command option help from the extension (patchbomb) to the command (email)
author | timeless <timeless@gmail.com> |
---|---|
date | Sun, 17 Oct 2010 14:00:01 +0300 |
parents | a5b77eb0409b |
children | 5fb924ee44d5 |
rev | line source |
---|---|
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
2 $ "$TESTDIR/hghave" svn svn-bindings || exit 80 |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
4 $ fixpath() |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
5 > { |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
6 > tr '\\' / |
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 $ cat > $HGRCPATH <<EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
9 > [extensions] |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
10 > convert = |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
11 > graphlog = |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
12 > EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
13 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
14 $ svnadmin create svn-repo |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
15 $ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump" |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
16 $ svnpath=`pwd | fixpath` |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
17 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
18 SVN wants all paths to start with a slash. Unfortunately, |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
19 Windows ones don't. Handle that. |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
21 $ expr "$svnpath" : "\/" > /dev/null |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
22 > if [ $? -ne 0 ]; then |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
23 > svnpath="/$svnpath" |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
24 > fi |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
25 > svnurl="file://$svnpath/svn-repo" |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
26 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
27 Convert trunk and branches |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
28 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
29 $ hg convert --datesort "$svnurl"/subproject A-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
30 initializing destination A-hg repository |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
31 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
32 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
33 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
34 13 createtrunk |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
35 12 moved1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
36 11 moved1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
37 10 moved2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
38 9 changeb and rm d2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
39 8 changeb and rm d2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
40 7 moved1again |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
41 6 moved1again |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
42 5 copyfilefrompast |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
43 4 copydirfrompast |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
44 3 add d3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
45 2 copy dir and remove subdir |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
46 1 add d4old |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
47 0 rename d4old into d4new |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
48 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
49 $ cd A-hg |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
50 $ hg glog --template '{rev} {desc|firstline} files: {files}\n' |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
51 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
|
52 | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
53 o 12 add d4old files: d4old/g |
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 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
|
56 | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
57 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
|
58 | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
59 o 9 copydirfrompast files: d2/d |
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 8 copyfilefrompast files: 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 7 moved1again 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 6 moved1again files: |
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 | 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
|
68 | | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
69 | 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
|
70 | | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
71 o | 3 moved2 files: d2/d |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
72 | | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
73 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
|
74 | | |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
75 | o 1 moved1 files: b c |
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 o 0 createtrunk files: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
78 |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
80 Check move copy records |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
81 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
82 $ hg st --rev 12:13 --copies |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
83 A d4new/g |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
84 d4old/g |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
85 R d4old/g |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
86 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
87 Check branches |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
88 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
89 $ hg branches |
12377
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12370
diff
changeset
|
90 default 13:* (glob) |
a5b77eb0409b
tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com>
parents:
12370
diff
changeset
|
91 d1 6:* (glob) |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
92 $ cd .. |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
93 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
94 $ mkdir test-replace |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
95 $ cd test-replace |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
96 $ svnadmin create svn-repo |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
97 $ 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
|
98 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
99 Convert files being replaced by directories |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
101 $ hg convert svn-repo hg-repo |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
102 initializing destination hg-repo repository |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
103 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
104 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
105 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
106 3 initial |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
107 2 clobber symlink |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
108 1 clobber1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
109 0 clobber2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
110 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
111 $ cd hg-repo |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
112 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
113 Manifest before |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
114 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
115 $ hg -v manifest -r 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
116 644 a |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
117 644 d/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
118 644 @ dlink |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
119 644 @ dlink2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
120 644 dlink3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
121 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
122 Manifest after clobber1 |
11128
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
123 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
124 $ hg -v manifest -r 2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
125 644 a/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
126 644 d/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
127 644 dlink/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
128 644 @ dlink2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
129 644 dlink3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
130 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
131 Manifest after clobber2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
132 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
133 $ hg -v manifest -r 3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
134 644 a/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
135 644 d/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
136 644 dlink/b |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
137 644 @ dlink2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
138 644 @ dlink3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
139 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
140 Try updating |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
141 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
142 $ hg up -qC default |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
143 $ cd .. |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
144 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
145 Test convert progress bar' |
11128
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
146 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
147 $ cat >> $HGRCPATH <<EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
148 > [extensions] |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
149 > progress = |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
150 > [progress] |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
151 > assume-tty = 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
152 > delay = 0 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
153 > refresh = 0 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
154 > EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
155 $ cat > filtercr.py <<EOF |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
156 > import sys, re |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
157 > for line in sys.stdin: |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
158 > line = re.sub(r'\r+[^\n]', lambda m: '\n' + m.group()[-1:], line) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
159 > sys.stdout.write(line) |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
160 > EOF |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
161 |
12370
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
162 $ hg convert svn-repo hg-progress 2>&1 | python filtercr.py |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
163 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
164 scanning [ <=> ] 1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
165 scanning [ <=> ] 2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
166 scanning [ <=> ] 3 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
167 scanning [ <=> ] 4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
168 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
169 converting [ ] 0/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
170 getting files [==========> ] 1/5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
171 getting files [======================> ] 2/5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
172 getting files [==================================> ] 3/5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
173 getting files [==============================================> ] 4/5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
174 getting files [==========================================================>] 5/5 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
175 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
176 converting [==============> ] 1/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
177 scanning paths [ ] 0/1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
178 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
179 getting files [==========================================================>] 1/1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
180 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
181 converting [==============================> ] 2/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
182 scanning paths [ ] 0/2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
183 scanning paths [============================> ] 1/2 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
184 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
185 getting files [=============> ] 1/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
186 getting files [============================> ] 2/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
187 getting files [===========================================> ] 3/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
188 getting files [==========================================================>] 4/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
189 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
190 converting [=============================================> ] 3/4 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
191 scanning paths [ ] 0/1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
192 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
193 getting files [==========================================================>] 1/1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
194 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
195 initializing destination hg-progress repository |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
196 scanning source... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
197 sorting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
198 converting... |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
199 3 initial |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
200 2 clobber symlink |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
201 1 clobber1 |
f98010f57a5e
tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11135
diff
changeset
|
202 0 clobber2 |