Mercurial > hg
diff hgext/convert/convcmd.py @ 6143:5b159ebb19cf
convert: document splicemap, allow setting of multiple parents
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 19 Feb 2008 10:53:40 -0800 |
parents | fddeeb00f8d1 |
children | 9d13e7129423 |
line wrap: on
line diff
--- a/hgext/convert/convcmd.py Mon Feb 18 19:21:33 2008 +0100 +++ b/hgext/convert/convcmd.py Tue Feb 19 10:53:40 2008 -0800 @@ -84,7 +84,7 @@ self.readauthormap(opts.get('authors')) self.authorfile = self.dest.authorfile() - self.splicemap = mapfile(ui, ui.config('convert', 'splicemap')) + self.splicemap = mapfile(ui, opts.get('splicemap')) def walktree(self, heads): '''Return a mapping that identifies the uncommitted parents of every @@ -252,9 +252,10 @@ self.dest.copyfile(copyf, f) try: - parents = [self.splicemap[rev]] - self.ui.debug('spliced in %s as parents of %s\n' % - (parents, rev)) + parents = self.splicemap[rev].replace(',', ' ').split() + self.ui.status('spliced in %s as parents of %s\n' % + (parents, rev)) + parents = [self.map.get(p, p) for p in parents] except KeyError: parents = [b[0] for b in pbranches] newnode = self.dest.putcommit(filenames, parents, commit)