/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2009-10-19 18:16:56 UTC
  • mfrom: (4757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4833.
  • Revision ID: jelmer@samba.org-20091019181656-b1gy3j0a2u7h2gcv
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
431
431
        for node in bt.iter_all_entries():
432
432
            # Node is made up of:
433
433
            # (index, key, value, [references])
434
 
            self.outf.write('%s\n' % (node[1:],))
 
434
            refs_as_tuples = tuple([tuple([tuple(ref) for ref in ref_list])
 
435
                                   for ref_list in node[3]])
 
436
            as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
 
437
            self.outf.write('%s\n' % (as_tuple,))
435
438
 
436
439
 
437
440
class cmd_remove_tree(Command):
1885
1888
    @display_command
1886
1889
    def run(self, revision=None, file_list=None, diff_options=None,
1887
1890
            prefix=None, old=None, new=None, using=None):
1888
 
        from bzrlib.diff import _get_trees_to_diff, show_diff_trees
 
1891
        from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1889
1892
 
1890
1893
        if (prefix is None) or (prefix == '0'):
1891
1894
            # diff -p0 format
1905
1908
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1906
1909
                                         ' one or two revision specifiers')
1907
1910
 
1908
 
        old_tree, new_tree, specific_files, extra_trees = \
1909
 
                _get_trees_to_diff(file_list, revision, old, new,
1910
 
                apply_view=True)
 
1911
        (old_tree, new_tree,
 
1912
         old_branch, new_branch,
 
1913
         specific_files, extra_trees) = get_trees_and_branches_to_diff(
 
1914
            file_list, revision, old, new, apply_view=True)
1911
1915
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1912
1916
                               specific_files=specific_files,
1913
1917
                               external_diff_options=diff_options,