/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: 2019-01-01 23:40:59 UTC
  • mfrom: (7206.6.8 move-reconcile)
  • Revision ID: breezy.the.bot@gmail.com-20190101234059-g2aoc3whzh3zkppv
Move bzr-specific reconcile bits to breezy.bzr.reconcile.

Merged from https://code.launchpad.net/~jelmer/brz/move-reconcile-1/+merge/359941

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
5224
5224
        tree = _get_one_revision_tree('annotate', revision, branch=branch)
5225
5225
        self.add_cleanup(tree.lock_read().unlock)
5226
5226
        if wt is not None and revision is None:
5227
 
            file_id = wt.path2id(relpath)
5228
 
        else:
5229
 
            file_id = tree.path2id(relpath)
5230
 
        if file_id is None:
5231
 
            raise errors.NotVersionedError(filename)
5232
 
        if wt is not None and revision is None:
 
5227
            if not wt.is_versioned(relpath):
 
5228
                raise errors.NotVersionedError(relpath)
5233
5229
            # If there is a tree and we're not annotating historical
5234
5230
            # versions, annotate the working tree's content.
5235
5231
            annotate_file_tree(wt, relpath, self.outf, long, all,
5236
5232
                               show_ids=show_ids)
5237
5233
        else:
 
5234
            if not tree.is_versioned(relpath):
 
5235
                raise errors.NotVersionedError(relpath)
5238
5236
            annotate_file_tree(tree, relpath, self.outf, long, all,
5239
5237
                               show_ids=show_ids, branch=branch)
5240
5238