index e653e8cd37aa0336fb97ce4f11265f2e23b8f914..2f3615bd7274f22c1132ec96670ba23f519f2d27 100755 (executable)
# 2007 Trolltech ASA
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-# TODO: Add an option to sync/rebase to fetch and rebase from origin first.
-#
import optparse, sys, os, marshal, popen2, subprocess, shelve
import tempfile, getopt, sha, os.path, time, platform
self.changeRange = ""
self.initialParent = ""
self.previousDepotPath = ""
- # importing into default remotes/p4/* layout?
- defaultImport = False
if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master"):
print "Syncing with origin first as requested by calling git fetch origin"
self.branch = "refs/remotes/p4/master"
if gitBranchExists("refs/heads/p4"):
system("git update-ref %s refs/heads/p4" % self.branch)
- system("git symbolic-ref refs/remotes/p4/HEAD refs/remotes/p4/master")
system("git branch -D p4");
- else:
- defaultImport = True
+ if not gitBranchExists("refs/remotes/p4/HEAD"):
+ system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"):
if not branch.startswith("refs"):
branch = "refs/heads/" + 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))
if len(self.previousDepotPath) > 0 and len(p4Change) > 0: