git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 2c67190ffc49c46199a137071584526e6a4602ed..406bec1a290ff4b83bc349afaa75201cdf6fffc0 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1118,6 +1118,15 @@ class P4Sync(Command):
         self.keepRepoPath = (d.has_key('options')
                              and ('keepRepoPath' in d['options']))
 
         self.keepRepoPath = (d.has_key('options')
                              and ('keepRepoPath' in d['options']))
 

+    def gitRefForBranch(self, branch):
+        if branch == "main":
+            return self.refPrefix + "master"
+
+        if len(branch) <= 0:
+            return branch
+
+        return self.refPrefix + self.projectName + branch
+

     def importChanges(self, changes):
         cnt = 1
         for change in changes:
     def importChanges(self, changes):
         cnt = 1
         for change in changes:


@@ -1153,23 +1162,8 @@ class P4Sync(Command):
                             elif self.verbose:
                                 print "parent determined through known branches: %s" % parent
 
                             elif self.verbose:
                                 print "parent determined through known branches: %s" % parent
 

-                        # main branch? use master
-                        if branch == "main":
-                            branch = "master"
-                        else:
-
-                            ## FIXME
-                            branch = self.projectName + branch
-
-                        if parent == "main":
-                            parent = "master"
-                        elif len(parent) > 0:
-                            ## FIXME
-                            parent = self.projectName + parent
-
-                        branch = self.refPrefix + branch
-                        if len(parent) > 0:
-                            parent = self.refPrefix + parent
+                        branch = self.gitRefForBranch(branch)
+                        parent = self.gitRefForBranch(parent)

 
                         if self.verbose:
                             print "looking for initial parent for %s; current parent is %s" % (branch, parent)
 
                         if self.verbose:
                             print "looking for initial parent for %s; current parent is %s" % (branch, parent)