opendev/puppet-vcsrepo
Code Issues Proposed changes

(#7797) Makes git tags actually work.

Browse Source 
Fixes a number of issues with the git provider.  remote_branch_revision?
  method was always returning true because it would always at least return
  something, even if that something was a zero length array.  You normally
  don't desire a tag to become a branch since it creates ambiguity so I
  removed that.  latest method had no concept of (no branch) and so would
  fail if you switched to a remote branch or a tag.  Then finally
  revision sha1 returned by 'git rev-parse' for tags is not the revision
  of the commit the tag represents.  We have to use 'git show' and do
  some text parsing to actually figure out which commit goes with which
  tag.
This commit is contained in:
Cody Herriges
2011-05-24 21:24:26 +12:00
parent f31853d1c3
commit 8e51aebd4c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/puppet/provider/vcsrepo/git.rb
View File

@@ -41,15 +41,22 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
branch = on_branch?
if branch == 'master'
return get_revision('origin/HEAD')
elsif branch == '(no branch)'
return get_revision('HEAD')
else
return get_revision('origin/%s' % branch)
return get_revision('origin/%s' % branch)
end
end
def revision
update_references
current = at_path { git('rev-parse', 'HEAD') }
canonical = at_path { git('rev-parse', @resource.value(:revision)) }
current = at_path { git('rev-parse', 'HEAD').chomp }
if tag_revision?(@resource.value(:revision))
canonical = at_path { git('show', @resource.value(:revision)).scan(/commit (.*)/).to_s }
else
canonical = at_path { git('rev-parse', @resource.value(:revision)).chomp }
end
if current == canonical
@resource.value(:revision)
else
@@ -179,10 +186,10 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
end
def checkout_or_reset(revision = @resource.value(:revision))
if local_branch_revision?
if local_branch_revision?
reset(revision)
elsif tag_revision?
at_path { git('checkout', '-b', revision) }
at_path { git('checkout', revision) }
elsif remote_branch_revision?
at_path { git('checkout', '-b', revision, '--track', "origin/#{revision}") }
end
@@ -206,7 +213,10 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
def remote_branch_revision?(revision = @resource.value(:revision))
# git < 1.6 returns 'origin/#{revision}'
# git 1.6+ returns 'remotes/origin/#{revision}'
at_path { branches.grep /(remotes\/)?origin\/#{revision}/ }
branch = at_path { branches.grep /(remotes\/)?origin\/#{revision}/ }
if branch.length > 0
return branch
end
end
def local_branch_revision?(revision = @resource.value(:revision))