--- git-p4.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git-p4.py b/git-p4.py index 527d44b..a81795f 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2320,6 +2320,15 @@ def extractFilesFromCommit(self, commit): fnum = fnum + 1 return files + def extractJobsFromCommit(self, commit): + jobs = [] + jnum = 0 + while commit.has_key("job%s" % jnum): + job = commit["job%s" % jnum] + jobs.append(job) + jnum = jnum + 1 + return jobs + def stripRepoPath(self, path, prefixes): """When streaming files, this is called to map a p4 depot path to where it should go in git. The prefixes are either @@ -2665,6 +2674,7 @@ def hasBranchPrefix(self, path): def commit(self, details, files, branch, parent = ""): epoch = details["time"] author = details["user"] + jobs = self.extractJobsFromCommit(details) if self.verbose: print('commit into {0}'.format(branch)) @@ -2696,6 +2706,8 @@ def commit(self, details, files, branch, parent = ""): (','.join(self.branchPrefixes), details["change"])) if len(details['options']) > 0: self.gitStream.write(": options = %s" % details['options']) + if len(jobs) > 0: + self.gitStream.write(": jobs = %s" % (','.join(jobs))) self.gitStream.write("]\nEOT\n\n") if len(parent) > 0: -- https://github.com/git/git/pull/225 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html