Added hg revision information to VERSION reply to match version strings everywhere...

diff --git a/ChangeLog b/ChangeLog
index 48fa7eeb407d953d308f98c71298ef95b5bdcd24..e781e422760ab9a694d64c9958f06ad44e3a5200 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2010-07-31  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/proto-common.c: Added hg revision information to VERSION
+       reply to match version strings everywhere else.
+
 2010-07-30  Matthew Beeching  <jobe@mdbnet.co.uk>
 
        * src/Makefile.in: Added version.c generation at compile time

diff --git a/src/proto-common.c b/src/proto-common.c
index 2d8e1f892b773a84cca1ac79fc0bd30c628dd6bb..92d797492eb9ccb42f1c99ebb5e952b0485de2ae 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -26,6 +26,7 @@
 #include "spamserv.h"
 #include "shun.h"
 #include "timeq.h"
+#include "version.h"
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -370,7 +371,7 @@ static CMD_FUNC(cmd_version)
         log_module(MAIN_LOG, LOG_ERROR, "Could not find VERSION origin user %s", origin);
         return 0;
     }
-    irc_numeric(user, 351, "%s %s %s", PACKAGE_TARNAME, PACKAGE_VERSION, self->name);
+    irc_numeric(user, 351, "%s %s+[%s] %s", PACKAGE_TARNAME, PACKAGE_VERSION, cvs_version, self->name);
     return 1;
 }