1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate VCS::GIT#upstream

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-07-30 16:44:29 +09:00
parent 2e6f777f9e
commit 47144f91a1
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/lib/vcs.rb
View File

@ -578,9 +578,7 @@ class VCS
IO.copy_stream(r, path) IO.copy_stream(r, path)
end end
def commit(opts = {}) def upstream
args = [COMMAND, "push"]
args << "-n" if dryrun
(branch = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD")).chomp! (branch = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD")).chomp!
(upstream = cmd_read(%W"#{COMMAND} branch --list --format=%(upstream) #{branch}")).chomp! (upstream = cmd_read(%W"#{COMMAND} branch --list --format=%(upstream) #{branch}")).chomp!
while ref = upstream[%r"\Arefs/heads/(.*)", 1] while ref = upstream[%r"\Arefs/heads/(.*)", 1]
@ -589,7 +587,14 @@ class VCS
unless %r"\Arefs/remotes/([^/]+)/(.*)" =~ upstream unless %r"\Arefs/remotes/([^/]+)/(.*)" =~ upstream
raise "Upstream not found" raise "Upstream not found"
end end
args << $1 << "HEAD:#$2" [$1, $2]
end
def commit(opts = {})
args = [COMMAND, "push"]
args << "-n" if dryrun
remote, branch = upstream
args << remote << "HEAD:#{branch}"
if dryrun? if dryrun?
STDERR.puts(args.inspect) STDERR.puts(args.inspect)
return true return true