From 161d4b7fd218444428be11ea1fd2f8b8d20ec34d Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Mon, 3 Sep 2012 11:15:56 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20prune=20items=20from=20SCM=20dr?= =?UTF-8?q?ivers=20tracking=20directories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm b/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm index 4a4b04c0..3cea7a7c 100644 --- a/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm +++ b/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm @@ -80,8 +80,11 @@ _Iter prune_path_children (_Iter it, _Iter last) else unstagedPaths.push_back(pair->first); } - unstagedPaths.erase(prune_path_parents(unstagedPaths.begin(), unstagedPaths.end()), unstagedPaths.end()); - untrackedPaths.erase(prune_path_children(untrackedPaths.begin(), untrackedPaths.end()), untrackedPaths.end()); + if(!scmInfo->tracks_directories()) + { + unstagedPaths.erase(prune_path_parents(unstagedPaths.begin(), unstagedPaths.end()), unstagedPaths.end()); + untrackedPaths.erase(prune_path_children(untrackedPaths.begin(), untrackedPaths.end()), untrackedPaths.end()); + } std::sort(unstagedPaths.begin(), unstagedPaths.end(), text::less_t()); std::sort(untrackedPaths.begin(), untrackedPaths.end(), text::less_t());