Show More
@@ -40,7 +40,7 b' def convertsink(ui, path):' | |||||
40 | raise util.Abort('%s: unknown repository type' % path) |
|
40 | raise util.Abort('%s: unknown repository type' % path) | |
41 |
|
41 | |||
42 | class converter(object): |
|
42 | class converter(object): | |
43 |
def __init__(self, ui, source, dest, revmapfile, |
|
43 | def __init__(self, ui, source, dest, revmapfile, opts): | |
44 |
|
44 | |||
45 | self.source = source |
|
45 | self.source = source | |
46 | self.dest = dest |
|
46 | self.dest = dest | |
@@ -51,7 +51,6 b' class converter(object):' | |||||
51 | self.revmapfilefd = None |
|
51 | self.revmapfilefd = None | |
52 | self.authors = {} |
|
52 | self.authors = {} | |
53 | self.authorfile = None |
|
53 | self.authorfile = None | |
54 | self.mapfile = filemapper |
|
|||
55 |
|
54 | |||
56 | self.maporder = [] |
|
55 | self.maporder = [] | |
57 | self.map = {} |
|
56 | self.map = {} | |
@@ -221,28 +220,21 b' class converter(object):' | |||||
221 | pbranch = None |
|
220 | pbranch = None | |
222 | self.dest.setbranch(commit.branch, pbranch, parents) |
|
221 | self.dest.setbranch(commit.branch, pbranch, parents) | |
223 | for f, v in files: |
|
222 | for f, v in files: | |
224 | newf = self.mapfile(f) |
|
223 | filenames.append(f) | |
225 | if not newf: |
|
|||
226 | continue |
|
|||
227 | filenames.append(newf) |
|
|||
228 | try: |
|
224 | try: | |
229 | data = self.source.getfile(f, v) |
|
225 | data = self.source.getfile(f, v) | |
230 | except IOError, inst: |
|
226 | except IOError, inst: | |
231 |
self.dest.delfile( |
|
227 | self.dest.delfile(f) | |
232 | else: |
|
228 | else: | |
233 | e = self.source.getmode(f, v) |
|
229 | e = self.source.getmode(f, v) | |
234 |
self.dest.putfile( |
|
230 | self.dest.putfile(f, e, data) | |
235 | if do_copies: |
|
231 | if do_copies: | |
236 | if f in copies: |
|
232 | if f in copies: | |
237 |
copyf = |
|
233 | copyf = copies[f] | |
238 |
|
|
234 | # Merely marks that a copy happened. | |
239 | # Merely marks that a copy happened. |
|
235 | self.dest.copyfile(copyf, f) | |
240 | self.dest.copyfile(copyf, newf) |
|
|||
241 |
|
236 | |||
242 | if not filenames and self.mapfile.active(): |
|
237 | newnode = self.dest.putcommit(filenames, parents, commit) | |
243 | newnode = parents[0] |
|
|||
244 | else: |
|
|||
245 | newnode = self.dest.putcommit(filenames, parents, commit) |
|
|||
246 | self.mapentry(rev, newnode) |
|
238 | self.mapentry(rev, newnode) | |
247 |
|
239 | |||
248 | def convert(self): |
|
240 | def convert(self): | |
@@ -478,9 +470,7 b' def convert(ui, src, dest=None, revmapfi' | |||||
478 | except: |
|
470 | except: | |
479 | revmapfile = os.path.join(destc, "map") |
|
471 | revmapfile = os.path.join(destc, "map") | |
480 |
|
472 | |||
481 |
|
473 | c = converter(ui, srcc, destc, revmapfile, opts) | ||
482 | c = converter(ui, srcc, destc, revmapfile, filemapper(ui, opts['filemap']), |
|
|||
483 | opts) |
|
|||
484 | c.convert() |
|
474 | c.convert() | |
485 |
|
475 | |||
486 |
|
476 |
General Comments 0
You need to be logged in to leave comments.
Login now