motomike-bnr_tools 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/bin/taggit +12 -8
- data/lib/bnr_tools/mergeinator.rb +2 -2
- metadata +1 -1
data/VERSION.yml
CHANGED
data/bin/taggit
CHANGED
@@ -22,13 +22,17 @@ end
|
|
22
22
|
|
23
23
|
tickets = Set.new
|
24
24
|
Array(opts[:release_branch]).each { |release_branch|
|
25
|
-
opts[:
|
26
|
-
ticket
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
25
|
+
if (opts[:ticket_given])
|
26
|
+
opts[:ticket].each { |ticketRefAndChangesets|
|
27
|
+
ticket, *changesets = *ticketRefAndChangesets
|
28
|
+
tickets << Ticket.new(ticket, changesets, opts[:wc_root_path], release_branch)
|
29
|
+
}
|
30
|
+
end
|
31
|
+
if (opts[:deticket_given])
|
32
|
+
opts[:deticket].each { |ticketRefAndChangesets|
|
33
|
+
ticket, *changesets = *ticketRefAndChangesets
|
34
|
+
tickets << Ticket.new(ticket, changesets.map { |cs| -cs } , opts[:wc_root_path], release_branch)
|
35
|
+
}
|
36
|
+
end
|
33
37
|
Mergeinator.new(opts[:wc_root_path], release_branch, tickets).mergeStuff
|
34
38
|
}
|
@@ -55,10 +55,10 @@ class Mergeinator
|
|
55
55
|
tempfile.puts "modules svn+ssh://svn.digg.internal/repository/LOLz/tags/#{version}"
|
56
56
|
tempfile.puts "build svn+ssh://svn.digg.internal/repository/build/trunk"
|
57
57
|
}
|
58
|
-
cmd = "svn ps svn:externals --file #{t.path} #{
|
58
|
+
cmd = "svn ps svn:externals --file #{t.path} #{self.wcPath}/LOLcat/tags/#{version}"
|
59
59
|
puts "Running command : #{cmd}"
|
60
60
|
puts IO.popen(cmd).readlines
|
61
|
-
cmd = %Q{svn commit -m"Tagged LOLcat-#{version}. #{ref_msg}. Updated external links."}
|
61
|
+
cmd = %Q{svn commit #{self.wcPath}/LOLcat/tags/#{version} -m"Tagged LOLcat-#{version}. #{ref_msg}. Updated external links."}
|
62
62
|
puts "Running command : #{cmd}"
|
63
63
|
puts IO.popen(cmd).readlines
|
64
64
|
else
|