[meld] Open folder comparison when 'Compare'ing folders in VC view
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Open folder comparison when 'Compare'ing folders in VC view
- Date: Fri, 15 Mar 2013 21:01:52 +0000 (UTC)
commit c8b29e2824de065c06caeca97d41db2c9f5b62f9
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Mar 16 06:59:31 2013 +1000
Open folder comparison when 'Compare'ing folders in VC view
I'm not sure why we support this, but this is how it worked prior to
the direct-file-access changes in 1.7.1, so restoring that behaviour
here. Also, tracebacks are bad.
meld/vcview.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index 21361e7..96bfe56 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -465,6 +465,10 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
def run_diff(self, path_list):
try:
for path in path_list:
+ if os.path.isdir(path):
+ self.emit("create-diff", [path], {})
+ continue
+
kwargs = {}
status = self.vc._get_tree_cache(path).get(path, None)
if status == tree.STATE_CONFLICT:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]