Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2025-11-14 14:45:40 +01:00
Code Issues Packages Projects Releases Activity

Improved output for multi branch imports and noted another little todo item

Browse Source
This commit is contained in:
Simon Hausmann
2007-05-21 00:39:16 +02:00
parent 886f8af18a
commit 10f949db6f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
git-p4
View File

@@ -16,6 +16,8 @@
# it's possible to recover if anything goes wrong instead of potentially # it's possible to recover if anything goes wrong instead of potentially
# loosing a change entirely because it was never comitted to git and # loosing a change entirely because it was never comitted to git and
# the p4 submit failed (or resulted in lots of conflicts, etc.) # the p4 submit failed (or resulted in lots of conflicts, etc.)
# * Consider making --with-origin the default, assuming that the git
# protocol is always more efficient. (needs manual testing first :)
# #
import optparse, sys, os, marshal, popen2, subprocess, shelve import optparse, sys, os, marshal, popen2, subprocess, shelve
@@ -729,7 +731,7 @@ class P4Sync(Command):
self.initialParents = {} self.initialParents = {}
self.listExistingP4GitBranches() self.listExistingP4GitBranches()
if len(self.p4BranchesInGit) > 1: if len(self.p4BranchesInGit) > 1 and not self.silent:
print "Importing from/into multiple branches" print "Importing from/into multiple branches"
self.detectBranches = True self.detectBranches = True
@@ -795,7 +797,7 @@ class P4Sync(Command):
self.depotPath = self.previousDepotPath self.depotPath = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change self.changeRange = "@%s,#head" % p4Change
self.initialParent = parseRevision(self.branch) self.initialParent = parseRevision(self.branch)
if not self.silent: if not self.silent and not self.detectBranches:
print "Performing incremental import into %s git branch" % self.branch print "Performing incremental import into %s git branch" % self.branch
if not self.branch.startswith("refs/"): if not self.branch.startswith("refs/"):
@@ -920,15 +922,17 @@ class P4Sync(Command):
if len(changes) == 0: if len(changes) == 0:
if not self.silent: if not self.silent:
print "no changes to import!" print "No changes to import!"
return True return True
self.updatedBranches = set()
cnt = 1 cnt = 1
for change in changes: for change in changes:
description = p4Cmd("describe %s" % change) description = p4Cmd("describe %s" % change)
if not self.silent: if not self.silent:
sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes))) sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
sys.stdout.flush() sys.stdout.flush()
cnt = cnt + 1 cnt = cnt + 1
@@ -945,6 +949,8 @@ class P4Sync(Command):
if self.verbose: if self.verbose:
print "branch is %s" % branch print "branch is %s" % branch
self.updatedBranches.add(branch)
if branch not in self.createdBranches: if branch not in self.createdBranches:
self.createdBranches.add(branch) self.createdBranches.add(branch)
parent = self.knownBranches[branch] parent = self.knownBranches[branch]
@@ -986,6 +992,11 @@ class P4Sync(Command):
if not self.silent: if not self.silent:
print "" print ""
if len(self.updatedBranches) > 0:
sys.stdout.write("Updated branches: ")
for b in self.updatedBranches:
sys.stdout.write("%s " % b)
sys.stdout.write("\n")
self.gitStream.close() self.gitStream.close()