Changeset 1083

Timestamp:

08/03/06 17:27:56 (2 years ago)

Author:

eblot

Message:

SvnCcHelpersScript:

• Add a new feature to hide the dead/terminated branches
  
• Several additional bug fixes
  

Files:

• svncchelpersscript/0.10/revtree/revtree/templates/revtree.cs (modified) (1 diff)
• svncchelpersscript/0.10/revtree/revtree/view.py (modified) (9 diffs)
• svncchelpersscript/0.10/revtree/revtree/web_ui.py (modified) (7 diffs)
• svncchelpersscript/0.10/revtree/setup.py (modified) (1 diff)

svncchelpersscript/0.10/revtree/revtree/templates/revtree.cs

@@ -79 +79 @@
-      revisions on top</label>
-   </div>
+   <div class="field">
+    <input type="hidden" name="checkbox_hideterm">
+    <input type="checkbox" id="hideterm"
+      name="hideterm" <?cs if:revtree.hideterm
+      ?>checked="checked"<?cs /if ?> value="1"/><label for="hideterm">Hide 
+      terminated branches</label>
+   </div>
-  </fieldset>
-  <div class="buttons">

svncchelpersscript/0.10/revtree/revtree/view.py

@@ -55 +55 @@
-        return self._changeset.revision
-
+    def branchname(self):
+        """Returns the name of the branch the changset belongs to"""
+        return self._changeset.branchname
+
-    def operation_widget(self):
-        """Provides the operation widget, i.e. the widget representation
@@ -98 +102 @@
-        return "none"
-
-
-
+, linkparent=False
+changeset 
-        url = "%s/changeset/%d" % (self._grapher.urlbase(), \
-                                   self._changeset.revision)
+        if linkparent:
+            url = "javascript:window.parent.location.href='%s'" % url
-        log = self._changeset.log.replace('[[BR]]',' ').replace('\n',' ')
-        log = log.replace('"',"'").replace('  ',' ')
@@ -161 +167 @@
-        return self._branch
-
-render(self, revrange=None, reverse=Fals
-Returns a Graphviz representation of the widget
+is_active(self, revrang
+Tells whether the branch still exist in the upper revision
-        changesets = self._branch.changesets()
-        inrngchgs = [c for c in changesets if self._inrange(c.revision, revrange)]
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  for c in inrngchgs]
-        if not items:
@@ -177 +196 @@
-                representation += "  %s\n" % transitions
-        
-len(inrngchgs) > 1 or inrngchgs[0].operation != Changeset.KILL
+self.is_active(revrange)
-            url = "%s/browser%s%s" % (self._grapher.urlbase(), 
-                                      self._branch.name(), 
-                                      inrngchgs[-1].topdir)
+            if linkparent:
+                url = "javascript:window.parent.location.href='%s'" % url
-            if inrngchgs[-1].operation == Changeset.KILL and \
-               len(inrngchgs) > 1:
@@ -247 +268 @@
-        # Environment
-        self.env = env
-
-
+
+
+
-        # Destination changeset (final end point of the changeset)
-        self._dst = dst
@@ -270 +292 @@
-
-    def render(self, revrange=None, reverse=False):
-
+operation 
-        if revrange:
-            src = [chg for chg in self._src if \
@@ -369 +391 @@
-            self._branch_widgets[b] = branchwdgt
-
-
+, hidetermbranch=False, linkparent=False
-        """Returns the graphviz data"""
-        gviz = 'digraph versiontree {\n'
@@ -377 +399 @@
-                'margin="0.05,0.05"]\n'
-        branchnames = []
-
-
+
+
+
+
+
+
+
-            brname = bwdgt.branch().name()
-            if brname not in branchnames:
-                branchnames.append(brname)
-self._branch_widgets.values()
+branchwidgets
-                        if brwdgt.is_visible(self._revrange)]
-        gviz += '{ rank = same; %s }' % '; '.join(rankbranches)
@@ -391 +418 @@
-                if revision < rmin or revision > rmax:
-                    continue
+            if hidetermbranch:
+                # check whether the branch of the destination widget
+                # is still active
+                branch = self.repository().branch(cwdgt.branchname())
+                if branch:
+                    chgsets = branch.changesets()
+                    if chgsets:
+                        if chgsets[-1].operation == Changeset.KILL:
+                            continue
-            opwdgt = cwdgt.operation_widget()
-            if opwdgt:
-
+
+
+
+
+
-                if [name for name in branchnames \
-                    for srcname in srcnames if name == srcname]:

svncchelpersscript/0.10/revtree/revtree/web_ui.py

@@ -48 +48 @@
-        self['author'] = user or self.anyauthor
-        self['btup'] = '1'
+        self['hideterm'] = '1'
-        self['nocache'] = ''
-
@@ -53 +54 @@
-        """Returns the sequence of supported fields"""
-        return [ 'revmin', 'revmax', 'period', 'branch', 'author',
-
+, 'hideterm'
-        
-    def load(self, session):
@@ -91 +92 @@
-            self.revrange = (int(self['revmin']), int(self['revmax']))
-        elif self['limits'] == 'limperiod':
-
-
+
+
+
+
+
-        else:
-            self.revrange = self.revspan
-        self.env.log.debug("REVRANGE %d:%d" %
-                           (self.revrange[0], self.revrange[1]))
-
-    def can_be_rendered(self):
@@ -286 +288 @@
-    def _get_cache_name(self, revtree):
-        """Generates a unique filename for the current revtree"""
-
-
-
-
-
+
+
+
+
+
+
-        sha_key  = sha.new(id).hexdigest()
-        img_name = '%s.revtree' % (sha_key)
@@ -360 +363 @@
-            props['branches'] = branches
-            props['authors'] = authors
-img\sid
+object data
-            mo = image_re.search(content)
-            if mo:
@@ -413 +416 @@
-        if revtree['author'] != revtree.anyauthor:
-            authfilter = revtree['author']
-        self.env.log.debug("brnames: %s" % brnames)
-        self.env.log.debug("authors: %s" % authors)
-        self.env.log.debug("revtree branch: %s (%s)" % (revtree['branch'], revtree.anybranch))
-        self.env.log.debug("revtree author: %s (%s)" % (revtree['author'], revtree.anyauthor))
-        self.env.log.debug("brfilter: %s" % brfilter)
-        self.env.log.debug("authfilter: %s" % authfilter)
-        self.env.log.debug("btup: %s" % revtree['btup'])
-        for b in brnames:
-            if brfilter and brfilter != b:
@@ -429 +425 @@
-            gvizbranches = trunks
-            gvizbranches.extend(branches)
-        self.env.log.debug("gvizbranches: %s" % gvizbranches)
-        repwdgt = RepositoryWidget(self.env, repos, req.base_url)
-        repwdgt.build(revtree.revrange, gvizbranches, authors)        
-
+
+
+
-        macro = 'graphviz.%s/%s' % (self.image_engine, img_kind)
-        wiki = WikiSystem(self.env)

svncchelpersscript/0.10/revtree/setup.py

@@ -16 +16 @@
-
-PACKAGE = 'TracRevisionTree'
-2.7
+3.0
-
-setup(