vlad-hg 2.1.0 → 2.1.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.1.1 / 2010-06-15
+
+* 1 minor enhancement
+
+  * Patch queues: pop patches *before* pulling, to avoid superfluous (+1 heads)
+    messages.
+
 === 2.1.0 / 2010-06-04
 
 * 1 major enhancement

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.spec 'vlad-hg' do
-  rubyforge_name = 'hitsquad'
+  self.rubyforge_name = 'hitsquad'
   developer 'Kevin R. Bullock', 'kbullock@ringworld.org'
   extra_deps << ['vlad', '~> 2.0']
 end

data/lib/vlad/mercurial.rb

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

data/lib/vlad/mercurial_queue.rb

@@ -21,9 +21,9 @@ module Vlad
       commands = []
       commands << "if [ ! -d .hg ]; then #{hg_cmd} init; fi"
       commands << "if [ ! -d .hg/patches/.hg ]; then #{hg_cmd} qinit -c; fi"
+      commands << "#{hg_cmd} qpop -a"
       commands << "#{hg_cmd} pull #{repository}"
       commands << "#{hg_cmd} pull -R .hg/patches #{queue_repo}"
-      commands << "#{hg_cmd} qpop -a"
       commands << "#{hg_cmd} update #{revision}"
       commands << "#{hg_cmd} update -R .hg/patches #{queue_revision}"
       commands << "#{hg_cmd} qpush -a"

data/test/test_vlad_mercurial_queue.rb

@@ -17,9 +17,9 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
 
     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 qpop -a " \
                "&& hg update tip " \
                "&& hg update -R .hg/patches tip " \
                "&& hg qpush -a"
@@ -46,9 +46,9 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
 
     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 qpop -a " \
                "&& hg update tip " \
                "&& hg update -R .hg/patches tip " \
                "&& hg qpush -a"
@@ -64,9 +64,9 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
 
     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 qpop -a " \
                "&& hg update tip " \
                "&& 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: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -05:00
+date: 2010-06-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: vlad-hg
+rubyforge_project: hitsquad
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3