github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-23 05:37:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don’t prune items from SCM drivers tracking directories

Browse Source
This commit is contained in:
Allan Odgaard
2012-09-03 11:15:56 +02:00
parent 3a47ad6c03
commit 161d4b7fd2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm
View File

@@ -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());