summary refs log tree commit diff stats
path: root/ranger/container/directory.py
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2015-10-09 04:47:32 +0200
committernfnty <git@nfnty.se>2016-02-08 04:43:04 +0100
commit8c1403d6533fb8ef3d651ce026f0a92310f65da5 (patch)
tree4c1d738c813bc55bc969d4f2c6024ea41e6cf169 /ranger/container/directory.py
parent9645b056c6fc5d1b8882f500ed5e231ed16c02fa (diff)
downloadranger-8c1403d6533fb8ef3d651ce026f0a92310f65da5.tar.gz
VCS: Implement vcs.track
Diffstat (limited to 'ranger/container/directory.py')
-rw-r--r--ranger/container/directory.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 6d6e3e88..77c2e250 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -306,8 +306,7 @@ class Directory(FileSystemObject, Accumulator, Loadable):
                 files = []
                 disk_usage = 0
 
-                if self.settings.vcs_aware and \
-                        self.vcs.root and not self.vcs.in_repodir:
+                if self.vcs and self.vcs.track:
                     self.vcs.update(self)
 
                 for name in filenames:
@@ -334,8 +333,7 @@ class Directory(FileSystemObject, Accumulator, Loadable):
                             except:
                                 item = Directory(name, preload=stats, path_is_abs=True)
                                 item.load()
-                        if item.settings.vcs_aware and \
-                                item.vcs.root and not item.vcs.in_repodir:
+                        if item.vcs and item.vcs.track:
                             item.vcs.update(item, child=True)
                             if item.vcs.is_root:
                                 self.has_vcschild = True
@@ -344,8 +342,7 @@ class Directory(FileSystemObject, Accumulator, Loadable):
                                     basename_is_rel_to=basename_is_rel_to)
                         item.load()
                         disk_usage += item.size
-                        if self.settings.vcs_aware and \
-                                self.vcs.root and not self.vcs.in_repodir:
+                        if self.vcs and self.vcs.track:
                             item.vcspathstatus = self.vcs.get_status_subpath(item.path)
 
                     files.append(item)