← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2006-02-01 04:28:35 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060201042835-0ff0d7af60662f20
Fixed graph-ancestry

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
116
116
            revision_b = self.other_branch.last_revision()
117
117
            try:
118
118
                self.root, self.ancestors, self.descendants, self.common = \
119
 
                    combined_graph(revision_a, revision_b, self.branch)
 
119
                    combined_graph(revision_a, revision_b,
 
120
                                   self.branch.repository)
120
121
            except bzrlib.errors.NoCommonRoot:
121
122
                raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
122
123
        else:
123
124
            self.root, self.ancestors, self.descendants = \
124
 
                revision_graph(revision_a, branch)
 
125
                revision_graph(revision_a, branch.repository)
125
126
            self.common = []
126
127
 
127
128
        self.n_history = branch.revision_history()
174
175
            color = "#33ff99"
175
176
 
176
177
        label = [name]
177
 
        committer, message, date = get_rev_info(node, self.branch)
 
178
        committer, message, date = get_rev_info(node, self.branch.repository)
178
179
        if committer is not None:
179
180
            label.append(committer)
180
181
 
232
233
        m = Branch.open_containing(merge_branch)[0]
233
234
    else:
234
235
        m = None
235
 
    b.lock_read()
 
236
    b.lock_write()
236
237
    try:
237
238
        if m is not None:
238
239
            m.lock_read()