From 888e1a42b3cff679745be5c38e59eee9880ac0ba Mon Sep 17 00:00:00 2001
From: Kostas <Kostas@noemail.net>
Date: Thu, 31 Jul 2014 07:22:03 +0000
Subject: [PATCH] Always append the extra query line when available

FossilOrigin-Name: 964aff7d35acde4197dc863a6808f3a980b4e6cc
---
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 src/MainWindow.cpp |  8 +++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 5509ce1..531ee61 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updated\sthe\sChanges\sfile
-D 2014-07-29T14:27:35.190
+C Always\sappend\sthe\sextra\squery\sline\swhen\savailable\n
+D 2014-07-31T07:22:03.075
 F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
@@ -187,7 +187,7 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 0299d46ad799733c7e179a120b6a535b5f5fb2ab
+F src/MainWindow.cpp 63d36b11b72440ac75bba593937166a298347024
 F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
 F src/SettingsDialog.cpp effff92f746a71b07f0e6a72a21caac5a9085123
 F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921
@@ -201,7 +201,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
 F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020
-P be20b59a51389fdf0527c039742581032b52e3a5
-R d396c9d4b0068966052bb42922fc7b81
-U kostas
-Z 744a93da5663e789e19997fa71af25b8
+P 449bb5db0e4ccc3ec2115f913c0d01fb25f94970
+R 1a2ebb4cba235d48d4d86d8d68a7ffa6
+U Kostas
+Z 9bb94d29299a1dc4cf8412f6bb79d30e
diff --git a/manifest.uuid b/manifest.uuid
index 67fad82..8a0fe7e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-449bb5db0e4ccc3ec2115f913c0d01fb25f94970
\ No newline at end of file
+964aff7d35acde4197dc863a6808f3a980b4e6cc
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 68ea08f..d3f4941 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1236,12 +1236,14 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 			QString query = ParseFossilQuery(last_line);
 			QMessageBox::StandardButtons buttons = QMessageBox::YesToAll|QMessageBox::Yes|QMessageBox::No;
 
+			// Add any extra text available to the query
+			before_last_line = before_last_line.trimmed();
+			if(!before_last_line.isEmpty())
+				query = before_last_line + "\n" + query;
+
 			// Map the Convert option to the Apply button
 			if(have_acyn_query)
-			{
-				query = before_last_line + "\n" + query;
 				buttons |= QMessageBox::Apply;
-			}
 
 			QMessageBox::StandardButton res = DialogQuery(this, "Fossil", query, buttons);
 			if(res==QMessageBox::Yes)