kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vcs.rb: commit

Browse source 
* tool/vcs.rb (commit): do commit, reset svn revision to sync git
  mirror.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-07-26 12:44:12 +00:00
parent ae91976d56
commit 11f69dccf3
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
defs/gmake.mk
View file

@ -136,22 +136,10 @@ $(TIMESTAMPDIR)/.exec.time:
$(Q) mkdir exec
$(Q) exit > $@
ifneq (,)
else ifeq ($(VCS),svn)
VCSCOMMIT = $(VCS) commit $(SVNCOMMITOPTIONS)
else ifeq ($(VCS),git svn)
VCSCOMMIT = $(VCS) dcommit $(GITSVNCOMMITOPTIONS)
VCSWAIT = sleep 2 # wait for svn to git sync
else ifeq ($(VCS),git)
VCSCOMMIT := $(VCS) push $(GITCOMMITOPTIONS)
endif
ifneq ($(VCSCOMMIT),)
.PHONY: commit
commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS)))
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSCOMMIT)
$(Q)$(VCSWAIT)
@$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit'
$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY update-src srcs all-incs
endif
ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
extract-gems: update-gems

13
tool/vcs.rb
View file

@ -317,6 +317,10 @@ class VCS
end
end
end
def commit
system(*%W"#{COMMAND} commit")
end
end
class GIT < self
@ -456,5 +460,14 @@ class VCS
end
end
end
def commit
rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1]
ret = system(COMMAND, "svn", "dcommit")
if ret and rev
cmd_read(%W"#{COMMAND} svn reset -r#{rev}")
end
ret
end
end
end