~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/diff.py

Committer: Robert Collins
Date: 2005-09-15 17:48:08 UTC
mfrom: (1185.2.19)
mto: (1185.41.1 bzr.sftp) (1092.3.4) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050915174807-7c2e9af156dae948

lalos branch constructor patch

added added

removed removed

161

import sys

162

output = sys.stdout

163

164

if revision == None:

164

if revision is None:

165

old_tree = b.basis_tree()

166

else:

167

old_tree = b.revision_tree(b.lookup_revision(revision))

167

old_tree = b.revision_tree(revision.in_history(b).rev_id)

168

169

if revision2 == None:

169

if revision2 is None:

170

new_tree = b.working_tree()

171

else:

172

new_tree = b.revision_tree(b.lookup_revision(revision2))

172

new_tree = b.revision_tree(revision2.in_branch(b).rev_id)

173

174

show_diff_trees(old_tree, new_tree, output, specific_files,

175

external_diff_options)