vlad-hg 2.2.2 → 2.2.3

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.2.3 / 2011-09-29
+
+* 2 bug fixes
+
+  * Use <code>hg qclone</code> when cloning a repository with a patch queue,
+    so that the default path on the deployment patch queue repo is set to the
+    central repository. This matches the bugfix made in 2.2.0.
+
+  * Set a default value for +hg_subrepos+ when using MQ. This prevents the
+    export step from blowing up with an "undefined local variable or method"
+    error.
+
 === 2.2.2 / 2011-07-18
 
 * 1 bug fix

data/lib/vlad/mercurial.rb

@@ -3,7 +3,7 @@ require 'vlad'
 module Vlad
   class Mercurial
 
-    VERSION = '2.2.2'.freeze
+    VERSION = '2.2.3'.freeze
 
     set :source,        Vlad::Mercurial.new
     set :hg_cmd,        'hg'

data/lib/vlad/mercurial_queue.rb

@@ -3,13 +3,12 @@ require 'vlad'
 module Vlad
   class MercurialQueue
 
-    set :source, Vlad::MercurialQueue.new
-    set :hg_cmd, 'hg'
-    set :revision, 'default'
-    set :queue_repo do
-      "#{repository}/.hg/patches"
-    end
-    set :queue_revision, 'default'
+    set :source,                Vlad::MercurialQueue.new
+    set :hg_cmd,                'hg'
+    set :revision,              'default'
+    set :hg_subrepos,           false
+    set(:queue_repo)            { "#{repository}/.hg/patches" }
+    set :queue_revision,        'default'
 
     ##
     # Returns the command that will check out +revision+ from the
@@ -18,8 +17,8 @@ module Vlad
 
     def checkout(revision, destination)
       commands = []
-      commands << "if [ ! -d .hg ]; then #{hg_cmd} init; fi"
-      commands << "if [ ! -d .hg/patches/.hg ]; then #{hg_cmd} qinit -c; fi"
+      commands <<
+        "if [ ! -d .hg ]; then #{hg_cmd} qclone -r null #{repository} .; fi"
       commands << "#{hg_cmd} qpop -a"
       commands << "#{hg_cmd} pull #{repository}"
       commands << "#{hg_cmd} pull -R .hg/patches #{queue_repo}"

data/test/test_vlad_mercurial_queue.rb

@@ -16,14 +16,14 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
   def test_checkout
     cmd = @scm.checkout 'default', '/path/to/scm'
 
-    expected = "if [ ! -d .hg ]; then hg init; fi " \
-               "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \
-               "&& hg qpop -a " \
-               "&& hg pull http://repo/project " \
-               "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
-               "&& hg update default " \
-               "&& hg update -R .hg/patches tip " \
-               "&& hg qpush -a"
+    expected =
+      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
+      "&& hg qpop -a " \
+      "&& hg pull http://repo/project " \
+      "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
+      "&& hg update default " \
+      "&& hg update -R .hg/patches tip " \
+      "&& hg qpush -a"
 
     assert_equal expected, cmd
   end
@@ -58,14 +58,14 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     # only need to test #checkout
     cmd = @scm.checkout 'default', '/path/to/scm'
 
-    expected = "if [ ! -d .hg ]; then hg init; fi " \
-               "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \
-               "&& hg qpop -a " \
-               "&& hg pull http://repo/project " \
-               "&& hg pull -R .hg/patches http://repo/project-patched " \
-               "&& hg update default " \
-               "&& hg update -R .hg/patches tip " \
-               "&& hg qpush -a"
+    expected =
+      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
+      "&& hg qpop -a " \
+      "&& hg pull http://repo/project " \
+      "&& hg pull -R .hg/patches http://repo/project-patched " \
+      "&& hg update default " \
+      "&& hg update -R .hg/patches tip " \
+      "&& hg qpush -a"
 
     assert_equal expected, cmd
   end
@@ -76,14 +76,14 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     # only need to test #checkout
     cmd = @scm.checkout 'default', '/path/to/scm'
 
-    expected = "if [ ! -d .hg ]; then hg init; fi " \
-               "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \
-               "&& hg qpop -a " \
-               "&& hg pull http://repo/project " \
-               "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
-               "&& hg update default " \
-               "&& hg update -R .hg/patches deadbeefd00d " \
-               "&& hg qpush -a"
+    expected =
+      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
+      "&& hg qpop -a " \
+      "&& hg pull http://repo/project " \
+      "&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
+      "&& hg update default " \
+      "&& hg update -R .hg/patches deadbeefd00d " \
+      "&& hg qpush -a"
 
     assert_equal expected, cmd
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-hg
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.5
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Mercurial support for Vlad