vlad-hg 2.2.3 → 2.2.4
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +10 -0
- data/README.txt +1 -1
- data/Rakefile +2 -0
- data/lib/vlad/mercurial.rb +1 -1
- data/lib/vlad/mercurial_queue.rb +7 -5
- data/test/test_vlad_mercurial_queue.rb +18 -12
- metadata +12 -11
- data/.gemtest +0 -0
data/History.txt
CHANGED
@@ -1,3 +1,13 @@
|
|
1
|
+
=== 2.2.4 / 2012-08-18
|
2
|
+
|
3
|
+
* 2 bug fixes
|
4
|
+
|
5
|
+
* Clone patch queue separately when cloning a repository with a patch
|
6
|
+
queue; <code>hg qclone</code> doesn't have a +--revision+ option.
|
7
|
+
This still gets the default path set correctly (fixed in 2.2.3).
|
8
|
+
|
9
|
+
* Explicitly enable MQ on the command line when using a patch queue.
|
10
|
+
|
1
11
|
=== 2.2.3 / 2011-09-29
|
2
12
|
|
3
13
|
* 2 bug fixes
|
data/README.txt
CHANGED
@@ -101,7 +101,7 @@ To use a revision _of the patch queue_ other than +tip+, specify the
|
|
101
101
|
|
102
102
|
(The MIT License)
|
103
103
|
|
104
|
-
Copyright (c)
|
104
|
+
Copyright (c) 2011 Kevin Bullock and the rest of the Ruby Hit Squad
|
105
105
|
|
106
106
|
Permission is hereby granted, free of charge, to any person obtaining
|
107
107
|
a copy of this software and associated documentation files (the
|
data/Rakefile
CHANGED
@@ -10,6 +10,8 @@ Hoe.spec 'vlad-hg' do
|
|
10
10
|
developer 'Kevin R. Bullock', 'kbullock@ringworld.org'
|
11
11
|
extra_deps << ['vlad', '~> 2.0']
|
12
12
|
self.hg_release_tag_prefix = 'v'
|
13
|
+
self.rdoc_locations <<
|
14
|
+
"rubyforge.org:/var/www/gforge-projects/hitsquad/#{remote_rdoc_dir}"
|
13
15
|
end
|
14
16
|
|
15
17
|
# vim: syntax=Ruby
|
data/lib/vlad/mercurial.rb
CHANGED
data/lib/vlad/mercurial_queue.rb
CHANGED
@@ -18,13 +18,15 @@ module Vlad
|
|
18
18
|
def checkout(revision, destination)
|
19
19
|
commands = []
|
20
20
|
commands <<
|
21
|
-
"if [ ! -d .hg ]; then #{hg_cmd}
|
22
|
-
commands << "
|
21
|
+
"if [ ! -d .hg ]; then #{hg_cmd} clone -r null #{repository} .; fi"
|
22
|
+
commands << "if [ ! -d .hg/patches/.hg ]; then " +
|
23
|
+
"#{hg_cmd} clone -r null #{queue_repo} .hg/patches; fi"
|
24
|
+
commands << "#{hg_cmd} --config extensions.mq= qpop -a"
|
23
25
|
commands << "#{hg_cmd} pull #{repository}"
|
24
26
|
commands << "#{hg_cmd} pull -R .hg/patches #{queue_repo}"
|
25
27
|
commands << "#{hg_cmd} update #{revision}"
|
26
28
|
commands << "#{hg_cmd} update -R .hg/patches #{queue_revision}"
|
27
|
-
commands << "#{hg_cmd} qpush -a"
|
29
|
+
commands << "#{hg_cmd} --config extensions.mq= qpush -a"
|
28
30
|
commands.join(' && ')
|
29
31
|
end
|
30
32
|
|
@@ -36,9 +38,9 @@ module Vlad
|
|
36
38
|
def export(revision, destination)
|
37
39
|
case deploy_via.to_sym
|
38
40
|
when :checkout, :clone
|
39
|
-
"#{hg_cmd} clone #{scm_path} -r qtip #{destination}"
|
41
|
+
"#{hg_cmd} --config extensions.mq= clone #{scm_path} -r qtip #{destination}"
|
40
42
|
else # :archive, :export (or whatever)
|
41
|
-
"#{hg_cmd} archive#{' -S' if hg_subrepos} -r qtip #{destination}"
|
43
|
+
"#{hg_cmd} --config extensions.mq= archive#{' -S' if hg_subrepos} -r qtip #{destination}"
|
42
44
|
end
|
43
45
|
end
|
44
46
|
|
@@ -17,32 +17,34 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
|
|
17
17
|
cmd = @scm.checkout 'default', '/path/to/scm'
|
18
18
|
|
19
19
|
expected =
|
20
|
-
"if [ ! -d .hg ]; then hg
|
21
|
-
"&&
|
20
|
+
"if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
|
21
|
+
"&& if [ ! -d .hg/patches/.hg ]; then " \
|
22
|
+
"hg clone -r null http://repo/project/.hg/patches .hg/patches; fi " \
|
23
|
+
"&& hg --config extensions.mq= qpop -a " \
|
22
24
|
"&& hg pull http://repo/project " \
|
23
25
|
"&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
|
24
26
|
"&& hg update default " \
|
25
27
|
"&& hg update -R .hg/patches tip " \
|
26
|
-
"&& hg qpush -a"
|
28
|
+
"&& hg --config extensions.mq= qpush -a"
|
27
29
|
|
28
30
|
assert_equal expected, cmd
|
29
31
|
end
|
30
32
|
|
31
33
|
def test_export
|
32
34
|
cmd = @scm.export 'default', '/path/to/release'
|
33
|
-
assert_equal 'hg archive -r qtip /path/to/release', cmd
|
35
|
+
assert_equal 'hg --config extensions.mq= archive -r qtip /path/to/release', cmd
|
34
36
|
end
|
35
37
|
|
36
38
|
def test_export_via
|
37
39
|
set :deploy_via, :checkout
|
38
40
|
cmd = @scm.export 'default', '/path/to/release'
|
39
|
-
assert_equal 'hg clone /path/to/scm -r qtip /path/to/release', cmd
|
41
|
+
assert_equal 'hg --config extensions.mq= clone /path/to/scm -r qtip /path/to/release', cmd
|
40
42
|
end
|
41
43
|
|
42
44
|
def test_export_subrepos
|
43
45
|
set :hg_subrepos, true
|
44
46
|
cmd = @scm.export 'default', '/path/to/release'
|
45
|
-
assert_equal 'hg archive -S -r qtip /path/to/release', cmd
|
47
|
+
assert_equal 'hg --config extensions.mq= archive -S -r qtip /path/to/release', cmd
|
46
48
|
set :hg_subrepos, false
|
47
49
|
end
|
48
50
|
|
@@ -59,13 +61,15 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
|
|
59
61
|
cmd = @scm.checkout 'default', '/path/to/scm'
|
60
62
|
|
61
63
|
expected =
|
62
|
-
"if [ ! -d .hg ]; then hg
|
63
|
-
"&&
|
64
|
+
"if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
|
65
|
+
"&& if [ ! -d .hg/patches/.hg ]; then " \
|
66
|
+
"hg clone -r null http://repo/project-patched .hg/patches; fi " \
|
67
|
+
"&& hg --config extensions.mq= qpop -a " \
|
64
68
|
"&& hg pull http://repo/project " \
|
65
69
|
"&& hg pull -R .hg/patches http://repo/project-patched " \
|
66
70
|
"&& hg update default " \
|
67
71
|
"&& hg update -R .hg/patches tip " \
|
68
|
-
"&& hg qpush -a"
|
72
|
+
"&& hg --config extensions.mq= qpush -a"
|
69
73
|
|
70
74
|
assert_equal expected, cmd
|
71
75
|
end
|
@@ -77,13 +81,15 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
|
|
77
81
|
cmd = @scm.checkout 'default', '/path/to/scm'
|
78
82
|
|
79
83
|
expected =
|
80
|
-
"if [ ! -d .hg ]; then hg
|
81
|
-
"&&
|
84
|
+
"if [ ! -d .hg ]; then hg clone -r null http://repo/project .; fi " \
|
85
|
+
"&& if [ ! -d .hg/patches/.hg ]; then " \
|
86
|
+
"hg clone -r null http://repo/project/.hg/patches .hg/patches; fi " \
|
87
|
+
"&& hg --config extensions.mq= qpop -a " \
|
82
88
|
"&& hg pull http://repo/project " \
|
83
89
|
"&& hg pull -R .hg/patches http://repo/project/.hg/patches " \
|
84
90
|
"&& hg update default " \
|
85
91
|
"&& hg update -R .hg/patches deadbeefd00d " \
|
86
|
-
"&& hg qpush -a"
|
92
|
+
"&& hg --config extensions.mq= qpush -a"
|
87
93
|
|
88
94
|
assert_equal expected, cmd
|
89
95
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vlad-hg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 15
|
5
|
+
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 2.2.
|
9
|
+
- 4
|
10
|
+
version: 2.2.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Kevin R. Bullock
|
@@ -15,7 +15,8 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date:
|
18
|
+
date: 2012-08-19 00:00:00 -05:00
|
19
|
+
default_executable:
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
21
22
|
name: vlad
|
@@ -40,12 +41,12 @@ dependencies:
|
|
40
41
|
requirements:
|
41
42
|
- - ">="
|
42
43
|
- !ruby/object:Gem::Version
|
43
|
-
hash:
|
44
|
+
hash: 47
|
44
45
|
segments:
|
45
46
|
- 2
|
46
|
-
-
|
47
|
-
-
|
48
|
-
version: 2.
|
47
|
+
- 8
|
48
|
+
- 0
|
49
|
+
version: 2.8.0
|
49
50
|
type: :development
|
50
51
|
version_requirements: *id002
|
51
52
|
description: |-
|
@@ -70,7 +71,7 @@ files:
|
|
70
71
|
- lib/vlad/mercurial_queue.rb
|
71
72
|
- test/test_vlad_mercurial.rb
|
72
73
|
- test/test_vlad_mercurial_queue.rb
|
73
|
-
|
74
|
+
has_rdoc: true
|
74
75
|
homepage: http://hitsquad.rubyforge.org/vlad-hg/
|
75
76
|
licenses: []
|
76
77
|
|
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
101
102
|
requirements: []
|
102
103
|
|
103
104
|
rubyforge_project: hitsquad
|
104
|
-
rubygems_version: 1.
|
105
|
+
rubygems_version: 1.3.7
|
105
106
|
signing_key:
|
106
107
|
specification_version: 3
|
107
108
|
summary: Mercurial support for Vlad
|
data/.gemtest
DELETED
File without changes
|