Load the user map from p4 only once at run-time.

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d8b7080b4bdb403ae48489bbaeeb0d3a03abab57..9e9d623a3c1d34c93f2e3a383762b248188869b6 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -697,6 +697,8 @@ class P4Sync(Command):
                     print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
 
     def getUserMapFromPerforceServer(self):
                     print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
 
     def getUserMapFromPerforceServer(self):

+        if self.userMapFromPerforceServer:
+            return

         self.users = {}
 
         for output in p4CmdList("users"):
         self.users = {}
 
         for output in p4CmdList("users"):


@@ -708,9 +710,11 @@ class P4Sync(Command):
         for user in self.users.keys():
             cache.write("%s\t%s\n" % (user, self.users[user]))
         cache.close();
         for user in self.users.keys():
             cache.write("%s\t%s\n" % (user, self.users[user]))
         cache.close();

+        self.userMapFromPerforceServer = True

 
     def loadUserMapFromCache(self):
         self.users = {}
 
     def loadUserMapFromCache(self):
         self.users = {}

+        self.userMapFromPerforceServer = False

         try:
             cache = open(gitdir + "/p4-usercache.txt", "rb")
             lines = cache.readlines()
         try:
             cache = open(gitdir + "/p4-usercache.txt", "rb")
             lines = cache.readlines()