Permalink
Browse files

Version bum (0.2.28)

  • Loading branch information...
winton committed Oct 21, 2012
1 parent 245d4c5 commit aa8c2ecc380cb7b60fe3e6e538f0d13491546175
Showing with 21 additions and 2 deletions.
  1. +1 −1 gitcycle.gemspec
  2. +20 −1 lib/gitcycle.rb
View
@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
Gem::Specification.new do |s|
s.name = "gitcycle"
- s.version = '0.2.27'
+ s.version = '0.2.28'
s.platform = Gem::Platform::RUBY
s.authors = [ 'Winton Welsh' ]
s.email = [ 'mail@wintoni.us' ]
View
@@ -364,6 +364,7 @@ def qa(*issues)
elsif branch =~ /^qa_/
puts "\nRetrieving branch information from gitcycle.\n".green
qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
+ qa_branch_name = "qa_#{qa_branch['source']}_#{qa_branch['user']}"
if pass_fail == 'pass'
checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
@@ -379,10 +380,28 @@ def qa(*issues)
if pass_fail == 'pass' && issues.empty?
owner, repo = qa_branch['repo'].split(':')
+
+ qa_branch['branches'].each do |b|
+ repo = b['repo'].split(':')[1]
+
+ add_remote_and_fetch(
+ :owner => b['home'],
+ :repo => repo
+ )
+
+ output = run("git log #{qa_branch_name}..#{b['home']}/#{repo}")
+
+ unless output.strip.empty?
+ puts "\nUn-merged changes detected in '#{repo}/#{b['home']}':".red
+ puts "\n#{output}"
+ puts "\nTo merge the change: git merge #{repo}/#{b['home']}".yellow
+ end
+ end
+
merge_remote_branch(
:owner => owner,
:repo => repo,
- :branch => "qa_#{qa_branch['source']}_#{qa_branch['user']}",
+ :branch => qa_branch_name,
:type => :from_qa
)
end

0 comments on commit aa8c2ec

Please sign in to comment.