keywords plugin: simpler forget code

[user/henk/code/ruby/rbot.git] / bin / rbot

diff --git a/bin/rbot b/bin/rbot
index 946344586bfbac2c0bc3632219733cecccad5228..98bc333938d2bb9168b88487b095f7b1e44c6358 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -48,13 +48,17 @@ if $version =~ /svn/
     git_out = `git status`
 
     git_out.match(/^# On branch (.*)\n/)
-    branch = $1
+    branch = $1.dup || "unknown"
     changed = git_out.match(/^# Change(.*)\n/)
-    rev = " @ #{`git rev-parse HEAD`[0..6]}"
+    rev = "revision "
+    git_out = `git log -1 --pretty=format:"%h%n%b"`.split("\n")
+    rev << git_out.first
+    if git_out.last.match(/^git-svn-id: \S+@(\d+)/)
+      rev << "(svn #{$1})"
+    end
     rev << ", local changes" if changed
 
-    $version << "-#{branch}" unless branch.empty?
-    $version << rev
+    $version << " (#{branch} branch, #{rev})"
   else
     up = File.dirname(__FILE__) + "/.."
     rev = " (unknown revision)"