Bug #10636: "make-snapshot tmp stable" broken

• Status: Closed
• Assignee: -
• Target version: -
• ruby -v: Checked out revision 48930.
• Backport: 2.0.0: UNKNOWN, 2.1: UNKNOWN

[vo.x (Vit Ondruch)]

It seems that r48840 breaks make-snapshot:

$ tool/make-snapshot tmp stable
/builddir/ruby/tool/vcs.rb:165:in `fnmatch?': no implicit conversion of Regexp into String (TypeError)
	from /builddir/ruby/tool/vcs.rb:165:in `block (2 levels) in branch_list'
	from /builddir/ruby/tool/vcs.rb:163:in `each'
	from /builddir/ruby/tool/vcs.rb:163:in `block in branch_list'
	from /builddir/ruby/tool/vcs.rb:162:in `popen'
	from /builddir/ruby/tool/vcs.rb:162:in `branch_list'
	from tool/make-snapshot:142:in `package'
	from tool/make-snapshot:356:in `block in <main>'
	from tool/make-snapshot:356:in `collect'
	from tool/make-snapshot:356:in `<main>'

The attached patch fixes the issue for me, but I have not tested it with Git, so I hope it does not break anything else.

[nobu (Nobuyoshi Nakada)]

• Status changed from Open to Closed
• % Done changed from 0 to 100

Applied in changeset r48946.

---

make-snapshot: fix stable snapshot

• tool/make-snapshot (package): VCS#branch_list expects glob a
  pattern string but not a regexp. based on the patch by Vit
  Ondruch. in [ruby-core:67064]. [Bug #10636]
• tool/vcs.rb (VCS::SVN#branch_list): strip newlines.
• tool/vcs.rb (VCS::GIT.get_revisions): retrieve modified time
  from toplevel log too.
• tool/vcs.rb (VCS::GIT#branch_list): yield for each lines.