Support Mercurial tags, restructure examples

1 files changed, 18 insertions, 1 deletions

diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb
index 7263b4f..928049f 100644
--- a/lib/puppet/provider/vcsrepo/hg.rb
+++ b/lib/puppet/provider/vcsrepo/hg.rb
@@ -24,7 +24,24 @@ Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) d
   
   def revision
     at_path do
-      hg('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
+      current = hg('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
+      desired = @resource.value(:revision)
+      if current == desired
+        current
+      else
+        mapped = hg('tags')[/^#{Regexp.quote(desired)}\s+\d+:(\S+)/m, 1]
+        if mapped
+          # A tag, return that tag if it maps to the current nodeid
+          if current == mapped
+            desired
+          else
+            current
+          end
+        else
+          # Use the current nodeid
+          current
+        end
+      end
     end
   end