~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-09 12:34:00 UTC
  • mfrom: (6056.2.5 option-registry)
  • Revision ID: pqm@pqm.ubuntu.com-20110809123400-x521f2j9jkxx8ze2
(vila) Introduce OptionRegistry (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1195
1195
            else:
1196
1196
                display_url = urlutils.unescape_for_display(stored_loc,
1197
1197
                        self.outf.encoding)
1198
 
                note("Using saved push location: %s" % display_url)
 
1198
                self.outf.write("Using saved push location: %s\n" % display_url)
1199
1199
                location = stored_loc
1200
1200
 
1201
1201
        _show_push_branch(br_from, revision_id, location, self.outf,
3328
3328
                    raise errors.BzrCommandError("please specify a commit"
3329
3329
                        " message with either --message or --file")
3330
3330
            if my_message == "":
3331
 
                raise errors.BzrCommandError("Empty commit message specified."
3332
 
                        " Please specify a commit message with either"
3333
 
                        " --message or --file or leave a blank message"
3334
 
                        " with --message \"\".")
 
3331
                raise errors.BzrCommandError("empty commit message specified")
3335
3332
            return my_message
3336
3333
 
3337
3334
        # The API permits a commit with a filter of [] to mean 'select nothing'