[meld] Remove tag column from tree and view

[Kai Willadsen <kaiw src gnome org>]

commit de19fd412ca7cfa76c6d20aa899f10c33faf74a6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun May 19 09:27:10 2013 +1000

    Remove tag column from tree and view
    
    This column was used only by CVS, and had fairly dubious value anyway.

 meld/vc/__init__.py |    2 +-
 meld/vc/_vc.py      |    6 ++----
 meld/vc/cvs.py      |    6 ++----
 meld/vcview.py      |    6 ++----
 4 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/meld/vc/__init__.py b/meld/vc/__init__.py
index b89e1f0..0fe1d5f 100644
--- a/meld/vc/__init__.py
+++ b/meld/vc/__init__.py
@@ -24,7 +24,7 @@
 import os
 import glob
 from . import _null
-from ._vc import DATA_NAME, DATA_STATE, DATA_REVISION, DATA_TAG, DATA_OPTIONS
+from ._vc import DATA_NAME, DATA_STATE, DATA_REVISION, DATA_OPTIONS
 
 
 def load_plugins():
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 4b0f9d9..f52447b 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -46,7 +46,7 @@ CONFLICT_THIS = CONFLICT_LOCAL
 conflicts = [_("Merged"), _("Base"), _("Local"), _("Remote")]
 assert len(conflicts) == CONFLICT_MAX
 
-DATA_NAME, DATA_STATE, DATA_REVISION, DATA_TAG, DATA_OPTIONS = list(range(5))
+DATA_NAME, DATA_STATE, DATA_REVISION, DATA_OPTIONS = list(range(4))
 
 
 class Entry(object):
@@ -77,17 +77,15 @@ class Dir(Entry):
         Entry.__init__(self, path, name, state)
         self.isdir = 1
         self.rev = ""
-        self.tag = ""
         self.options = ""
 
 
 class File(Entry):
-    def __init__(self, path, name, state, rev="", tag="", options=""):
+    def __init__(self, path, name, state, rev="", options=""):
         assert path[-1] != "/"
         Entry.__init__(self, path, name, state)
         self.isdir = 0
         self.rev = rev
-        self.tag = tag
         self.options = options
 
 
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index 171e0ad..4a9c898 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -42,7 +42,7 @@ class Vc(_vc.Vc):
     PATCH_INDEX_RE = "^Index:(.*)$"
 
     VC_COLUMNS = (_vc.DATA_NAME, _vc.DATA_STATE, _vc.DATA_REVISION,
-                  _vc.DATA_TAG, _vc.DATA_OPTIONS)
+                  _vc.DATA_OPTIONS)
 
     def __init__(self, location):
         super(Vc, self).__init__(location)
@@ -120,8 +120,6 @@ class Vc(_vc.Vc):
             name = match[1]
             path = os.path.join(directory, name)
             rev, date, options, tag = match[2].split("/")
-            if tag:
-                tag = tag[1:]
             if isdir:
                 if os.path.exists(path):
                     state = _vc.STATE_NORMAL
@@ -161,7 +159,7 @@ class Vc(_vc.Vc):
                                 state = _vc.STATE_NORMAL
                             else:
                                 state = _vc.STATE_MODIFIED
-                retfiles.append(_vc.File(path, name, state, rev, tag, options))
+                retfiles.append(_vc.File(path, name, state, rev, options))
         # known
         cvsfiles = [x[1] for x in matches]
         # ignored
diff --git a/meld/vcview.py b/meld/vcview.py
index 3c8d1df..462ed33 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -187,8 +187,8 @@ class ConsoleStream(object):
         self.textview.scroll_mark_onscreen(self.end_mark)
 
 
-COL_LOCATION, COL_STATUS, COL_REVISION, COL_TAG, COL_OPTIONS, COL_END = \
-    list(range(tree.COL_END, tree.COL_END+6))
+COL_LOCATION, COL_STATUS, COL_REVISION, COL_OPTIONS, COL_END = \
+    list(range(tree.COL_END, tree.COL_END + 5))
 
 
 class VcTreeStore(tree.DiffTreeStore):
@@ -340,7 +340,6 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         self.treeview_column_location = addCol(_("Location"), COL_LOCATION)
         addCol(_("Status"), COL_STATUS, vc.DATA_STATE)
         addCol(_("Revision"), COL_REVISION, vc.DATA_REVISION)
-        addCol(_("Tag"), COL_TAG, vc.DATA_TAG)
         addCol(_("Options"), COL_OPTIONS, vc.DATA_OPTIONS)
 
         self.state_filters = []
@@ -882,7 +881,6 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         setcol(COL_LOCATION, location)
         setcol(COL_STATUS, e.get_status())
         setcol(COL_REVISION, e.rev)
-        setcol(COL_TAG, e.tag)
         setcol(COL_OPTIONS, e.options)
 
     def on_file_changed(self, filename):