mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}

Browse Source 
instead of refs/heads/p4.

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-05-17 20:57:05 +02:00
parent 8ead4fda3f
commit c6d44cb1a1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/fast-import/git-p4
View File

@ -828,9 +828,15 @@ class P4Sync(Command):
self.changeRange = "" self.changeRange = ""
self.initialParent = "" self.initialParent = ""
self.previousDepotPath = "" self.previousDepotPath = ""
# importing into default remotes/p4/* layout?
defaultImport = False
if len(self.branch) == 0: if len(self.branch) == 0:
self.branch = "p4" if gitBranchExists("refs/heads/p4"):
self.branch = "p4"
else:
self.branch = "refs/remotes/p4/master"
defaultImport = True
if len(args) == 0: if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"): if not gitBranchExists(self.branch) and gitBranchExists("origin"):
@ -840,6 +846,8 @@ class P4Sync(Command):
if not branch.startswith("refs"): if not branch.startswith("refs"):
branch = "refs/heads/" + branch branch = "refs/heads/" + branch
system("git update-ref %s origin" % branch) system("git update-ref %s origin" % branch)
if defaultImport:
system("git symbolic-ref refs/remotes/p4/HEAD %s" % branch)
[self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch)) [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
if len(self.previousDepotPath) > 0 and len(p4Change) > 0: if len(self.previousDepotPath) > 0 and len(p4Change) > 0:

6
contrib/fast-import/git-p4.txt
View File

@ -20,9 +20,9 @@ or
This will create an empty git repository in a subdirectory called "project" (or This will create an empty git repository in a subdirectory called "project" (or
"myproject" with the second command), import the head revision from the "myproject" with the second command), import the head revision from the
specified perforce path into a git "p4" branch, create a master branch off it specified perforce path into a git "p4" branch (remotes/p4 actually), create a
and check it out. If you want the entire history (not just the head revision) then master branch off it and check it out. If you want the entire history (not just
you can simply append a "@all" to the depot path: the head revision) then you can simply append a "@all" to the depot path:
git-p4 clone //depot/project/main@all myproject git-p4 clone //depot/project/main@all myproject