opendev/puppet-vcsrepo
Code Issues Proposed changes

Fix support for wanting a specific tag.

Browse Source
This commit is contained in:
Monty Taylor 2012-08-11 14:30:29 -04:00
parent f3acccdfb8
commit 224e2ce3d5
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
# might be worthwhile to have an allow_local_changes param to decide # might be worthwhile to have an allow_local_changes param to decide
# whether to reset or pull when we're ensuring latest. # whether to reset or pull when we're ensuring latest.
at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") } at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") }
elsif tag_revision?(desired)
at_path { git_with_identity('reset', '--hard', "#{desired}") }
end end
if @resource.value(:ensure) != :bare if @resource.value(:ensure) != :bare
update_submodules update_submodules
@ -96,8 +98,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
def update_references def update_references
at_path do at_path do
checkout git_with_identity('fetch', @resource.value(:remote))
git_with_identity('pull', @resource.value(:remote))
update_owner_and_excludes update_owner_and_excludes
end end
end end
@ -191,10 +192,18 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
end end
def checkout(revision = @resource.value(:revision)) def checkout(revision = @resource.value(:revision))
if !local_branch_revision? && remote_branch_revision? if tag_revision?(revision)
at_path { git_with_identity('checkout', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") } if !local_branch_revision?("tag/#{revision}")
else at_path { git_with_identity('checkout', '-b', "tag/#{revision}") }
at_path { git_with_identity('checkout', '--force', revision) } else
at_path { git_with_identity('checkout', '--force', "tag/#{revision}") }
end
elsif remote_branch_revision?(revision)
if !local_branch_revision?(revision)
at_path { git_with_identity('checkout', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") }
else
at_path { git_with_identity('checkout', '--force', revision) }
end
end end
end end
@ -256,7 +265,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
end end
current = at_path { git_with_identity('rev-parse', rev).strip } current = at_path { git_with_identity('rev-parse', rev).strip }
if @resource.value(:revision) if @resource.value(:revision)
if local_branch_revision? if local_branch_revision? or tag_revision?
canonical = at_path { git_with_identity('rev-parse', @resource.value(:revision)).strip } canonical = at_path { git_with_identity('rev-parse', @resource.value(:revision)).strip }
elsif remote_branch_revision? elsif remote_branch_revision?
canonical = at_path { git_with_identity('rev-parse', "#{@resource.value(:remote)}/" + @resource.value(:revision)).strip } canonical = at_path { git_with_identity('rev-parse', "#{@resource.value(:remote)}/" + @resource.value(:revision)).strip }