/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: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/status.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import sys
18
20
 
19
21
from . import (
137
139
            try:
138
140
                old = revision[0].as_tree(wt.branch)
139
141
            except errors.NoSuchRevision as e:
140
 
                raise errors.CommandError(str(e))
 
142
                raise errors.BzrCommandError(str(e))
141
143
            if (len(revision) > 1) and (revision[1].spec is not None):
142
144
                try:
143
145
                    new = revision[1].as_tree(wt.branch)
144
146
                    new_is_working_tree = False
145
147
                except errors.NoSuchRevision as e:
146
 
                    raise errors.CommandError(str(e))
 
148
                    raise errors.BzrCommandError(str(e))
147
149
            else:
148
150
                new = wt
149
151
        with old.lock_read(), new.lock_read():