--- a/hgext/convert/convcmd.py Wed Sep 08 08:31:07 2010 +0200
+++ b/hgext/convert/convcmd.py Fri Sep 10 01:34:14 2010 +0200
@@ -112,8 +112,8 @@
if authorfile and os.path.exists(authorfile):
self.readauthormap(authorfile)
# Extend/Override with new author map if necessary
- if opts.get('authors'):
- self.readauthormap(opts.get('authors'))
+ if opts.get('authormap'):
+ self.readauthormap(opts.get('authormap'))
self.authorfile = self.dest.authorfile()
self.splicemap = mapfile(ui, opts.get('splicemap'))
@@ -392,6 +392,10 @@
orig_encoding = encoding.encoding
encoding.encoding = 'UTF-8'
+ # support --authors as an alias for --authormap
+ if not opts.get('authormap'):
+ opts['authormap'] = opts.get('authors')
+
if not dest:
dest = hg.defaultdest(src) + "-hg"
ui.status(_("assuming destination %s\n") % dest)