Commit 26e6a27d authored by Jan Durovec's avatar Jan Durovec Committed by Junio C Hamano

git-p4: add P4 jobs to git commit message

When migrating from Perforce to git the information about P4 jobs
associated with P4 changelists is lost.

Having these jobs listed on messages of related git commits enables smooth
migration for projects that take advantage of e.g. JIRA integration
(which uses jobs on Perforce side and parses commit messages on git side).

The jobs are added to the message in the same format as is expected when
migrating in the reverse direction.
Signed-off-by: default avatarJan Durovec <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent a98772c6
......@@ -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))
......@@ -2692,6 +2702,8 @@ def commit(self, details, files, branch, parent = ""):
self.gitStream.write("data <<EOT\n")
self.gitStream.write(details["desc"])
if len(jobs) > 0:
self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
(','.join(self.branchPrefixes), details["change"]))
if len(details['options']) > 0:
......
......@@ -160,6 +160,15 @@ p4_add_user () {
EOF
}
p4_add_job () {
p4 job -f -i <<-EOF
Job: $1
Status: open
User: dummy
Description:
EOF
}
retry_until_success () {
timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
until "[email protected]" 2>/dev/null || test $(time_in_seconds) -gt $timeout
......
#!/bin/sh
test_description='git p4 retrieve job info'
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d
'
test_expect_success 'add p4 jobs' '
(
p4_add_job TESTJOB-A &&
p4_add_job TESTJOB-B
)
'
test_expect_success 'add p4 files' '
client_view "//depot/... //client/..." &&
(
cd "$cli" &&
>file1 &&
p4 add file1 &&
p4 submit -d "Add file 1"
)
'
test_expect_success 'check log message of changelist with no jobs' '
client_view "//depot/... //client/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git p4 clone --use-client-spec --destination="$git" //[email protected] &&
cat >expect <<-\EOF &&
Add file 1
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'add TESTJOB-A to change 1' '
(
cd "$cli" &&
p4 fix -c 1 TESTJOB-A
)
'
test_expect_success 'check log message of changelist with one job' '
client_view "//depot/... //client/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git p4 clone --use-client-spec --destination="$git" //[email protected] &&
cat >expect <<-\EOF &&
Add file 1
Jobs: TESTJOB-A
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'add TESTJOB-B to change 1' '
(
cd "$cli" &&
p4 fix -c 1 TESTJOB-B
)
'
test_expect_success 'check log message of changelist with more jobs' '
client_view "//depot/... //client/..." &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git p4 clone --use-client-spec --destination="$git" //[email protected] &&
cat >expect <<-\EOF &&
Add file 1
Jobs: TESTJOB-A TESTJOB-B
[git-p4: depot-paths = "//depot/": change = 1]
EOF
git log --format=%B >actual &&
test_cmp expect actual
)
'
test_expect_success 'kill p4d' '
kill_p4d
'
test_done
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment