Add a --no-metadata option to suppress the svn info in commit messages.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Thiago Macieira <thiago@kde.org>

diff --git a/src/options.cpp b/src/options.cpp
index 0de86252c4e4ec2c189ae77614fd313a957d8f03..892b6e10a22fc7e3b4d40409000b143270231e64 100644 (file)
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -42,7 +42,7 @@ void Options::showHelp()
 void Options::parseArguments(const QStringList &argumentList)
 {
     QSet<QString> validOptions;
-    validOptions << "help";
+    validOptions << "help" << "metadata";
 
     QSet<QString> validOptionsWithComplement;
     validOptionsWithComplement << "resume-from" << "max-rev" << "identity-map";

diff --git a/src/repository.cpp b/src/repository.cpp
index 5faf2af106338eeb90f349d362751a5cb7930d1a..9c2a9d5421964cd2261a0f75c2ebedf9ae91d369 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "repository.h"
+#include "options.h"
 #include <QTextStream>
 #include <QDebug>
 #include <QLinkedList>
@@ -246,7 +247,8 @@ void Repository::Transaction::commit()
     QByteArray message = log;
     if (!message.endsWith('\n'))
         message += '\n';
-    message += "\nsvn path=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
+    if (Options::globalOptions->switches.value("metadata", true))
+        message += "\nsvn path=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
 
     {
         QByteArray branchRef = branch;