Show More
@@ -0,0 +1,180 b'' | |||||
|
1 | SVN-fs-dump-format-version: 2 | |||
|
2 | ||||
|
3 | UUID: 64cf20ed-79ff-4f10-8aaf-041d1993b42e | |||
|
4 | ||||
|
5 | Revision-number: 0 | |||
|
6 | Prop-content-length: 56 | |||
|
7 | Content-length: 56 | |||
|
8 | ||||
|
9 | K 8 | |||
|
10 | svn:date | |||
|
11 | V 27 | |||
|
12 | 2009-06-21T10:05:28.031033Z | |||
|
13 | PROPS-END | |||
|
14 | ||||
|
15 | Revision-number: 1 | |||
|
16 | Prop-content-length: 112 | |||
|
17 | Content-length: 112 | |||
|
18 | ||||
|
19 | K 7 | |||
|
20 | svn:log | |||
|
21 | V 10 | |||
|
22 | init projA | |||
|
23 | K 10 | |||
|
24 | svn:author | |||
|
25 | V 7 | |||
|
26 | pmezard | |||
|
27 | K 8 | |||
|
28 | svn:date | |||
|
29 | V 27 | |||
|
30 | 2009-06-21T10:05:28.108227Z | |||
|
31 | PROPS-END | |||
|
32 | ||||
|
33 | Node-path: branches | |||
|
34 | Node-kind: dir | |||
|
35 | Node-action: add | |||
|
36 | Prop-content-length: 10 | |||
|
37 | Content-length: 10 | |||
|
38 | ||||
|
39 | PROPS-END | |||
|
40 | ||||
|
41 | ||||
|
42 | Node-path: tags | |||
|
43 | Node-kind: dir | |||
|
44 | Node-action: add | |||
|
45 | Prop-content-length: 10 | |||
|
46 | Content-length: 10 | |||
|
47 | ||||
|
48 | PROPS-END | |||
|
49 | ||||
|
50 | ||||
|
51 | Node-path: trunk | |||
|
52 | Node-kind: dir | |||
|
53 | Node-action: add | |||
|
54 | Prop-content-length: 10 | |||
|
55 | Content-length: 10 | |||
|
56 | ||||
|
57 | PROPS-END | |||
|
58 | ||||
|
59 | ||||
|
60 | Revision-number: 2 | |||
|
61 | Prop-content-length: 106 | |||
|
62 | Content-length: 106 | |||
|
63 | ||||
|
64 | K 7 | |||
|
65 | svn:log | |||
|
66 | V 5 | |||
|
67 | hello | |||
|
68 | K 10 | |||
|
69 | svn:author | |||
|
70 | V 7 | |||
|
71 | pmezard | |||
|
72 | K 8 | |||
|
73 | svn:date | |||
|
74 | V 27 | |||
|
75 | 2009-06-21T10:05:29.109026Z | |||
|
76 | PROPS-END | |||
|
77 | ||||
|
78 | Node-path: trunk/à | |||
|
79 | Node-kind: dir | |||
|
80 | Node-action: add | |||
|
81 | Prop-content-length: 10 | |||
|
82 | Content-length: 10 | |||
|
83 | ||||
|
84 | PROPS-END | |||
|
85 | ||||
|
86 | ||||
|
87 | Node-path: trunk/à/é | |||
|
88 | Node-kind: file | |||
|
89 | Node-action: add | |||
|
90 | Prop-content-length: 10 | |||
|
91 | Text-content-length: 2 | |||
|
92 | Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b | |||
|
93 | Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff | |||
|
94 | Content-length: 12 | |||
|
95 | ||||
|
96 | PROPS-END | |||
|
97 | d | |||
|
98 | ||||
|
99 | ||||
|
100 | Node-path: trunk/é | |||
|
101 | Node-kind: file | |||
|
102 | Node-action: add | |||
|
103 | Prop-content-length: 10 | |||
|
104 | Text-content-length: 2 | |||
|
105 | Text-content-md5: 9ffbf43126e33be52cd2bf7e01d627f9 | |||
|
106 | Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff | |||
|
107 | Content-length: 12 | |||
|
108 | ||||
|
109 | PROPS-END | |||
|
110 | e | |||
|
111 | ||||
|
112 | ||||
|
113 | Revision-number: 3 | |||
|
114 | Prop-content-length: 112 | |||
|
115 | Content-length: 112 | |||
|
116 | ||||
|
117 | K 7 | |||
|
118 | svn:log | |||
|
119 | V 10 | |||
|
120 | copy files | |||
|
121 | K 10 | |||
|
122 | svn:author | |||
|
123 | V 7 | |||
|
124 | pmezard | |||
|
125 | K 8 | |||
|
126 | svn:date | |||
|
127 | V 27 | |||
|
128 | 2009-06-21T10:05:32.061964Z | |||
|
129 | PROPS-END | |||
|
130 | ||||
|
131 | Node-path: trunk/è | |||
|
132 | Node-kind: file | |||
|
133 | Node-action: add | |||
|
134 | Node-copyfrom-rev: 2 | |||
|
135 | Node-copyfrom-path: trunk/é | |||
|
136 | Text-copy-source-md5: 9ffbf43126e33be52cd2bf7e01d627f9 | |||
|
137 | Text-copy-source-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff | |||
|
138 | ||||
|
139 | ||||
|
140 | Node-path: trunk/ù | |||
|
141 | Node-kind: dir | |||
|
142 | Node-action: add | |||
|
143 | Node-copyfrom-rev: 2 | |||
|
144 | Node-copyfrom-path: trunk/à | |||
|
145 | ||||
|
146 | ||||
|
147 | Node-path: trunk/à | |||
|
148 | Node-action: delete | |||
|
149 | ||||
|
150 | ||||
|
151 | Node-path: trunk/é | |||
|
152 | Node-action: delete | |||
|
153 | ||||
|
154 | ||||
|
155 | Revision-number: 4 | |||
|
156 | Prop-content-length: 114 | |||
|
157 | Content-length: 114 | |||
|
158 | ||||
|
159 | K 7 | |||
|
160 | svn:log | |||
|
161 | V 12 | |||
|
162 | remove files | |||
|
163 | K 10 | |||
|
164 | svn:author | |||
|
165 | V 7 | |||
|
166 | pmezard | |||
|
167 | K 8 | |||
|
168 | svn:date | |||
|
169 | V 27 | |||
|
170 | 2009-06-21T10:05:33.096353Z | |||
|
171 | PROPS-END | |||
|
172 | ||||
|
173 | Node-path: trunk/è | |||
|
174 | Node-action: delete | |||
|
175 | ||||
|
176 | ||||
|
177 | Node-path: trunk/ù | |||
|
178 | Node-action: delete | |||
|
179 | ||||
|
180 |
@@ -0,0 +1,40 b'' | |||||
|
1 | # -*- coding: utf-8 -*- | |||
|
2 | #!/bin/sh | |||
|
3 | # | |||
|
4 | # Use this script to generate encoding.svndump | |||
|
5 | # | |||
|
6 | ||||
|
7 | mkdir temp | |||
|
8 | cd temp | |||
|
9 | ||||
|
10 | mkdir project-orig | |||
|
11 | cd project-orig | |||
|
12 | mkdir trunk | |||
|
13 | mkdir branches | |||
|
14 | mkdir tags | |||
|
15 | cd .. | |||
|
16 | ||||
|
17 | svnadmin create svn-repo | |||
|
18 | svnurl=file://`pwd`/svn-repo | |||
|
19 | svn import project-orig $svnurl -m "init projA" | |||
|
20 | ||||
|
21 | svn co $svnurl project | |||
|
22 | cd project | |||
|
23 | echo e > trunk/é | |||
|
24 | mkdir trunk/à | |||
|
25 | echo d > trunk/à/é | |||
|
26 | svn add trunk/é trunk/à | |||
|
27 | svn ci -m hello | |||
|
28 | ||||
|
29 | # Copy files and directories | |||
|
30 | svn mv trunk/é trunk/è | |||
|
31 | svn mv trunk/à trunk/ù | |||
|
32 | svn ci -m "copy files" | |||
|
33 | ||||
|
34 | # Remove files | |||
|
35 | svn rm trunk/è | |||
|
36 | svn rm trunk/ù | |||
|
37 | svn ci -m 'remove files' | |||
|
38 | cd .. | |||
|
39 | ||||
|
40 | svnadmin dump svn-repo > ../encoding.svndump |
@@ -0,0 +1,13 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | "$TESTDIR/hghave" svn svn-bindings || exit 80 | |||
|
4 | ||||
|
5 | echo "[extensions]" >> $HGRCPATH | |||
|
6 | echo "convert = " >> $HGRCPATH | |||
|
7 | ||||
|
8 | svnadmin create svn-repo | |||
|
9 | cat "$TESTDIR/svn/encoding.svndump" | svnadmin load svn-repo > /dev/null | |||
|
10 | ||||
|
11 | echo '% convert while testing all possible outputs' | |||
|
12 | hg --debug convert svn-repo A-hg > /dev/null | |||
|
13 |
@@ -0,0 +1,1 b'' | |||||
|
1 | % convert while testing all possible outputs |
@@ -744,8 +744,7 b' class svn_source(converter_source):' | |||||
744 | pmodule, prevnum = self.revsplit(parents[0])[1:] |
|
744 | pmodule, prevnum = self.revsplit(parents[0])[1:] | |
745 | if ent.copyfrom_rev < prevnum: |
|
745 | if ent.copyfrom_rev < prevnum: | |
746 | continue |
|
746 | continue | |
747 |
copyfrompath = ent.copyfrom_path |
|
747 | copyfrompath = self.getrelpath(ent.copyfrom_path, pmodule) | |
748 | copyfrompath = self.getrelpath(copyfrompath, pmodule) |
|
|||
749 | if not copyfrompath: |
|
748 | if not copyfrompath: | |
750 | continue |
|
749 | continue | |
751 | copyfrom[path] = ent |
|
750 | copyfrom[path] = ent | |
@@ -757,10 +756,9 b' class svn_source(converter_source):' | |||||
757 | entrypath = self.getrelpath("/" + child, pmodule) |
|
756 | entrypath = self.getrelpath("/" + child, pmodule) | |
758 | if not entrypath: |
|
757 | if not entrypath: | |
759 | continue |
|
758 | continue | |
760 |
|
|
759 | copytopath = path + entrypath[len(copyfrompath):] | |
761 | copytopath = path + entry[len(copyfrompath):] |
|
|||
762 | copytopath = self.getrelpath(copytopath) |
|
760 | copytopath = self.getrelpath(copytopath) | |
763 |
copies[self.recode(copytopath)] = self.recode(entry |
|
761 | copies[self.recode(copytopath)] = self.recode(entrypath) | |
764 |
|
762 | |||
765 | return (list(set(entries)), copies) |
|
763 | return (list(set(entries)), copies) | |
766 |
|
764 |
General Comments 0
You need to be logged in to leave comments.
Login now