vlad-hg 2.2.3 → 2.2.4

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.2.4 / 2012-08-18
+
+* 2 bug fixes
+
+  * Clone patch queue separately when cloning a repository with a patch
+    queue; <code>hg qclone</code> doesn't have a +--revision+ option.
+    This still gets the default path set correctly (fixed in 2.2.3).
+
+  * Explicitly enable MQ on the command line when using a patch queue.
+
 === 2.2.3 / 2011-09-29
 
 * 2 bug fixes

data/README.txt

@@ -101,7 +101,7 @@ To use a revision _of the patch queue_ other than +tip+, specify the
 
 (The MIT License)
 
-Copyright (c) 2010 Kevin Bullock and the rest of the Ruby Hit Squad
+Copyright (c) 2011 Kevin Bullock and the rest of the Ruby Hit Squad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,6 +10,8 @@ Hoe.spec 'vlad-hg' do
   developer 'Kevin R. Bullock', 'kbullock@ringworld.org'
   extra_deps << ['vlad', '~> 2.0']
   self.hg_release_tag_prefix = 'v'
+  self.rdoc_locations <<
+    "rubyforge.org:/var/www/gforge-projects/hitsquad/#{remote_rdoc_dir}"
 end
 
 # vim: syntax=Ruby

data/lib/vlad/mercurial.rb

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

data/lib/vlad/mercurial_queue.rb

@@ -18,13 +18,15 @@ module Vlad
     def checkout(revision, destination)
       commands = []
       commands <<
-        "if [ ! -d .hg ]; then #{hg_cmd} qclone -r null #{repository} .; fi"
-      commands << "#{hg_cmd} qpop -a"
+        "if [ ! -d .hg ]; then #{hg_cmd} clone -r null #{repository} .; fi"
+      commands << "if [ ! -d .hg/patches/.hg ]; then " +
+        "#{hg_cmd} clone -r null #{queue_repo} .hg/patches; fi"
+      commands << "#{hg_cmd} --config extensions.mq= qpop -a"
       commands << "#{hg_cmd} pull #{repository}"
       commands << "#{hg_cmd} pull -R .hg/patches #{queue_repo}"
       commands << "#{hg_cmd} update #{revision}"
       commands << "#{hg_cmd} update -R .hg/patches #{queue_revision}"
-      commands << "#{hg_cmd} qpush -a"
+      commands << "#{hg_cmd} --config extensions.mq= qpush -a"
       commands.join(' && ')
     end
 
@@ -36,9 +38,9 @@ module Vlad
     def export(revision, destination)
       case deploy_via.to_sym
       when :checkout, :clone
-        "#{hg_cmd} clone #{scm_path} -r qtip #{destination}"
+        "#{hg_cmd} --config extensions.mq= clone #{scm_path} -r qtip #{destination}"
       else # :archive, :export (or whatever)
-        "#{hg_cmd} archive#{' -S' if hg_subrepos} -r qtip #{destination}"
+        "#{hg_cmd} --config extensions.mq= archive#{' -S' if hg_subrepos} -r qtip #{destination}"
       end
     end
 

data/test/test_vlad_mercurial_queue.rb

@@ -17,32 +17,34 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected =
-      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
-      "&& hg qpop -a " \
+      "if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
+      "&& if [ ! -d .hg/patches/.hg ]; then " \
+      "hg clone -r null http://repo/project/.hg/patches .hg/patches; fi " \
+      "&& hg --config extensions.mq= 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"
+      "&& hg --config extensions.mq= qpush -a"
 
     assert_equal expected, cmd
   end
 
   def test_export
     cmd = @scm.export 'default', '/path/to/release'
-    assert_equal 'hg archive -r qtip /path/to/release', cmd
+    assert_equal 'hg --config extensions.mq= archive -r qtip /path/to/release', cmd
   end
 
   def test_export_via
     set :deploy_via, :checkout
     cmd = @scm.export 'default', '/path/to/release'
-    assert_equal 'hg clone /path/to/scm -r qtip /path/to/release', cmd
+    assert_equal 'hg --config extensions.mq= clone /path/to/scm -r qtip /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 qtip /path/to/release', cmd
+    assert_equal 'hg --config extensions.mq= archive -S -r qtip /path/to/release', cmd
     set :hg_subrepos, false
   end
 
@@ -59,13 +61,15 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected =
-      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
-      "&& hg qpop -a " \
+      "if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
+      "&& if [ ! -d .hg/patches/.hg ]; then " \
+      "hg clone -r null http://repo/project-patched .hg/patches; fi " \
+      "&& hg --config extensions.mq= 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"
+      "&& hg --config extensions.mq= qpush -a"
 
     assert_equal expected, cmd
   end
@@ -77,13 +81,15 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected =
-      "if [ ! -d .hg ]; then hg qclone -r null http://repo/project .; fi " \
-      "&& hg qpop -a " \
+      "if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
+      "&& if [ ! -d .hg/patches/.hg ]; then " \
+      "hg clone -r null http://repo/project/.hg/patches .hg/patches; fi " \
+      "&& hg --config extensions.mq= 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"
+      "&& hg --config extensions.mq= 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: 1
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  version: 2.2.4
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2012-08-19 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
@@ -40,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 47
         segments: 
         - 2
-        - 9
-        - 4
-        version: 2.9.4
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id002
 description: |-
@@ -70,7 +71,7 @@ files:
 - lib/vlad/mercurial_queue.rb
 - test/test_vlad_mercurial.rb
 - test/test_vlad_mercurial_queue.rb
-- .gemtest
+has_rdoc: true
 homepage: http://hitsquad.rubyforge.org/vlad-hg/
 licenses: []
 
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.9
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mercurial support for Vlad