/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/plugins/upload/cmds.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/plugins/upload/cmds.py
446
446
            self.set_uploaded_revid(self.rev_id)
447
447
 
448
448
 
449
 
class CannotUploadToWorkingTree(errors.BzrCommandError):
 
449
class CannotUploadToWorkingTree(errors.CommandError):
450
450
 
451
451
    _fmt = 'Cannot upload to a bzr managed working tree: %(url)s".'
452
452
 
453
453
 
454
 
class DivergedUploadedTree(errors.BzrCommandError):
 
454
class DivergedUploadedTree(errors.CommandError):
455
455
 
456
456
    _fmt = ("Your branch (%(revid)s)"
457
457
            " and the uploaded tree (%(uploaded_revid)s) have diverged: ")
510
510
            if location is None:
511
511
                stored_loc = conf.get('upload_location')
512
512
                if stored_loc is None:
513
 
                    raise errors.BzrCommandError(
 
513
                    raise errors.CommandError(
514
514
                        'No upload location known or specified.')
515
515
                else:
516
516
                    # FIXME: Not currently tested
538
538
                rev_id = branch.last_revision()
539
539
            else:
540
540
                if len(revision) != 1:
541
 
                    raise errors.BzrCommandError(
 
541
                    raise errors.CommandError(
542
542
                        'bzr upload --revision takes exactly 1 argument')
543
543
                rev_id = revision[0].in_history(branch).rev_id
544
544