[PATCHv1 1/3] git p4: add test for tag import/export enabled via config

Luke Diamand· May 11, 2012, 06:25 UTC · lore

[PATCHv1 0/3] git p4: tag import/export bug fixes

Luke Diamand (3):
  git p4: add test for tag import/export enabled via config
  git p4: fix bug when verbose enabled with tag export
  git p4: fix bug when enabling tag import/export via config variables

 git-p4.py                      |    6 +++---
 t/t9811-git-p4-label-import.sh |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

-- 
1.7.10.282.g2120.dirty

Luke Diamand· May 11, 2012, 06:25 UTC · re: Luke Diamand · lore

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 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 fb00ffa..095238f 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
 '

-- 
1.7.10.282.g2120.dirty

Luke Diamand· May 11, 2012, 06:25 UTC · re: Luke Diamand · lore

[PATCHv1 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 <luke@diamand.org>
---
 git-p4.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index 565cfbc..8f0169a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1302,7 +1302,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

-- 
1.7.10.282.g2120.dirty

Luke Diamand· May 11, 2012, 06:25 UTC · re: Luke Diamand · lore

[PATCHv1 3/3] git p4: fix bug when enabling tag import/export via config variables

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 git-p4.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-p4.py b/git-p4.py
index 8f0169a..f895a24 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1451,7 +1451,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)
@@ -2711,7 +2711,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)

-- 
1.7.10.282.g2120.dirty

Re: [PATCHv1 0/3] git p4: tag import/export bug fixes

luke@diamand.org wrote on Fri, 11 May 2012 07:25 +0100:

> This patch series fixes two bugs in my git p4 import/export code, and
> adds a test case for them.
> 
> Luke Diamand (3):
>   git p4: add test for tag import/export enabled via config
>   git p4: fix bug when verbose enabled with tag export
>   git p4: fix bug when enabling tag import/export via config variables
> 
>  git-p4.py                      |    6 +++---
>  t/t9811-git-p4-label-import.sh |   20 ++++++++++++++++++++
>  2 files changed, 23 insertions(+), 3 deletions(-)

These fixes look obviously good, and maint-worthy.  Ack.

		-- Pete