undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Brand new smart incremental import that doesn't need tags or git repo-config :)

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-03-22 22:17:42 +01:00
parent 569d1bd409
commit 179caebff4
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,9 @@ def extractDepotPathAndChangeFromGitLog(log):
return values.get("depot-path"), values.get("change") return values.get("depot-path"), values.get("change")
def gitBranchExists(branch): def gitBranchExists(branch):
return os.system("git-rev-parse %s 2>/dev/null >/dev/null") == 0 if os.system("git-rev-parse %s 2>/dev/null >/dev/null" % branch) == 0:
return True
return False
class Command: class Command:
def __init__(self): def __init__(self):
@ -706,17 +708,40 @@ class GitSync(Command):
self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">" self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
def run(self, args): def run(self, args):
self.globalPrefix = ""
self.changeRange = ""
self.initialParent = ""
self.tagLastChange = True
if len(self.branch) == 0: if len(self.branch) == 0:
self.branch = "p4" self.branch = "p4"
if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"):
if not self.silent:
print "Creating %s branch in git repository based on origin" % self.branch
system("git branch %s origin" % self.branch)
[self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
p4Change = int(p4Change) + 1
self.globalPrefix = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change
self.initialParent = self.branch
self.tagLastChange = False
if not self.silent:
print "Performing incremental import into %s git branch" % self.branch
self.branch = "refs/heads/" + self.branch self.branch = "refs/heads/" + self.branch
self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
if len(self.globalPrefix) == 0:
self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
if len(self.globalPrefix) != 0: if len(self.globalPrefix) != 0:
self.globalPrefix = self.globalPrefix[:-1] self.globalPrefix = self.globalPrefix[:-1]
if len(args) == 0 and len(self.globalPrefix) != 0: if len(args) == 0 and len(self.globalPrefix) != 0:
if not self.silent: if not self.silent:
print "[using previously specified depot path %s]" % self.globalPrefix print "Depot path: %s" % self.globalPrefix
elif len(args) != 1: elif len(args) != 1:
return False return False
else: else:
@ -725,10 +750,8 @@ class GitSync(Command):
sys.exit(1) sys.exit(1)
self.globalPrefix = args[0] self.globalPrefix = args[0]
self.changeRange = ""
self.revision = "" self.revision = ""
self.users = {} self.users = {}
self.initialParent = ""
self.lastChange = 0 self.lastChange = 0
self.initialTag = "" self.initialTag = ""
@ -890,8 +913,9 @@ class GitSync(Command):
if not self.silent: if not self.silent:
print "" print ""
self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange) if self.tagLastChange:
self.gitStream.write("from %s\n\n" % self.branch); self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange)
self.gitStream.write("from %s\n\n" % self.branch);
self.gitStream.close() self.gitStream.close()

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

@ -38,11 +38,9 @@ Incremental Imports
After an initial import you can easily synchronize your git repository with After an initial import you can easily synchronize your git repository with
newer changes from the Perforce depot by just calling newer changes from the Perforce depot by just calling
git-p4.p4 sync git-p4 sync
in your git repository. git-p4 stores the depot path of the original import in in your git repository.
the .git/config file and remembers the last imported p4 revision as a git tag
called p4/<changenum> .
It is recommended to run 'git repack -a -d -f' from time to time when using It is recommended to run 'git repack -a -d -f' from time to time when using
incremental imports to optimally combine the individual git packs that each incremental imports to optimally combine the individual git packs that each