GitWeb: Also handle urls with a dash in them

pieter · Sep 25, 2008 · bd5005a · bd5005a
1 parent af7925d
commit bd5005a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/git.rb b/lib/git.rb
@@ -52,7 +52,7 @@ def parse(channel, message)
     when /<(?:([a-zA-Z0-9\-]+) )?([^:?\^\$\~ ]+?)(:([^:?\^\$\~ ]+))?>/
       return handle_extended(channel, $1, $2, $4)
     # Matches an explicit repo
-    when /<([a-z]+:[a-zA-Z0-9\/\?=;.]+) ([^:?\^\$\~ ]+?)(:([^:?\^\$\~ ]+))?>/
+    when /<([a-z]+:[a-zA-Z0-9\/\?=;.\-]+) ([^:?\^\$\~ ]+?)(:([^:?\^\$\~ ]+))?>/
       return unless repo = Git::Source::Source.find_public($1)
       return repo.lookup($2, $4)
     when /\b([0-9a-f]{6,40})\b/

diff --git a/lib/git/sources/gitweb.rb b/lib/git/sources/gitweb.rb
@@ -23,7 +23,7 @@ def name
   end
 
   def matches?(match)
-    return @url =~ /\b#{match}[a-z]*\.git/
+    return @url =~ /\b#{match}[a-z\-\.0-9]*\.git/
   end
 
   def object_url(ref, file)

diff --git a/test/gitweb/plugin.rb b/test/gitweb/plugin.rb
@@ -62,6 +62,11 @@ def test_external_path
     @web.hook_privmsg_chan(@irc, "Look at <repo:etorrent.git HEAD>")
     assert_match(/^\[etorrent HEAD\]: http.* -- .*/, @irc.message)
   end
+
+  def test_external_complex
+    @web.hook_privmsg_chan(@irc, "<repo:linux-2.6.git 6c3a158316>")
+    assert_match(/^\[linux-2.6 6c3a15831\]: http.* -- .*/, @irc.message)
+  end
 
   def test_unacessible_repo_nil
     @web.hook_privmsg_chan(@irc, "This is local: <file://" + GIT_DIR + " HEAD>")