summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xtool/redmine-backporter.rb4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 19d9813395..a69be6c9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 22 18:03:19 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/redmine-backporter.rb (find_svn_log): use double quotes instead
+ of single quotes because cmd.exe doesn't handle them.
+
+ * tool/redmine-backporter.rb (done): the 2nd element of matched data
+ is the offset of the end of matched string, not length.
+
Thu Jan 22 16:45:24 2015 Eric Wong <e@80x24.org>
* st.c (st_numhash): mix float value for flonum
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb
index c420ad052f..64078c0348 100755
--- a/tool/redmine-backporter.rb
+++ b/tool/redmine-backporter.rb
@@ -238,7 +238,7 @@ def mergeinfo
end
def find_svn_log(pattern)
- `svn log --xml --stop-on-copy --search='#{pattern}' #{RUBY_REPO_PATH}`
+ `svn log --xml --stop-on-copy --search="#{pattern}" #{RUBY_REPO_PATH}`
end
def show_last_journal(http, uri)
@@ -389,7 +389,7 @@ eom
if h and val = h["value"]
case val[/(?:\A|, )#{Regexp.quote TARGET_VERSION}: ([^,]+)/, 1]
when 'REQUIRED', 'UNKNOWN', 'DONTNEED', 'WONTFIX'
- val[*$~.offset(1)] = 'DONE'
+ val[$~.offset(1)[0]...$~.offset(1)[1]] = 'DONE'
when 'DONE' # , /\A\d+\z/
puts 'already backport is done'
next # already done