← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
17
17
from bzrlib.delta import compare_trees
18
18
from bzrlib.errors import BzrError
19
19
from bzrlib.trace import mutter
20
 
from bzrlib.workingtree import WorkingTree
21
20
 
22
21
# TODO: Rather than building a changeset object, we should probably
23
22
# invoke callbacks on an object.  That object can either accumulate a
160
159
        output = sys.stdout
161
160
 
162
161
    if from_spec is None:
163
 
        old_tree = WorkingTree(b.base, b)
 
162
        old_tree = b.bzrdir.open_workingtree()
164
163
        if b2 is None:
165
164
            old_tree = old_tree = old_tree.basis_tree()
166
165
    else:
168
167
 
169
168
    if revision2 is None:
170
169
        if b2 is None:
171
 
            new_tree = WorkingTree(b.base, b)
 
170
            new_tree = b.bzrdir.open_workingtree()
172
171
        else:
173
 
            new_tree = WorkingTree(b2.base, b2)
 
172
            new_tree = b2.bzrdir.open_workingtree()
174
173
    else:
175
174
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
176
175