← 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-21 05:34:13 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060221053413-8c798afd3a32ccb1
Fixed last step of push

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
19
19
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
20
from bzrlib.branch import Branch
21
21
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
 
22
from bzrlib.fetch import greedy_fetch
22
23
from bzrlib.graph import node_distances, select_farthest
23
24
from bzrlib.revision import combined_graph, revision_graph
24
25
from bzrlib.revision import MultipleRevisionSources
111
112
        self.other_branch = other_branch
112
113
        revision_a = self.branch.last_revision()
113
114
        if other_branch is not None:
114
 
            branch.fetch(other_branch)
 
115
            greedy_fetch(branch, other_branch)
115
116
            revision_b = self.other_branch.last_revision()
116
117
            try:
117
118
                self.root, self.ancestors, self.descendants, self.common = \
272
273
    elif ext == 'dot' and not done:
273
274
        my_file = file(filename, 'wb')
274
275
        for fragment in output:
275
 
            my_file.write(fragment.encode('utf-8'))
 
276
            my_file.write(fragment)
276
277
    elif ext == 'html':
277
278
        try:
278
279
            invoke_dot_html(output, filename)