mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ld/git-p4-tags-and-labels'

Browse Source 
By Luke Diamand
* ld/git-p4-tags-and-labels:
  git p4: fix bug when enabling tag import/export via config variables
  git p4: fix bug when verbose enabled with tag export
  git p4: add test for tag import/export enabled via config
This commit is contained in:
Junio C Hamano
2012-05-17 15:21:46 -07:00
parent 2b26b65f9a 06dcd152a8
commit 9b994b1c4e
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-p4.py
View File

@ -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
@ -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)