/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: Jelmer Vernooij
  • Date: 2018-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
3459
3459
        relpath = rev_tree.id2path(actual_file_id)
3460
3460
        if filtered:
3461
3461
            from .filter_tree import ContentFilterTree
3462
 
            filter_tree = ContentFilterTree(rev_tree,
3463
 
                                            rev_tree._content_filter_stack)
3464
 
            fileobj = filter_tree.get_file(relpath, actual_file_id)
 
3462
            filter_tree = ContentFilterTree(
 
3463
                rev_tree, rev_tree._content_filter_stack)
 
3464
            fileobj = filter_tree.get_file(relpath)
3465
3465
        else:
3466
 
            fileobj = rev_tree.get_file(relpath, actual_file_id)
 
3466
            fileobj = rev_tree.get_file(relpath)
3467
3467
        shutil.copyfileobj(fileobj, self.outf)
3468
3468
        self.cleanup_now()
3469
3469
 
5278
5278
            # If there is a tree and we're not annotating historical
5279
5279
            # versions, annotate the working tree's content.
5280
5280
            annotate_file_tree(wt, relpath, self.outf, long, all,
5281
 
                               show_ids=show_ids, file_id=file_id)
 
5281
                               show_ids=show_ids)
5282
5282
        else:
5283
5283
            annotate_file_tree(tree, relpath, self.outf, long, all,
5284
 
                               show_ids=show_ids, branch=branch, file_id=file_id)
 
5284
                               show_ids=show_ids, branch=branch)
5285
5285
 
5286
5286
 
5287
5287
class cmd_re_sign(Command):
5702
5702
 
5703
5703
    def run(self, tree):
5704
5704
        containing_tree, subdir = WorkingTree.open_containing(tree)
5705
 
        sub_id = containing_tree.path2id(subdir)
5706
 
        if sub_id is None:
 
5705
        if not containing_tree.is_versioned(subdir):
5707
5706
            raise errors.NotVersionedError(subdir)
5708
5707
        try:
5709
 
            containing_tree.extract(subdir, sub_id)
 
5708
            containing_tree.extract(subdir)
5710
5709
        except errors.RootNotRich:
5711
5710
            raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
5712
5711