[meld/VersionControlRework: 106/123] vcview: Remove logic for non-specified working directory



commit 2fbd8c4df1d849eb0ea1798351497364f2a4c42d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 18 08:23:21 2015 +1000

    vcview: Remove logic for non-specified working directory

 meld/vcview.py |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index a822ea5..c09c772 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -580,12 +580,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
             if len(pbase) and p.startswith(pbase):
                 kill = len(pbase) + 1
             return p[kill:] or "."
-        if working_dir:
-            workdir = self.vc.get_working_directory(working_dir)
-        elif len(files) == 1 and os.path.isdir(files[0]):
-            workdir = self.vc.get_working_directory(files[0])
-        else:
-            workdir = self.vc.get_working_directory(_commonprefix(files))
+        workdir = self.vc.get_working_directory(working_dir)
         files = [relpath(workdir, f) for f in files]
         r = None
         self.consolestream.command(shelljoin(command + files) + " (in %s)\n" % workdir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]