vlad-hg 2.1.3 → 2.2.1

data/History.txt

@@ -1,3 +1,22 @@
+=== 2.2.1 / 2011-07-18
+
+* 1 bug fix
+
+  * Fix regressions caused by failure to merge 2.1.3 before releasing 2.2.0.
+
+=== 2.2.0 / 2011-07-18
+
+* 1 minor enhancement
+
+  * Added +hg_subrepos+ variable. When set to +true+, the export step recurses
+    into subdirectories (adds the -S flag to <code>hg archive</code>).
+
+* 1 bug fix
+
+  * Now does a proper <code>hg clone</code>, so that the default path on the
+    deployment clone is set to the central repository. This is necessary if your
+    repo has subrepos with relative paths.
+
 === 2.1.3 / 2010-11-22
 
 * 2 bugfixes

data/README.txt

@@ -42,6 +42,8 @@ Mercurial support for Vlad. Using it is as simple as passing
 == VARIABLES:
 
 hg_cmd::          The mercurial command to use. Defaults to 'hg'.
+hg_subrepos::     Whether to look for subrepos when exporting. Defaults to
+                  false.
 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

data/Rakefile

@@ -9,7 +9,7 @@ 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-'
+  self.hg_release_tag_prefix = 'v'
 end
 
 # vim: syntax=Ruby

data/lib/vlad/mercurial.rb

@@ -3,11 +3,12 @@ require 'vlad'
 module Vlad
   class Mercurial
 
-    VERSION = '2.1.3'.freeze
+    VERSION = '2.2.1'.freeze
 
-    set :source,   Vlad::Mercurial.new
-    set :hg_cmd,   'hg'
-    set :revision, 'default'
+    set :source,        Vlad::Mercurial.new
+    set :hg_cmd,        'hg'
+    set :revision,      'default'
+    set :hg_subrepos,   false
 
     ##
     # Returns the command that will check out +revision+ from the
@@ -16,7 +17,7 @@ module Vlad
 
     def checkout(revision, destination)
       # These all get executed after a "cd #{scm_path}"
-      [ "if [ ! -d .hg ]; then #{hg_cmd} init; fi",
+      [ "if [ ! -d .hg ]; then #{hg_cmd} clone -r null #{repository} .; fi",
         "#{hg_cmd} pull #{repository}",
         "#{hg_cmd} update #{revision}"
       ].join(' && ')
@@ -32,7 +33,7 @@ module Vlad
       when :checkout, :clone
         "#{hg_cmd} clone #{scm_path} -r #{revision} #{destination}"
       else # :archive, :export (or whatever)
-        "#{hg_cmd} archive -r #{revision} #{destination}"
+        "#{hg_cmd} archive#{' -S' if hg_subrepos} -r #{revision} #{destination}"
       end
     end
 

data/test/test_vlad_mercurial.rb

@@ -13,9 +13,10 @@ class TestVladMercurial < Rake::TestCase
   def test_checkout
     cmd = @scm.checkout 'default', '/path/to/scm'
 
-    expected = "if [ ! -d .hg ]; then hg init; fi " \
-               "&& hg pull http://repo/project " \
-               "&& hg update default"
+    expected =
+      "if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
+      "&& hg pull http://repo/project " \
+      "&& hg update default"
 
     assert_equal expected, cmd
   end
@@ -26,6 +27,12 @@ class TestVladMercurial < Rake::TestCase
     assert_equal 'hg archive -r default /path/to/release', cmd
   end
 
+  def test_export_subrepos
+    set :hg_subrepos, true
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal 'hg archive -S -r default /path/to/release', cmd
+  end
+
   def test_revision
     # 0x0000_0000_0000 is the changeset ID for the root revision of all hg repos
     cmd = @scm.revision('000000000000')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-hg
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 2
+  - 2
   - 1
-  - 3
-  version: 2.1.3
+  version: 2.2.1
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -06:00
-default_executable: 
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
@@ -34,37 +33,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id003
 description: |-
   Mercurial support for Vlad. Using it is as simple as passing
   <tt>:scm => :mercurial</tt> to Vlad when loading it up.
@@ -87,7 +70,7 @@ files:
 - lib/vlad/mercurial_queue.rb
 - test/test_vlad_mercurial.rb
 - test/test_vlad_mercurial_queue.rb
-has_rdoc: true
+- .gemtest
 homepage: http://hitsquad.rubyforge.org/vlad-hg/
 licenses: []
 
@@ -118,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Mercurial support for Vlad