kallithea Changeset - 64659280e466

Changeset - 64659280e466

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Sean Farley - 11 years ago 2014-07-09 07:35:54
sean.michael.farley@gmail.com

graph: show obsolete changesets with an 'X'

4 files changed with 25 insertions and 2 deletions:

kallithea/lib/graphmod.py

kallithea/lib/vcs/backends/base.py

kallithea/lib/vcs/backends/hg/changeset.py

kallithea/public/js/graph.js

0 comments (0 inline, 0 general)

kallithea/lib/graphmod.py

➞

Show inline comments

@@ @@ -147,8 +147,9 @@ def _colored(repo, dag): @@
             elif ep == rev:
                 for p in dagparents:
                     edges.append((ecol, nextrow.index(p), colors[p]))
         # Yield and move on
         closing = int(repo[rev].closesbranch)
         yield ((col, color), edges, closing)
         obsolete = int(repo[rev].obsolete)
         yield ((col, color), edges, closing, obsolete)
         row = nextrow

kallithea/lib/vcs/backends/base.py

➞

Show inline comments

@@ @@ -664,12 +664,16 @@ class BaseChangeset(object): @@
         return data
     @LazyProperty
     def closesbranch(self):
         return False
     @LazyProperty
     def obsolete(self):
         return False
 class BaseWorkdir(object):
     """
     Working directory representation of single repository.
     :attribute: repository: repository object of working directory
     """

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -40,12 +40,16 @@ class MercurialChangeset(BaseChangeset): @@
     @LazyProperty
     def closesbranch(self):
         return  self._ctx.closesbranch()
     @LazyProperty
     def obsolete(self):
         return  self._ctx.obsolete()
     @LazyProperty
     def bookmarks(self):
         return map(safe_unicode, self._ctx.bookmarks())
     @LazyProperty
     def message(self):
         return safe_unicode(self._ctx.description())

kallithea/public/js/graph.js

➞

Show inline comments

@@ @@ -102,12 +102,13 @@ function BranchRenderer(canvas_id, conte @@
 			var extra = 0;
 			cur = data[i];
 			node = cur[0];
 			in_l = cur[1];
 			closing = cur[2];
 			obsolete_node = cur[3];
 			var rowY = row.offsetTop + row.offsetHeight/2;
 			var nextY = (next == null) ? rowY + row.offsetHeight/2 : next.offsetTop + next.offsetHeight/2;
 			for (var j in in_l) {
 				line = in_l[j];
@@ @@ -175,20 +176,33 @@ function BranchRenderer(canvas_id, conte @@
 			column = node[0];
 			color = node[1];
 			x = Math.floor(base_x - box_size * column);
 			this.setColor(color, 0.25, 0.75);
 			r = this.dot_radius
 			if (obsolete_node)
+			{
 				this.ctx.beginPath();
 				this.ctx.moveTo(x - this.close_x, rowY - this.close_y - 3);
 				this.ctx.lineTo(x - this.close_x + 2*this.close_x, rowY - this.close_y + 4*this.close_y - 1);
 				this.ctx.moveTo(x - this.close_x, rowY - this.close_y + 4*this.close_y - 1);
 				this.ctx.lineTo(x - this.close_x + 2*this.close_x, rowY - this.close_y - 3);
 				this.ctx.stroke();
 				r -= 0.5
+			}
 			if (closing)
+			{
 				this.ctx.fillRect(x - this.close_x, rowY - this.close_y, 2*this.close_x, 2*this.close_y);
+			}
 			else
+			{
 				this.ctx.beginPath();
-				this.ctx.arc(x, rowY, this.dot_radius, 0, Math.PI * 2, true);
+				this.ctx.arc(x, rowY, r, 0, Math.PI * 2, true);
 				this.ctx.fill();
+			}
 			idx++;
+		}

0 comments (0 inline, 0 general)