From 9786af1d2b08bfdae159453f0f7e28a02e4449dc Mon Sep 17 00:00:00 2001 From: kostas Date: Sun, 3 May 2015 14:41:54 +0000 Subject: [PATCH] Made tag references explicit with "tag:" to prevent clashes with filesystem objects with the same name FossilOrigin-Name: 71aeb47a33d20919a71efc23d973c5f6a3c3bb90 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/Fossil.cpp | 10 ++++++++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 1cc6301..e8bd21b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Added\stag\sand\srevision\sdisplay\son\sstatus\sbar -D 2015-05-03T12:43:46.492 +C Made\stag\sreferences\sexplicit\swith\s"tag:"\sto\sprevent\sclashes\swith\sfilesystem\sobjects\swith\sthe\ssame\sname +D 2015-05-03T14:41:54.154 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -196,7 +196,7 @@ F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8 F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df -F src/Fossil.cpp 01b620c7ca283be385211e8276aad98dc642b0ef +F src/Fossil.cpp f27b97eaf068275a0e8558dd2b739f9c7b61774a F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 @@ -220,7 +220,7 @@ F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b F ui/UpdateDialog.ui 392cdba296dd4b79145992a85e79748e7c34580d -P b0f81bc9c4d226d8406f65d9ad02099205d7e067 -R 402b4d45ccb228937c1b7de260a0504d +P b64d5954b1e1baf7e69d56b2ec8c31584141cebb +R c4ee61e1b2e9e65e210979f3618ea057 U kostas -Z 9772818e668c26ddadfe640ce4f9be25 +Z 4e196455c7fb9e67c5070f7ff39d102c diff --git a/manifest.uuid b/manifest.uuid index 2380d8f..c897223 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b64d5954b1e1baf7e69d56b2ec8c31584141cebb \ No newline at end of file +71aeb47a33d20919a71efc23d973c5f6a3c3bb90 \ No newline at end of file diff --git a/src/Fossil.cpp b/src/Fossil.cpp index 3852cfb..d73d078 100644 --- a/src/Fossil.cpp +++ b/src/Fossil.cpp @@ -463,7 +463,7 @@ bool Fossil::tagList(QStringMap& tags) info.clear(); - if(!runFossil(QStringList() << "info" << tag, &info, RUNFLAGS_SILENT_ALL)) + if(!runFossil(QStringList() << "info" << "tag:"+tag, &info, RUNFLAGS_SILENT_ALL)) return false; QStringMap props; @@ -495,7 +495,7 @@ bool Fossil::tagDelete(const QString& name, const QString &revision) { QStringList res; - if(!runFossil(QStringList() << "tag" << "cancel" << name << revision, &res)) + if(!runFossil(QStringList() << "tag" << "cancel" << "tag:"+name << revision, &res)) return false; return true; @@ -731,6 +731,12 @@ bool Fossil::runFossilRaw(const QStringList &args, QStringList *output, int *exi buffer += decoder->toUnicode(input); + + #ifdef QT_DEBUG // breakpint + //if(buffer.indexOf("SQLITE_CANTOPEN")!=-1) + // qDebug() << "Breakpoint\n"; + #endif + QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents); if(buffer.isEmpty())