Permalink
Browse files

Merge branch 'master' of github.com:winton/gitcycle

  • Loading branch information...
2 parents a9e51c3 + a391516 commit 33e404664f41e1c1af302d1bea7076fe05e183d4 @winton committed Feb 3, 2012
Showing with 4 additions and 5 deletions.
  1. +1 −2 README.md
  2. +3 −3 lib/gitcycle.rb
View
@@ -127,11 +127,10 @@ Todo
* Label issues with ticket milestone?
* gitc LH-ticket should not created a redis record right away, what happens if someone control-c
* gitc -h or gitc help
-* gitc discuss should tag issue with 'Discuss'
* gitc qa pass # since we're changing this to pass all the tickets, we need to loop through all the merged issues and update the lighthouse state to pending-qa
* gitc pull doesnt work in rc: https://gist.github.com/7e508977fbb762d186a6
* Tag issue with milestone
* There's still a Tagging Issue I tried to fix parseLabel http://d.pr/8eOS , Pass should remove Pending *, but remove the Branch Name
-* gitc log, diff, merge, rm, status, reset, mv, commit, diff
+* gitc discuss should tag issue with 'Discuss'
* gitc ready - possibly do syntax checks
* gitc commands should not track branches, so that they have to use the gitc push vs using git push
View
@@ -225,7 +225,7 @@ def qa(*issues)
if issues.empty?
puts "\n"
get('qa_branch').each do |branches|
- puts "qa_#{branches['user']}_#{branches['source']}".green
+ puts "qa_#{branches['source']}_#{branches['user']}".green
branches['branches'].each do |branch|
puts " #{"issue ##{branch['issue']}".yellow}\t#{branch['user']}/#{branch['branch']}"
end
@@ -301,7 +301,7 @@ def qa(*issues)
run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
- run("git push origin qa_#{qa_branch['user']}_#{qa_branch['source']}")
+ run("git push origin qa_#{qa_branch['source']}_#{qa_branch['user']}")
puts "\nDe-conflicting on gitcycle.\n".green
get('qa_branch',
@@ -537,7 +537,7 @@ def create_qa_branch(options)
end
source = qa_branch['source']
- name = "qa_#{qa_branch['user']}_#{source}"
+ name = "qa_#{source}_#{qa_branch['user']}"
unless qa_branch['branches'].empty?
unless options[:preserve]

0 comments on commit 33e4046

Please sign in to comment.