from sets import Set;
gitdir = os.environ.get("GIT_DIR", "")
+silent = False
-def mypopen(command):
- return os.popen(command, "rb");
+def write_pipe (c, str):
+ if not silent:
+ sys.stderr.write ('writing pipe: %s\n' % c)
+
+ ## todo: check return status
+ pipe = os.popen (c, 'w')
+ val = pipe.write(str)
+ if pipe.close ():
+ sys.stderr.write ('Command failed')
+ sys.exit (1)
+
+ return val
+
+def read_pipe (c):
+ sys.stderr.write ('reading pipe: %s\n' % c)
+ ## todo: check return status
+ pipe = os.popen (c, 'rb')
+ val = pipe.read()
+ if pipe.close ():
+ sys.stderr.write ('Command failed')
+ sys.exit (1)
+
+ return val
+
+
+def read_pipe_lines (c):
+ sys.stderr.write ('reading pipe: %s\n' % c)
+ ## todo: check return status
+ pipe = os.popen (c, 'rb')
+ val = pipe.readlines()
+ if pipe.close ():
+ sys.stderr.write ('Command failed')
+ sys.exit (1)
+
+ return val
def p4CmdList(cmd):
cmd = "p4 -G %s" % cmd
sys.exit(1)
def currentGitBranch():
- return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
+ return read_pipe("git name-rev HEAD").split(" ")[1][:-1]
def isValidGitDir(path):
if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
return False
def parseRevision(ref):
- return mypopen("git rev-parse %s" % ref).read()[:-1]
+ return read_pipe("git rev-parse %s" % ref)[:-1]
def system(cmd):
if os.system(cmd) != 0:
def extractLogMessageFromGitCommit(commit):
logMessage = ""
+
+ ## fixme: title is first line of commit, not 1st paragraph.
foundTitle = False
- for log in mypopen("git cat-file commit %s" % commit).readlines():
+ for log in read_pipe_lines("git cat-file commit %s" % commit):
if not foundTitle:
if len(log) == 1:
foundTitle = True
if self.rollbackLocalBranches:
refPrefix = "refs/heads/"
- lines = mypopen("git rev-parse --symbolic --branches").readlines()
+ lines = read_pipe_lines("git rev-parse --symbolic --branches")
else:
refPrefix = "refs/remotes/"
- lines = mypopen("git rev-parse --symbolic --remotes").readlines()
+ lines = read_pipe_lines("git rev-parse --symbolic --remotes")
for line in lines:
if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
if self.directSubmit:
commits.append("0")
else:
- for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
+ for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
commits.append(line[:-1])
commits.reverse()
print "Applying local change in working directory/index"
diff = self.diffStatus
else:
- print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read())
- diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
+ print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
+ diff = read_pipe_lines("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id))
filesToAdd = set()
filesToDelete = set()
editedFiles = set()
logMessage = logMessage.replace("\n", "\n\t")
logMessage = logMessage[:-1]
- template = mypopen("p4 change -o").read()
+ template = read_pipe("p4 change -o")
if self.interactive:
submitTemplate = self.prepareLogMessage(template, logMessage)
- diff = mypopen("p4 diff -du ...").read()
+ diff = read_pipe("p4 diff -du ...")
for newFile in filesToAdd:
diff += "==== new file ====\n"
if self.directSubmit:
print "Submitting to git first"
os.chdir(self.oldWorkingDirectory)
- pipe = os.popen("git commit -a -F -", "wb")
- pipe.write(submitTemplate)
- pipe.close()
+ write_pipe("git commit -a -F -", submitTemplate)
os.chdir(self.clientPath)
- pipe = os.popen("p4 submit -i", "wb")
- pipe.write(submitTemplate)
- pipe.close()
+ write_pipe("p4 submit -i", submitTemplate)
elif response == "s":
for f in editedFiles:
system("p4 revert \"%s\"" % f);
self.oldWorkingDirectory = os.getcwd()
if self.directSubmit:
- self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines()
+ self.diffStatus = read_pipe_lines("git diff -r --name-status HEAD")
if len(self.diffStatus) == 0:
print "No changes in working directory to submit."
return True
- patch = mypopen("git diff -p --binary --diff-filter=ACMRTUXB HEAD").read()
+ patch = read_pipe("git diff -p --binary --diff-filter=ACMRTUXB HEAD")
self.diffFile = gitdir + "/p4-git-diff"
f = open(self.diffFile, "wb")
f.write(patch)
self.syncWithOrigin = False
def p4File(self, depotPath):
- return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
+ return read_pipe("p4 print -q \"%s\"" % depotPath)
def extractFilesFromCommit(self, commit):
files = []
else:
cmdline += " --branches"
- for line in mypopen(cmdline).readlines():
+ for line in read_pipe_lines(cmdline):
if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"):
continue
if self.importIntoRemotes:
else:
if self.verbose:
print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange)
- output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
+ output = read_pipe_lines("p4 changes %s...%s" % (self.depotPath, self.changeRange))
for line in output:
changeNum = line.split(" ")[1]
sync = P4Sync()
sync.run([])
print "Rebasing the current branch"
- oldHead = mypopen("git rev-parse HEAD").read()[:-1]
+ oldHead = read_pipe("git rev-parse HEAD")[:-1]
system("git rebase p4")
system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
return True
if len(gitdir) == 0:
gitdir = ".git"
if not isValidGitDir(gitdir):
- gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
+ gitdir = read_pipe("git rev-parse --git-dir")[:-1]
if os.path.exists(gitdir):
- cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
+ cdup = read_pipe("git rev-parse --show-cdup")[:-1];
if len(cdup) > 0:
os.chdir(cdup);
if not cmd.run(args):
parser.print_help()
-
git.samba.org / jelmer / fast-export.git / blobdiff