Merge branch 'jc/merge-refuse-new-root'

diff --git a/git-p4.py b/git-p4.py
index 825b9f32d5540ab1f8d373fff2d3bf79caabee00..527d44bd202745d29680fe74833c29cc7fb122c1 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1160,6 +1160,15 @@ def getUserMapFromPerforceServer(self):
             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
             self.emails[output["Email"]] = output["User"]
 
+        mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
+        for mapUserConfig in gitConfigList("git-p4.mapUser"):
+            mapUser = mapUserConfigRegex.findall(mapUserConfig)
+            if mapUser and len(mapUser[0]) == 3:
+                user = mapUser[0][0]
+                fullname = mapUser[0][1]
+                email = mapUser[0][2]
+                self.users[user] = fullname + " <" + email + ">"
+                self.emails[email] = user
 
         s = ''
         for (key, val) in self.users.items():