Changeset 4847

Timestamp:

11/19/08 13:12:38 (2 months ago)

Author:

eblot

Message:

Fix up Tags management:

• Proper positioning of the tag label when a branch is tagged multiple times
  
• Do not show deleted tags
  

Files:

• revtreeplugin/0.11/revtree/model.py (modified) (2 diffs)
• revtreeplugin/0.11/revtree/svgview.py (modified) (5 diffs)
• revtreeplugin/0.11/setup.py (modified) (1 diff)

revtreeplugin/0.11/revtree/model.py

@@ -197 +197 @@
-                                (info['kind'], info['path']))
-            return False
+        path_mo = bcre.match(info['path'])
+        if info['change'] is TracChangeset.DELETE:
+            mo_dict = path_mo.groupdict()
+            if 'tag' not in mo_dict:
+                return False
+            self.name = mo_dict['tag']
+            self.env.log.info('Tag: deleted %s' % info['path'])
+            self.last = True
+            return True 
-        if info['change'] is not TracChangeset.COPY:
-            self.env.log.warn('Tag: not a copy: %s: %s' % \
-                                (info['change'], info['path']))
-            return False
-        path_mo = bcre.match(info['path'])
-        if not path_mo: # or not src_mo:
-            self.env.log.warn('Tag: with path: %s <- %s' % \
@@ -339 +347 @@
-            elif isinstance(chgset, TagChangeset):
-                if self._tags.has_key(chgset.name):
+                    if chgset.last:
+                        self.log.info('Removing deleted tag %s' % chgset.name)
+                        del self._tags[chgset.name]
+                        continue
-                    self.log.warn('Ubiquitous tag: %s', chgset.name)
-                self._tags[chgset.name] = chgset 

revtreeplugin/0.11/revtree/svgview.py

@@ -204 +204 @@
-        self._shape = 'circle'
-        self._enhance = False
+        self._tag_offset = 0
-        self._fillcolor = self._parent.fillcolor()
-        self._strokecolor = self._parent.strokecolor()
@@ -291 +292 @@
-            self._link.attributes['class'] = ' '.join(self._classes)
-                    
+    def tag_offset(self, height):
+        offset = self._tag_offset
+        self._tag_offset += height
+        return offset
+
-    def strokewidth(self):
-        return self._parent.strokewidth()
@@ -398 +404 @@
-        return (self._w, self._h)
-        
-, h_offset
+
-        (sx, sy) = self._srcchgset.position()
+        h_offset = self._srcchgset.tag_offset(self._h)
-        self._position = (sx + (self._srcchgset.extent()[0])/2,
-                          sy - (3*self._h)/2 + h_offset)
@@ -506 +513 @@
-                      
-    def build(self, position):
-        tag_h_off = 0
-        self._position = position
-        self._slot = self._slotgen()
@@ -516 +522 @@
-                    wdgt.build()
-                    h += wdgt.extent()[1]
-
-tag_h_off
+ 
+
-                    (tw, th) = wdgt.extent()
-                    tag_h_off -= th
-                    nw = tw/2 + wdgt.position()[0]-position[0]
-                    if nw > w: w = nw 

revtreeplugin/0.11/setup.py

@@ -16 +16 @@
-
-PACKAGE = 'TracRevtreePlugin'
-2
+3
-
-setup (