/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/status.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/status.py
137
137
            try:
138
138
                old = revision[0].as_tree(wt.branch)
139
139
            except errors.NoSuchRevision as e:
140
 
                raise errors.BzrCommandError(str(e))
 
140
                raise errors.CommandError(str(e))
141
141
            if (len(revision) > 1) and (revision[1].spec is not None):
142
142
                try:
143
143
                    new = revision[1].as_tree(wt.branch)
144
144
                    new_is_working_tree = False
145
145
                except errors.NoSuchRevision as e:
146
 
                    raise errors.BzrCommandError(str(e))
 
146
                    raise errors.CommandError(str(e))
147
147
            else:
148
148
                new = wt
149
149
        with old.lock_read(), new.lock_read():