From ace663a5be55e45ef2e9deea6a5ff7476e1ba5a8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 4 Nov 2014 23:49:51 +0200
Subject: [PATCH] Mercurial: Properly cleanup commit message
Change-Id: If035d3a2476408d3c54aa30f9b276bc5921845b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
src/plugins/mercurial/mercurialcommitwidget.cpp | 9 +++++++++
src/plugins/mercurial/mercurialcommitwidget.h | 3 +++
2 files changed, 12 insertions(+)
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 729785b7aba..272a811235e 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -151,5 +151,14 @@ QString MercurialCommitWidget::repoRoot()
return mercurialCommitPanelUi.repositoryLabel->text();
}
+QString MercurialCommitWidget::cleanupDescription(const QString &input) const
+{
+ const QRegularExpression commentLine(QLatin1String("^HG:[^\\n]*(\\n|$)"),
+ QRegularExpression::MultilineOption);
+ QString message = input;
+ message.remove(commentLine);
+ return message;
+}
+
} // namespace Internal
} // namespace Mercurial
diff --git a/src/plugins/mercurial/mercurialcommitwidget.h b/src/plugins/mercurial/mercurialcommitwidget.h
index 41ece65600b..d042f4f4ab0 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.h
+++ b/src/plugins/mercurial/mercurialcommitwidget.h
@@ -53,6 +53,9 @@ public:
QString committer();
QString repoRoot();
+protected:
+ QString cleanupDescription(const QString &input) const;
+
private:
QWidget *mercurialCommitPanel;
Ui::MercurialCommitPanel mercurialCommitPanelUi;
--
GitLab