vlad-hg 2.1.1 → 2.1.2

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.1.2 / 2010-09-15
+
+* 1 bug fix
+
+  * If +revision+ isn't specified, use 'default' instead of 'tip'. This fixes
+    what would be unexpected behavior from a repository whose tip isn't on the
+    default branch.
+
 === 2.1.1 / 2010-06-15
 
 * 1 minor enhancement

data/README.txt

@@ -39,6 +39,14 @@ Mercurial support for Vlad. Using it is as simple as passing
 
 * sudo gem install vlad-hg
 
+== VARIABLES:
+
+hg_cmd::          The mercurial command to use. Defaults to 'hg'.
+queue_repo::      The location of the MQ repository to use for
+                  +:mercurial_queue+. Defaults to "#{repository}/.hg/patches".
+queue_revision::  The revision of the _patch queue_ repository to use. See
+                  below.
+
 == PATCH QUEUES:
 
 +vlad-hg+ supports deploying from a patch queue repository on top of the main

data/Rakefile

@@ -3,10 +3,13 @@
 require 'rubygems'
 require 'hoe'
 
+Hoe.plugin :hg
+
 Hoe.spec 'vlad-hg' do
   self.rubyforge_name = 'hitsquad'
   developer 'Kevin R. Bullock', 'kbullock@ringworld.org'
   extra_deps << ['vlad', '~> 2.0']
+  self.hg_release_tag_prefix = 'rel-'
 end
 
 # vim: syntax=Ruby

data/lib/vlad/mercurial.rb

@@ -3,7 +3,7 @@ require 'vlad'
 module Vlad
   class Mercurial
 
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.1.2'.freeze
 
     set :source, Vlad::Mercurial.new
     set :hg_cmd, "hg"
@@ -14,7 +14,7 @@ module Vlad
     # changeset ID or equivalent (e.g. branch, tag, etc...)
 
     def checkout(revision, destination)
-      revision = 'tip' if revision =~ /^head$/i
+      revision = 'default' if revision =~ /^head$/i
 
       # These all get executed after a "cd #{scm_path}"
       [ "if [ ! -d .hg ]; then #{hg_cmd} init; fi",
@@ -29,7 +29,7 @@ module Vlad
     # Expects to be run from +scm_path+ after Vlad::Mercurial#checkout
 
     def export(revision, destination)
-      revision = 'tip' if revision =~ /^head$/i
+      revision = 'default' if revision =~ /^head$/i
 
       "#{hg_cmd} archive -r #{revision} #{destination}"
     end

data/lib/vlad/mercurial_queue.rb

@@ -16,7 +16,7 @@ module Vlad
     # changeset ID or equivalent (e.g. branch, tag, etc...)
 
     def checkout(revision, destination)
-      revision = 'tip' if revision =~ /^head$/i
+      revision = 'default' if revision =~ /^head$/i
 
       commands = []
       commands << "if [ ! -d .hg ]; then #{hg_cmd} init; fi"
@@ -36,7 +36,7 @@ module Vlad
     # Expects to be run from +scm_path+ after Vlad::Mercurial#checkout
 
     def export(revision, destination)
-      revision = 'tip' if revision =~ /^head$/i
+      revision = 'default' if revision =~ /^head$/i
 
       "#{hg_cmd} archive -r qtip #{destination}"
     end

data/test/test_vlad_mercurial.rb

@@ -14,14 +14,14 @@ class TestVladMercurial < MiniTest::Unit::TestCase
 
     expected = "if [ ! -d .hg ]; then hg init; fi " \
                "&& hg pull http://repo/project " \
-               "&& hg update tip"
+               "&& hg update default"
 
     assert_equal expected, cmd
   end
 
   def test_export
     cmd = @scm.export 'head', '/path/to/release'
-    assert_equal 'hg archive -r tip /path/to/release', cmd
+    assert_equal 'hg archive -r default /path/to/release', cmd
   end
 
   def test_revision

data/test/test_vlad_mercurial_queue.rb

@@ -20,7 +20,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
                "&& hg qpop -a " \
                "&& hg pull http://repo/project " \
                "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
-               "&& hg update tip " \
+               "&& hg update default " \
                "&& hg update -R .hg/patches tip " \
                "&& hg qpush -a"
 
@@ -33,8 +33,8 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
   end
 
   def test_revision
-    cmd = @scm.revision('tip')
-    expected = "`hg identify -r tip | cut -f1 -d\\ `"
+    cmd = @scm.revision('default')
+    expected = "`hg identify -r default | cut -f1 -d\\ `"
     assert_equal expected, cmd
   end
 
@@ -49,7 +49,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
                "&& hg qpop -a " \
                "&& hg pull http://repo/project " \
                "&& hg pull -R .hg/patches http://repo/project-patched " \
-               "&& hg update tip " \
+               "&& hg update default " \
                "&& hg update -R .hg/patches tip " \
                "&& hg qpush -a"
 
@@ -67,7 +67,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
                "&& hg qpop -a " \
                "&& hg pull http://repo/project " \
                "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
-               "&& hg update tip " \
+               "&& hg update default " \
                "&& hg update -R .hg/patches deadbeefd00d " \
                "&& hg qpush -a"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-hg
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -05:00
+date: 2010-09-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency