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

@@ @@ -141,14 +141,15 @@ def _colored(repo, dag): @@
         # Add edges to the graph
         edges = []
         for ecol, ep in enumerate(row):
             if ep in nextrow:
                 edges.append((ecol, nextrow.index(ep), colors[ep]))
             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

@@ @@ -658,24 +658,28 @@ class BaseChangeset(object): @@
         data = get_dict_for_attrs(self, ['id', 'raw_id', 'short_id',
             'revision', 'date', 'message'])
         data['author'] = {'name': self.author_name, 'email': self.author_email}
         data['added'] = [node.path for node in self.added]
         data['changed'] = [node.path for node in self.changed]
         data['removed'] = [node.path for node in self.removed]
         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
     """
     def __init__(self, repository):
         self.repository = repository
     def get_branch(self):
         """

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

➞

Show inline comments

@@ @@ -34,24 +34,28 @@ class MercurialChangeset(BaseChangeset): @@
     def tags(self):
         return map(safe_unicode, self._ctx.tags())
     @LazyProperty
     def branch(self):
         return  safe_unicode(self._ctx.branch())
     @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())
     @LazyProperty
     def committer(self):
         return safe_unicode(self.author)
     @LazyProperty

kallithea/public/js/graph.js

➞

Show inline comments

@@ @@ -96,24 +96,25 @@ function BranchRenderer(canvas_id, conte @@
 			var row = document.getElementById(row_id_prefix+idx);
 			if (row == null) {
 				console.log("error: row "+row_id_prefix+idx+" not found");
 				continue;
+			}
 			var next = document.getElementById(row_id_prefix+(idx+1));
 			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];
 				start = line[0];
 				end = line[1];
 				color = line[2];
 				x = Math.floor(base_x - box_size * start);
@@ @@ -169,29 +170,42 @@ function BranchRenderer(canvas_id, conte @@
 					var ymid = (rowY+nextY) / 2;
 					this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,nextY);
+				}
 				this.ctx.stroke();
+			}
 			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)