/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to branchwin.py

  • Committer: Robert Collins
  • Date: 2006-03-29 17:40:50 UTC
  • mto: (36.1.1 bzrk.jaq)
  • mto: This revision was merged to the branch mainline in revision 38.
  • Revision ID: robertc@robertcollins.net-20060329174050-46d95d48c9f61743
Make revision sorting and linking use merge_sorted from latest bzr.dev. This
gives a much nicer layout with features such as 'fully merged branches' not
being inappropriately shown as active - rather then point the branch is 
resurrected has its merge from mainline linked. This leads to a narrow,
more understandable view, and much less cross-hatch cases - perhaps none in 
fact.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchwin.py
238
238
 
239
239
        return vbox
240
240
 
241
 
    def set_branch(self, branch, start, robust, accurate, maxnum):
 
241
    def set_branch(self, branch, start, robust, maxnum):
242
242
        """Set the branch and start position for this window.
243
243
 
244
244
        Creates a new TreeModel and populates it with information about
257
257
        index = 0
258
258
 
259
259
        last_lines = []
260
 
        (revids, self.revisions, colours, self.children, self.parent_ids) \
261
 
                 = distances(branch, start, robust, accurate, maxnum)
 
260
        (self.revisions, colours, self.children, self.parent_ids, merge_sorted) \
 
261
                 = distances(branch, start, robust, maxnum)
262
262
        for revision, node, lines in graph(
263
 
                revids, self.revisions, colours, self.parent_ids):
 
263
                self.revisions, colours, self.parent_ids, merge_sorted):
264
264
            message = revision.message.split("\n")[0]
265
265
            if revision.committer is not None:
266
266
                timestamp = format_date(revision.timestamp, revision.timezone)
267
267
            else:
268
268
                timestamp = None
269
 
 
270
269
            self.model.append([ revision, node, last_lines, lines,
271
270
                                message, revision.committer, timestamp ])
272
271
            self.index[revision] = index