/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 breezy/builtins.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
3427
3427
            from .filter_tree import ContentFilterTree
3428
3428
            filter_tree = ContentFilterTree(rev_tree,
3429
3429
                rev_tree._content_filter_stack)
3430
 
            fileobj = filter_tree.get_file(relpath, actual_file_id)
 
3430
            fileobj = filter_tree.get_file(relpath)
3431
3431
        else:
3432
 
            fileobj = rev_tree.get_file(relpath, actual_file_id)
 
3432
            fileobj = rev_tree.get_file(relpath)
3433
3433
        shutil.copyfileobj(fileobj, self.outf)
3434
3434
        self.cleanup_now()
3435
3435
 
5235
5235
            # If there is a tree and we're not annotating historical
5236
5236
            # versions, annotate the working tree's content.
5237
5237
            annotate_file_tree(wt, relpath, self.outf, long, all,
5238
 
                show_ids=show_ids, file_id=file_id)
 
5238
                               show_ids=show_ids)
5239
5239
        else:
5240
5240
            annotate_file_tree(tree, relpath, self.outf, long, all,
5241
 
                show_ids=show_ids, branch=branch, file_id=file_id)
 
5241
                               show_ids=show_ids, branch=branch)
5242
5242
 
5243
5243
 
5244
5244
class cmd_re_sign(Command):
5648
5648
 
5649
5649
    def run(self, tree):
5650
5650
        containing_tree, subdir = WorkingTree.open_containing(tree)
5651
 
        sub_id = containing_tree.path2id(subdir)
5652
 
        if sub_id is None:
 
5651
        if not containing_tree.is_versioned(subdir):
5653
5652
            raise errors.NotVersionedError(subdir)
5654
5653
        try:
5655
 
            containing_tree.extract(subdir, sub_id)
 
5654
            containing_tree.extract(subdir)
5656
5655
        except errors.RootNotRich:
5657
5656
            raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
5658
5657