← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 07:05:50 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20050919070550-40cde8bfdeeb72fa
reverted to using branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
148
148
    greedy_fetch(branch, other_branch)
149
149
    revision_a = branch.last_patch()
150
150
    revision_b = other_branch.last_patch()
151
 
    source = MultipleRevisionSources(branch)
152
151
    try:
153
152
        root, ancestors, descendants, common = \
154
 
            combined_graph(revision_a, revision_b, source)
 
153
            combined_graph(revision_a, revision_b, branch)
155
154
    except bzrlib.errors.NoCommonRoot:
156
155
        raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
157
156
    distances = node_distances(descendants, ancestors, root)
158
157
    base = select_farthest(distances, common)
159
158
    n_history = branch.revision_history()
160
 
    m_history = other_branch.revision_history()
 
159
    m_history = []
161
160
    dot_nodes = {}
162
161
    def dot_node(node, num):
163
162
        try:
199
198
            color = "#33ff99"
200
199
 
201
200
        label = [name]
202
 
        committer = get_committer(node, source)
 
201
        committer = get_committer(node, branch)
203
202
        if committer is not None:
204
203
            label.append(committer)
205
204