From e71f6a53e269ffc9c8acd4d4eb563ea230f3e8de Mon Sep 17 00:00:00 2001 From: Luke Diamand Date: Fri, 11 May 2012 07:25:16 +0100 Subject: [PATCH 1/3] git p4: add test for tag import/export enabled via config This adds a test for git p4 to check it can import/export tags when enabled via a config variable rather than on the command line. Signed-off-by: Luke Diamand Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano --- t/t9811-git-p4-label-import.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index fb00ffab240..095238fffe2 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -195,6 +195,26 @@ test_expect_success 'tag that cannot be exported' ' ) ' +test_expect_success 'use git config to enable import/export of tags' ' + git p4 clone --verbose --dest="$git" //depot@all && + ( + cd "$git" && + git config git-p4.exportLabels true && + git config git-p4.importLabels true && + git tag CFG_A_GIT_TAG && + git p4 rebase --verbose && + git p4 submit --verbose && + git tag && + git tag | grep TAG_F1_1 + ) && + ( + cd "$cli" && + p4 labels && + p4 labels | grep CFG_A_GIT_TAG + ) +' + + test_expect_success 'kill p4d' ' kill_p4d ' From 05a3cec501e2a602ddb4333eec1e70219f0a8f53 Mon Sep 17 00:00:00 2001 From: Luke Diamand Date: Fri, 11 May 2012 07:25:17 +0100 Subject: [PATCH 2/3] git p4: fix bug when verbose enabled with tag export Wrong variable name used when verbose enabled, causes failure. Signed-off-by: Luke Diamand Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index eab69590c41..1335e0b890a 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1257,7 +1257,7 @@ class P4Submit(Command, P4UserMap): if not m.match(name): if verbose: - print "tag %s does not match regexp %s" % (name, validTagRegexp) + print "tag %s does not match regexp %s" % (name, validLabelRegexp) continue # Get the p4 commit this corresponds to From 06dcd152a81ccff5464c34ed95306196763c9e65 Mon Sep 17 00:00:00 2001 From: Luke Diamand Date: Fri, 11 May 2012 07:25:18 +0100 Subject: [PATCH 3/3] git p4: fix bug when enabling tag import/export via config variables Use Python's True, not true. Causes failure when enabling tag import or export in "git p4" using a config option rather than the command line. Signed-off-by: Luke Diamand Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano --- git-p4.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index 1335e0b890a..78ec9f8fb8a 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1400,7 +1400,7 @@ class P4Submit(Command, P4UserMap): rebase.rebase() if gitConfig("git-p4.exportLabels", "--bool") == "true": - self.exportLabels = true + self.exportLabels = True if self.exportLabels: p4Labels = getP4Labels(self.depotPath) @@ -2675,7 +2675,7 @@ class P4Sync(Command, P4UserMap): sys.stdout.write("\n") if gitConfig("git-p4.importLabels", "--bool") == "true": - self.importLabels = true + self.importLabels = True if self.importLabels: p4Labels = getP4Labels(self.depotPaths)