# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1240627577 25200
# Node ID 234128693c29767e9a8e7237bf1990dd27c089d9
# Parent  e19d2ce18eebbaac3094108fab470ba9b133a1e9
Format the commit user as Full Name <user@example.com>

diff -r e19d2ce18eeb -r 234128693c29 fastimport/hgimport.py
--- a/fastimport/hgimport.py	Fri Apr 24 08:35:40 2009 -0700
+++ b/fastimport/hgimport.py	Fri Apr 24 19:46:17 2009 -0700
@@ -126,10 +126,16 @@
         commit_handler.process()
         #print "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
         #self.ui.write(cmd.dump_str(verbose=True))
+
+        # in case we are converting from git or bzr, prefer author but
+        # fallback to committer (committer is required, author is
+        # optional)
+        userinfo = cmd.author or cmd.committer
+        user = "%s <%s>" % (userinfo[0], userinfo[1])
         node = self.repo.rawcommit(files = commit_handler.filelist(),
             text = cmd.message,
-            user = cmd.committer[1],
-            date = self.convert_date(cmd.committer))
+            user = user,
+            date = self.convert_date(userinfo))
         rev = self.repo.changelog.rev(node)
         if cmd.mark is not None:
             self.mark_map[":" + cmd.mark] = rev