From e63df45a8412117fbbd97decab9e0cd2f94a26dc Mon Sep 17 00:00:00 2001 From: kostas Date: Sun, 29 Apr 2012 12:19:03 +0000 Subject: [PATCH] Improved RepoFile path parsing. Addresses [e462e576e0] FossilOrigin-Name: 2508cffe4829804b696668e1159332793cf0d8e7 --- MainWindow.h | 9 ++++----- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/MainWindow.h b/MainWindow.h index 00c64ee..f1a82e6 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -42,12 +42,11 @@ struct RepoFile FileInfo = info; Type = type; FilePath = getRelativeFilename(repoPath); + Path = FileInfo.absolutePath(); - if(FilePath.indexOf('/')!=-1) - { - Path = FilePath; - Path = Path.left(Path.indexOf(FileInfo.fileName())-1); - } + // Strip the workspace path from the path + Q_ASSERT(Path.indexOf(repoPath)==0); + Path = Path.mid(repoPath.length()+1); } bool isType(EntryType t) const diff --git a/manifest b/manifest index d3123f3..2cd1427 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Added\stooltips\sto\sstashes.\sAddresses\s[4620f4b939] -D 2012-04-29T12:18:12.326 +C Improved\sRepoFile\spath\sparsing.\sAddresses\s[e462e576e0] +D 2012-04-29T12:19:03.560 F CommitDialog.cpp a46020a9361151d8d286a2670257d01d8967bf69 F CommitDialog.h f1ee8db92103164e7db55a8407ccdcff24571b72 F CommitDialog.ui 813d7cba316e226de1a22b7e480bb969fbe9b0c4 @@ -9,7 +9,7 @@ F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 F FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F MainWindow.cpp f6087bb977ddb18d588defc75ac562473a62a1d1 -F MainWindow.h 77b97c636283edf1f8b7630477fc458660ac2cf0 +F MainWindow.h 675f9a738a5671d366af108a8c7085c7be13f028 F MainWindow.ui 6c12a0b141b86c6994d5835618acba19a9ff1976 F SettingsDialog.cpp e1fad18cc020d08b82c6d35dc94f6624deec9a3b F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc @@ -176,7 +176,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F main.cpp 3741082d40973584d7c9ecddb58721000d6a7f8e F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 -P 8eda0def07bb784ba3db2b0ac7d0016bafa49305 -R 451aba63445d73eeeeea51b8d3655971 +P 1ff2c9dbb0a94e03efea78352c6a63c1d9631d2d +R 7e5390e09ed77cfe851b3bc850b16cba U kostas -Z aa3cb9fb6c652b6adf6a28a6c9300cee +Z 2777a1f831cb30f5e7c955d0dc06c325 diff --git a/manifest.uuid b/manifest.uuid index d1262b4..8e66e23 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1ff2c9dbb0a94e03efea78352c6a63c1d9631d2d \ No newline at end of file +2508cffe4829804b696668e1159332793cf0d8e7 \ No newline at end of file