diff options
| -rw-r--r-- | ranger/config/commands.py | 8 | ||||
| -rw-r--r-- | ranger/ext/vcs/__init__.py (renamed from ranger/vcs/__init__.py) | 0 | ||||
| -rw-r--r-- | ranger/ext/vcs/bzr.py (renamed from ranger/vcs/bzr.py) | 0 | ||||
| -rw-r--r-- | ranger/ext/vcs/git.py (renamed from ranger/vcs/git.py) | 0 | ||||
| -rw-r--r-- | ranger/ext/vcs/hg.py (renamed from ranger/vcs/hg.py) | 0 | ||||
| -rw-r--r-- | ranger/ext/vcs/vcs.py (renamed from ranger/vcs/vcs.py) | 0 | ||||
| -rw-r--r-- | ranger/fsobject/directory.py | 2 | ||||
| -rw-r--r-- | ranger/fsobject/fsobject.py | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py index c98f36f9..94304f1c 100644 --- a/ranger/config/commands.py +++ b/ranger/config/commands.py @@ -1169,7 +1169,7 @@ class stage(Command): Stage selected files for the corresponding version control system """ def execute(self): - from ranger.vcs import VcsError + from ranger.ext.vcs import VcsError filelist = [f.path for f in self.fm.thistab.get_selection()] self.fm.thisdir.vcs_outdated = True @@ -1191,7 +1191,7 @@ class unstage(Command): Unstage selected files for the corresponding version control system """ def execute(self): - from ranger.vcs import VcsError + from ranger.ext.vcs import VcsError filelist = [f.path for f in self.fm.thistab.get_selection()] self.fm.thisdir.vcs_outdated = True @@ -1213,7 +1213,7 @@ class diff(Command): Displays a diff of selected files against last last commited version """ def execute(self): - from ranger.vcs import VcsError + from ranger.ext.vcs import VcsError import tempfile L = self.fm.thistab.get_selection() @@ -1241,7 +1241,7 @@ class log(Command): Displays the log of the current repo or files """ def execute(self): - from ranger.vcs import VcsError + from ranger.ext.vcs import VcsError import tempfile L = self.fm.thistab.get_selection() diff --git a/ranger/vcs/__init__.py b/ranger/ext/vcs/__init__.py index bb696178..bb696178 100644 --- a/ranger/vcs/__init__.py +++ b/ranger/ext/vcs/__init__.py diff --git a/ranger/vcs/bzr.py b/ranger/ext/vcs/bzr.py index a63eea54..a63eea54 100644 --- a/ranger/vcs/bzr.py +++ b/ranger/ext/vcs/bzr.py diff --git a/ranger/vcs/git.py b/ranger/ext/vcs/git.py index b2e79a06..b2e79a06 100644 --- a/ranger/vcs/git.py +++ b/ranger/ext/vcs/git.py diff --git a/ranger/vcs/hg.py b/ranger/ext/vcs/hg.py index 08e5753b..08e5753b 100644 --- a/ranger/vcs/hg.py +++ b/ranger/ext/vcs/hg.py diff --git a/ranger/vcs/vcs.py b/ranger/ext/vcs/vcs.py index 4fca48c7..4fca48c7 100644 --- a/ranger/vcs/vcs.py +++ b/ranger/ext/vcs/vcs.py diff --git a/ranger/fsobject/directory.py b/ranger/fsobject/directory.py index bd266982..e0b1daa6 100644 --- a/ranger/fsobject/directory.py +++ b/ranger/fsobject/directory.py @@ -16,8 +16,8 @@ from ranger.core.shared import SettingsAware from ranger.ext.accumulator import Accumulator from ranger.ext.lazy_property import lazy_property from ranger.ext.human_readable import human_readable +from ranger.ext.vcs import VcsError from ranger.container.settingobject import LocalSettingObject -from ranger.vcs import VcsError def sort_by_basename(path): """returns path.basename (for sorting)""" diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py index c044dbdb..f8a8d162 100644 --- a/ranger/fsobject/fsobject.py +++ b/ranger/fsobject/fsobject.py @@ -18,7 +18,7 @@ from ranger.ext.shell_escape import shell_escape from ranger.ext.spawn import spawn from ranger.ext.lazy_property import lazy_property from ranger.ext.human_readable import human_readable -from ranger.vcs import Vcs +from ranger.ext.vcs import Vcs if hasattr(str, 'maketrans'): maketrans = str.maketrans |