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>
Simon Hausmann committed
Aug 26, 2007 at 16:44 UTC
8134f69c21ff47283d8b3ea3cc5b306727cde256
1 file changed
+11
-17
contrib/fast-import/git-p4
+11
-17
@@ -1118,6 +1118,15 @@ class P4Sync(Command):
1118
self.keepRepoPath = (d.has_key('options')
1119
and ('keepRepoPath' in d['options']))
1120
1121
+ def gitRefForBranch(self, branch):
1122
+ if branch == "main":
1123
+ return self.refPrefix + "master"
1124
+
1125
+ if len(branch) <= 0:
1126
+ return branch
1127
+
1128
+ return self.refPrefix + self.projectName + branch
1129
+
1130
def importChanges(self, changes):
1131
cnt = 1
1132
for change in changes:
@@ -1153,23 +1162,8 @@ class P4Sync(Command):
1162
elif self.verbose:
1163
print "parent determined through known branches: %s" % parent
1164
1156
- # main branch? use master
1157
- if branch == "main":
1158
- branch = "master"
1159
- else:
1160
-
1161
- ## FIXME
1162
- branch = self.projectName + branch
1163
-
1164
- if parent == "main":
1165
- parent = "master"
1166
- elif len(parent) > 0:
1167
- ## FIXME
1168
- parent = self.projectName + parent
1169
-
1170
- branch = self.refPrefix + branch
1171
- if len(parent) > 0:
1172
- parent = self.refPrefix + parent
1165
+ branch = self.gitRefForBranch(branch)
1166
+ parent = self.gitRefForBranch(parent)
1167
1168
if self.verbose:
1169
print "looking for initial parent for %s; current parent is %s" % (branch, parent)