Bazaar Fast Import

Merge lp:~vmiklos/bzr-fastimport/darcs into lp:~bzr/bzr-fastimport/fastimport.dev

  1. darcs
  2. Merge into fastimport.dev
Proposed by Miklos Vajna
Status: Merged
Approved by: Ian Clatworthy
Approved revision: no longer in the revision history of the source branch.
Merged at revision: not available
Proposed branch: lp:~vmiklos/bzr-fastimport/darcs
Merge into: lp:~bzr/bzr-fastimport/fastimport.dev
Diff against target: None lines
To merge this branch: bzr merge lp:~vmiklos/bzr-fastimport/darcs
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Review via email: mp+9955@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Miklos Vajna (vmiklos) wrote :

This branch has 5 new commits:

      darcs-fast-export: bash4 fixes
      darcs-fast-export: use --include-merges option to bzr-log in x2d
      darcs-fast-export: document the --authors-file option
      darcs-fast-export: document operands to options which have one
      darcs-fast-export: give a more reasonable error message when chardet is not found

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Thanks.

review: Approve
lp:~vmiklos/bzr-fastimport/darcs updated
199. By Ian Clatworthy

merge darcs-fast-export fixes and better doc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'exporters/darcs/darcs-fast-export'
2--- exporters/darcs/darcs-fast-export 2009-06-26 02:10:04 +0000
3+++ exporters/darcs/darcs-fast-export 2009-08-10 22:21:04 +0000
4@@ -211,7 +211,12 @@
5 try:
6 xmldoc = xml.dom.minidom.parseString(buf)
7 except xml.parsers.expat.ExpatError:
8- import chardet
9+ try:
10+ import chardet
11+ except ImportError:
12+ sys.exit("Error, encoding is not utf-8. Please " +
13+ "either specify it with the --encoding " +
14+ "option or install chardet.")
15 progress("encoding is not utf8, guessing charset")
16 encoding = chardet.detect(buf)['encoding']
17 progress("detected encoding is %s" % encoding)
18
19=== modified file 'exporters/darcs/darcs-fast-export.txt'
20--- exporters/darcs/darcs-fast-export.txt 2008-11-28 14:43:30 +0000
21+++ exporters/darcs/darcs-fast-export.txt 2009-08-10 22:20:43 +0000
22@@ -23,18 +23,18 @@
23 -h, --help::
24 Display usage.
25
26---import-marks::
27- Import marks from a given file. This is read at the beginning of the
28+--import-marks=<file>::
29+ Import marks from <file>. This is read at the beginning of the
30 conversion at once. Use it if you want to continue an incremental
31 conversion.
32
33---export-marks::
34- Export marks to a given file at the end of the conversion. It can be the
35+--export-marks=<file>::
36+ Export marks to <file> at the end of the conversion. It can be the
37 same as the one for --import-marks as it is written only once at the
38 end. Use it if you want to be able to incrementally update the target
39 repository later.
40
41---encoding::
42+--encoding=<encoding>::
43 The encoding of the author names and commit messages in the repository.
44 The default is utf-8. If it is not the default, it will be guessed.
45 Given that it takes some time, you can explicitly specify it as an
46@@ -42,20 +42,23 @@
47 as utf-8 and will be written that way to the target repository, unless
48 the importer re-encodes it again to some other character set.
49
50---working::
51+--working=<directory>::
52 The conversion is done by applying the patches one by one and recording
53 the state of the working directory. You can specify the path of this
54 directory using this option.
55
56---logfile::
57+--logfile=<logfile>::
58 The output of external commands are redirected to a log file. You can
59 specify the path of that file with this parameter.
60
61---git-branch::
62+--git-branch=<branch>::
63 There is only one branch in one darcs repository, but the fast-import
64 stream format allows multiple branches, thus the exporter has to name
65 darcs's branch. The default value is 'refs/heads/master'.
66
67---progress::
68+--progress=<n>::
69 Insert progress statements after every <n> patches, to be shown by the
70- fast importer during import.
71+ fast importer during import. The default value is '100'.
72+
73+--authors-file=<file>::
74+ Read author transformations in old=new format from <file>.
75
76=== modified file 'exporters/darcs/t/test-bzr.sh'
77--- exporters/darcs/t/test-bzr.sh 2008-11-15 22:35:31 +0000
78+++ exporters/darcs/t/test-bzr.sh 2009-08-10 22:19:29 +0000
79@@ -1,4 +1,4 @@
80-. lib.sh
81+. ./lib.sh
82
83 create_darcs test --old-fashioned-inventory
84
85
86=== modified file 'exporters/darcs/t/test-git-d2x.sh'
87--- exporters/darcs/t/test-git-d2x.sh 2008-11-16 00:57:20 +0000
88+++ exporters/darcs/t/test-git-d2x.sh 2009-08-10 22:19:29 +0000
89@@ -1,4 +1,4 @@
90-. lib.sh
91+. ./lib.sh
92
93 create_darcs test --old-fashioned-inventory
94
95
96=== modified file 'exporters/darcs/t/test-git-incremental.sh'
97--- exporters/darcs/t/test-git-incremental.sh 2008-11-15 22:35:31 +0000
98+++ exporters/darcs/t/test-git-incremental.sh 2009-08-10 22:19:29 +0000
99@@ -1,4 +1,4 @@
100-. lib.sh
101+. ./lib.sh
102
103 create_darcs test --old-fashioned-inventory
104
105
106=== modified file 'exporters/darcs/t/test-git-progress.sh'
107--- exporters/darcs/t/test-git-progress.sh 2008-11-28 14:43:30 +0000
108+++ exporters/darcs/t/test-git-progress.sh 2009-08-10 22:19:29 +0000
109@@ -1,4 +1,4 @@
110-. lib.sh
111+. ./lib.sh
112
113 create_darcs test --old-fashioned-inventory
114
115
116=== modified file 'exporters/darcs/t/test-git.sh'
117--- exporters/darcs/t/test-git.sh 2008-11-15 22:35:31 +0000
118+++ exporters/darcs/t/test-git.sh 2009-08-10 22:19:29 +0000
119@@ -1,4 +1,4 @@
120-. lib.sh
121+. ./lib.sh
122
123 create_darcs test --old-fashioned-inventory
124
125
126=== modified file 'exporters/darcs/t/test-hg-d2x.sh'
127--- exporters/darcs/t/test-hg-d2x.sh 2008-11-15 22:47:45 +0000
128+++ exporters/darcs/t/test-hg-d2x.sh 2009-08-10 22:19:29 +0000
129@@ -1,4 +1,4 @@
130-. lib.sh
131+. ./lib.sh
132
133 create_darcs test --old-fashioned-inventory
134
135
136=== modified file 'exporters/darcs/t/test-hg.sh'
137--- exporters/darcs/t/test-hg.sh 2008-11-15 22:35:31 +0000
138+++ exporters/darcs/t/test-hg.sh 2009-08-10 22:19:29 +0000
139@@ -1,4 +1,4 @@
140-. lib.sh
141+. ./lib.sh
142
143 create_darcs test --old-fashioned-inventory
144
145
146=== modified file 'exporters/darcs/t/test2-bzr-d2x.sh'
147--- exporters/darcs/t/test2-bzr-d2x.sh 2008-11-16 00:57:20 +0000
148+++ exporters/darcs/t/test2-bzr-d2x.sh 2009-08-10 22:19:29 +0000
149@@ -1,4 +1,4 @@
150-. lib.sh
151+. ./lib.sh
152
153 create_darcs test2 --darcs-2
154
155
156=== modified file 'exporters/darcs/t/test2-bzr-incremental.sh'
157--- exporters/darcs/t/test2-bzr-incremental.sh 2008-11-15 22:35:31 +0000
158+++ exporters/darcs/t/test2-bzr-incremental.sh 2009-08-10 22:19:29 +0000
159@@ -1,4 +1,4 @@
160-. lib.sh
161+. ./lib.sh
162
163 create_darcs test2 --darcs-2
164
165
166=== modified file 'exporters/darcs/t/test2-git-funny-tagname.sh'
167--- exporters/darcs/t/test2-git-funny-tagname.sh 2009-01-24 19:09:46 +0000
168+++ exporters/darcs/t/test2-git-funny-tagname.sh 2009-08-10 22:19:29 +0000
169@@ -1,4 +1,4 @@
170-. lib.sh
171+. ./lib.sh
172
173 create_darcs test2 --darcs-2
174 cd test2
175
176=== modified file 'exporters/darcs/t/test2-git-incremental-specworkdir.sh'
177--- exporters/darcs/t/test2-git-incremental-specworkdir.sh 2008-11-15 22:35:31 +0000
178+++ exporters/darcs/t/test2-git-incremental-specworkdir.sh 2009-08-10 22:19:29 +0000
179@@ -1,4 +1,4 @@
180-. lib.sh
181+. ./lib.sh
182
183 create_darcs test2 --darcs-2
184
185
186=== modified file 'exporters/darcs/t/test2-git-incremental.sh'
187--- exporters/darcs/t/test2-git-incremental.sh 2008-11-15 22:35:31 +0000
188+++ exporters/darcs/t/test2-git-incremental.sh 2009-08-10 22:19:29 +0000
189@@ -1,4 +1,4 @@
190-. lib.sh
191+. ./lib.sh
192
193 create_darcs test2 --darcs-2
194
195
196=== modified file 'exporters/darcs/t/test2-git.sh'
197--- exporters/darcs/t/test2-git.sh 2008-11-15 22:35:31 +0000
198+++ exporters/darcs/t/test2-git.sh 2009-08-10 22:19:29 +0000
199@@ -1,4 +1,4 @@
200-. lib.sh
201+. ./lib.sh
202
203 create_darcs test2 --darcs-2
204
205
206=== modified file 'exporters/darcs/t/testimport-bzr-x2d.sh'
207--- exporters/darcs/t/testimport-bzr-x2d.sh 2008-11-23 02:50:58 +0000
208+++ exporters/darcs/t/testimport-bzr-x2d.sh 2009-08-10 22:19:29 +0000
209@@ -1,4 +1,4 @@
210-. lib.sh
211+. ./lib.sh
212
213 create_bzr test
214
215
216=== modified file 'exporters/darcs/t/testimport-bzr.sh'
217--- exporters/darcs/t/testimport-bzr.sh 2009-06-25 22:21:33 +0000
218+++ exporters/darcs/t/testimport-bzr.sh 2009-08-10 22:19:29 +0000
219@@ -1,4 +1,4 @@
220-. lib.sh
221+. ./lib.sh
222
223 create_bzr test
224
225
226=== modified file 'exporters/darcs/t/testimport-copy.sh'
227--- exporters/darcs/t/testimport-copy.sh 2008-11-22 19:37:26 +0000
228+++ exporters/darcs/t/testimport-copy.sh 2009-08-10 22:19:29 +0000
229@@ -1,4 +1,4 @@
230-. lib.sh
231+. ./lib.sh
232
233 rm -rf test
234 mkdir test
235
236=== modified file 'exporters/darcs/t/testimport-darcs.sh'
237--- exporters/darcs/t/testimport-darcs.sh 2008-11-22 17:44:00 +0000
238+++ exporters/darcs/t/testimport-darcs.sh 2009-08-10 22:19:29 +0000
239@@ -1,4 +1,4 @@
240-. lib.sh
241+. ./lib.sh
242
243 create_darcs test2 --darcs-2
244
245
246=== modified file 'exporters/darcs/t/testimport-deleteall.sh'
247--- exporters/darcs/t/testimport-deleteall.sh 2008-11-22 19:19:32 +0000
248+++ exporters/darcs/t/testimport-deleteall.sh 2009-08-10 22:19:29 +0000
249@@ -1,4 +1,4 @@
250-. lib.sh
251+. ./lib.sh
252
253 rm -rf test
254 mkdir test
255
256=== modified file 'exporters/darcs/t/testimport-git-incremental.sh'
257--- exporters/darcs/t/testimport-git-incremental.sh 2008-11-22 22:20:00 +0000
258+++ exporters/darcs/t/testimport-git-incremental.sh 2009-08-10 22:19:29 +0000
259@@ -1,4 +1,4 @@
260-. lib.sh
261+. ./lib.sh
262
263 create_git test
264
265
266=== modified file 'exporters/darcs/t/testimport-git-twoway-gd.sh'
267--- exporters/darcs/t/testimport-git-twoway-gd.sh 2008-11-23 21:00:12 +0000
268+++ exporters/darcs/t/testimport-git-twoway-gd.sh 2009-08-10 22:19:29 +0000
269@@ -1,4 +1,4 @@
270-. lib.sh
271+. ./lib.sh
272
273 create_darcs test
274
275
276=== modified file 'exporters/darcs/t/testimport-git-twoway.sh'
277--- exporters/darcs/t/testimport-git-twoway.sh 2008-11-27 01:45:46 +0000
278+++ exporters/darcs/t/testimport-git-twoway.sh 2009-08-10 22:19:29 +0000
279@@ -1,4 +1,4 @@
280-. lib.sh
281+. ./lib.sh
282
283 create_git test
284
285
286=== modified file 'exporters/darcs/t/testimport-git-x2d.sh'
287--- exporters/darcs/t/testimport-git-x2d.sh 2008-11-23 02:42:25 +0000
288+++ exporters/darcs/t/testimport-git-x2d.sh 2009-08-10 22:19:29 +0000
289@@ -1,4 +1,4 @@
290-. lib.sh
291+. ./lib.sh
292
293 create_git test
294
295
296=== modified file 'exporters/darcs/t/testimport-git.sh'
297--- exporters/darcs/t/testimport-git.sh 2008-11-22 01:36:29 +0000
298+++ exporters/darcs/t/testimport-git.sh 2009-08-10 22:19:29 +0000
299@@ -1,4 +1,4 @@
300-. lib.sh
301+. ./lib.sh
302
303 create_git test
304
305
306=== modified file 'exporters/darcs/t/testimport-hg-x2d.sh'
307--- exporters/darcs/t/testimport-hg-x2d.sh 2008-11-23 02:53:21 +0000
308+++ exporters/darcs/t/testimport-hg-x2d.sh 2009-08-10 22:19:29 +0000
309@@ -1,4 +1,4 @@
310-. lib.sh
311+. ./lib.sh
312
313 create_hg test
314
315
316=== modified file 'exporters/darcs/t/testimport-hg.sh'
317--- exporters/darcs/t/testimport-hg.sh 2008-11-23 02:02:24 +0000
318+++ exporters/darcs/t/testimport-hg.sh 2009-08-10 22:19:29 +0000
319@@ -1,4 +1,4 @@
320-. lib.sh
321+. ./lib.sh
322
323 create_hg test
324
325
326=== modified file 'exporters/darcs/t/testimport-rename.sh'
327--- exporters/darcs/t/testimport-rename.sh 2008-11-22 19:30:35 +0000
328+++ exporters/darcs/t/testimport-rename.sh 2009-08-10 22:19:29 +0000
329@@ -1,4 +1,4 @@
330-. lib.sh
331+. ./lib.sh
332
333 rm -rf test
334 mkdir test
335
336=== modified file 'exporters/darcs/x2d'
337--- exporters/darcs/x2d 2009-06-25 22:21:33 +0000
338+++ exporters/darcs/x2d 2009-08-10 22:19:52 +0000
339@@ -107,7 +107,7 @@
340 # bzr revno is not good here, because at merges
341 # it produces less revision than the number we
342 # have in darcs
343- check_up_to_date "bzr log|grep -c revno:"
344+ check_up_to_date "bzr log --include-merges |grep -c revno:"
345 (cd $origin; bzr fast-export \
346 --export-marks=$fmark --import-marks=$fmark . ) | \
347 darcs-fast-import --export-marks=$dmark --import-marks=$dmark $common_opts

Subscribers

People subscribed via source and target branches

to all changes: