[meld/VersionControlRework: 55/123] vc._vc: Concatenate meta information in the Entry
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/VersionControlRework: 55/123] vc._vc: Concatenate meta information in the Entry
- Date: Sun, 19 Apr 2015 20:10:37 +0000 (UTC)
commit 1943cae6dbd33b6ff14a580af2c189463f6945d1
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Mar 29 12:29:25 2015 +1000
vc._vc: Concatenate meta information in the Entry
meld/vc/_vc.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 5132a36..2929fa2 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -82,6 +82,8 @@ class Entry(object):
self.state = state
self.parent, self.name = os.path.split(path.rstrip("/"))
self.isdir = isdir
+ if isinstance(options, list):
+ options = ','.join(options)
self.options = options
def __str__(self):
@@ -225,8 +227,6 @@ class Vc(object):
state = tree.get(path, STATE_NORMAL)
meta = meta_tree.get(path, "")
isdir = file_info.get_file_type() == Gio.FileType.DIRECTORY
- if isinstance(meta, list):
- meta = ','.join(meta)
return Entry(path, name, state, isdir, options=meta)
retfiles = [make_entry(gfile, file_info) for gfile, file_info in files]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]