Give branches a nice project prefix and don't bail out on clone if we failed

to detect the master branch.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e993d3f6933f701f54ff610b4ba19fdfe09fbc2e..7d4273963725464776256b1ecda8fab97a25a5bc 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -729,6 +729,7 @@ class P4Sync(Command):
 
         if self.detectBranches:
             self.getBranchMapping();
 
         if self.detectBranches:
             self.getBranchMapping();

+            self.branchPrefix = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]

 
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 
 
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 


@@ -815,12 +816,23 @@ class P4Sync(Command):
 
                             filesForCommit = self.extractFilesInCommitToBranch(files, branch)
 
 
                             filesForCommit = self.extractFilesInCommitToBranch(files, branch)
 

-                            if branch not in self.createdBranches :
+                            if branch not in self.createdBranches:

                                 self.createdBranches.add(branch)
                                 parent = self.knownBranches[branch]
                                 if parent == branch:
                                     parent = ""
 
                                 self.createdBranches.add(branch)
                                 parent = self.knownBranches[branch]
                                 if parent == branch:
                                     parent = ""
 

+                            # main branch? use master
+                            if branch == "main":
+                                branch = "master"
+                            else:
+                                branch = self.branchPrefix + branch
+
+                            if parent == "main":
+                                parent = "master"
+                            elif len(parent) > 0:
+                                parent = self.branchPrefix + parent
+

                             branch = "refs/remotes/p4/" + branch
                             if len(parent) > 0:
                                 parent = "refs/remotes/p4/" + parent
                             branch = "refs/remotes/p4/" + branch
                             if len(parent) > 0:
                                 parent = "refs/remotes/p4/" + parent


@@ -906,8 +918,11 @@ class P4Clone(P4Sync):
         if not P4Sync.run(self, [depotPath]):
             return False
         if self.branch != "master":
         if not P4Sync.run(self, [depotPath]):
             return False
         if self.branch != "master":

-            system("git branch master p4")
-            system("git checkout -f")
+            if gitBranchExists("refs/remotes/p4/master"):
+                system("git branch master refs/remotes/p4/master")
+                system("git checkout -f")
+            else:
+                print "Could not detect main branch. No checkout/master branch created."

         return True
 
 class HelpFormatter(optparse.IndentedHelpFormatter):
         return True
 
 class HelpFormatter(optparse.IndentedHelpFormatter):