git-review 0.6.5 → 0.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/git-review.rb +8 -4
- metadata +3 -3
data/lib/git-review.rb
CHANGED
|
@@ -98,11 +98,12 @@ class GitReview
|
|
|
98
98
|
puts 'Tell the contributor not to do this.'
|
|
99
99
|
return false
|
|
100
100
|
end
|
|
101
|
-
message = "
|
|
102
|
-
exec_cmd = "merge
|
|
101
|
+
message = "Accept request ##{@pending_request['number']} and merge changes into \"#{target}\""
|
|
102
|
+
exec_cmd = "merge #{option} -m '#{message}' #{@pending_request['head']['sha']}"
|
|
103
103
|
puts
|
|
104
104
|
puts 'Request title:'
|
|
105
105
|
puts " #{@pending_request['title']}"
|
|
106
|
+
puts
|
|
106
107
|
puts 'Merge command:'
|
|
107
108
|
puts " git #{exec_cmd}"
|
|
108
109
|
puts
|
|
@@ -174,8 +175,11 @@ class GitReview
|
|
|
174
175
|
return false
|
|
175
176
|
end
|
|
176
177
|
@pending_request = @pending_requests.find{ |req| req['number'] == request_id }
|
|
177
|
-
|
|
178
|
-
|
|
178
|
+
if @pending_request.nil?
|
|
179
|
+
puts "Request '#{request_id}' does not exist."
|
|
180
|
+
return false
|
|
181
|
+
end
|
|
182
|
+
true
|
|
179
183
|
end
|
|
180
184
|
|
|
181
185
|
# Get latest changes from GitHub.
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-review
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 11
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 6
|
|
9
|
-
-
|
|
10
|
-
version: 0.6.
|
|
9
|
+
- 6
|
|
10
|
+
version: 0.6.6
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Dominik Bamberger, Cristian Messel
|