/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-25 20:44:56 UTC
  • mto: This revision was merged to the branch mainline in revision 7231.
  • Revision ID: jelmer@jelmer.uk-20181125204456-jm9k22rbl9n22ayj
Drop file_id from record_iter_changes return value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
5269
5269
        tree = _get_one_revision_tree('annotate', revision, branch=branch)
5270
5270
        self.add_cleanup(tree.lock_read().unlock)
5271
5271
        if wt is not None and revision is None:
5272
 
            file_id = wt.path2id(relpath)
5273
 
        else:
5274
 
            file_id = tree.path2id(relpath)
5275
 
        if file_id is None:
5276
 
            raise errors.NotVersionedError(filename)
5277
 
        if wt is not None and revision is None:
 
5272
            if not wt.is_versioned(relpath):
 
5273
                raise errors.NotVersionedError(relpath)
5278
5274
            # If there is a tree and we're not annotating historical
5279
5275
            # versions, annotate the working tree's content.
5280
5276
            annotate_file_tree(wt, relpath, self.outf, long, all,
5281
5277
                               show_ids=show_ids)
5282
5278
        else:
 
5279
            if not tree.is_versioned(relpath):
 
5280
                raise errors.NotVersionedError(relpath)
5283
5281
            annotate_file_tree(tree, relpath, self.outf, long, all,
5284
5282
                               show_ids=show_ids, branch=branch)
5285
5283