From ffe138b4e3a7e08dff967089703ba721f8b45716 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sun, 21 Aug 2011 04:06:20 -0400
Subject: [PATCH] Remove date from config.version.

---
 common/content/dactyl.js                | 12 ++++++++----
 common/locale/en-US/messages.properties |  2 +-
 common/modules/config.jsm               | 14 ++++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 1c16719c..1e453fea 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1866,10 +1866,14 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             function (args) {
                 if (args.bang)
                     dactyl.open("about:");
-                else
-                    commandline.commandOutput(<>
-                        {config.appName} {config.version} running on:<br/>{navigator.userAgent}
-                    </>);
+                else {
+                    let date = config.buildDate;
+                    date = date ? " (" + date + ")" : "";
+
+                    commandline.commandOutput(
+                        <div>{config.appName} {config.version}{date} running on: </div> +
+                        <div>{navigator.userAgent}</div>)
+                }
             }, {
                 argCount: "0",
                 bang: true
diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index 2c373047..65494f82 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -109,7 +109,7 @@ completion.waitingFor-1 = Waiting for %S
 completion.waitingForKeyPress = Waiting for key press
 completion.matchIndex-2 = match %S of %S
 
-dactyl.created-1 = "(created %S)"
+dactyl.created-1 = created %S
 dactyl.parsingCommandLine-1 = Parsing command line options: %S
 dactyl.notCommand-2 = E492: Not a %S command: %S
 dactyl.sourcingPlugins-1 = Sourcing plugin directory: %S...
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 2f9829b9..6b7273ac 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -309,11 +309,17 @@ var ConfigBase = Class("ConfigBase", {
     version: Class.memoize(function () {
         if (this.VCSPath)
             return io.system(["hg", "-R", this.VCSPath, "log", "-r.",
-                              "--template=hg{rev}-" + this.branch + " ({date|isodate})"]).output;
-        let version = this.addon.version;
+                              "--template=hg{rev}." + this.branch]).output;
+
+        return this.addon.version;
+    }),
+
+    buildDate: Class.memoize(function () {
+        if (this.VCSPath)
+            return io.system(["hg", "-R", this.VCSPath, "log", "-r.",
+                              "--template={date|isodate}"]).output;
         if ("@DATE@" !== "@" + "DATE@")
-            version += " " + _("dactyl.created", "@DATE@");
-        return version;
+            return _("dactyl.created", "@DATE@");
     }),
 
     get fileExt() this.name.slice(0, -6),