From: Simon Hausmann <simon@lst.de>
Date: Fri, 8 Jun 2007 06:49:22 +0000 (+0200)
Subject: Only get the expensive branch mapping from the p4 server when not
X-Git-Tag: v1.5.3-rc0~65^2^2~20^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/df450923a2a08c50976f2d241a1c4992cf03b3a7?hp=--cc

Only get the expensive branch mapping from the p4 server when not
syncing with the help of an origin remote (which we instead then use
to get new branches from).

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

df450923a2a08c50976f2d241a1c4992cf03b3a7
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index efec0be32c..36fe69a795 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -907,10 +907,6 @@ class P4Sync(Command):
             return p [p.strip().rfind("/") + 1:]
 
     def getBranchMapping(self):
-
-        ## FIXME - what's a P4 projectName ?
-        self.projectName = self.guessProjectName()
-
         for info in p4CmdList("branches"):
             details = p4Cmd("branch -o %s" % info["branch"])
             viewIdx = 0
@@ -1141,7 +1137,11 @@ class P4Sync(Command):
             self.getLabels();
 
         if self.detectBranches:
-            self.getBranchMapping();
+            ## FIXME - what's a P4 projectName ?
+            self.projectName = self.guessProjectName()
+
+            if not self.hasOrigin:
+                self.getBranchMapping();
             if self.verbose:
                 print "p4-git branches: %s" % self.p4BranchesInGit
                 print "initial parents: %s" % self.initialParents