← Back to branch summary

~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: 2008-03-06 17:13:00 UTC
  • mfrom: (3249.2.2 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080306171300-yr2n8r9w4a4ettbo
Fix merge redirection when remembered location used - tweak tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3008
3008
        mutter("%s", stored_location)
3009
3009
        if stored_location is None:
3010
3010
            raise errors.BzrCommandError("No location specified or remembered")
3011
 
        display_url = urlutils.unescape_for_display(stored_location,
3012
 
            self.outf.encoding)
3013
 
        self.outf.write("%s remembered location %s\n" % (verb_string,
3014
 
            display_url))
 
3011
        display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
 
3012
        note(u"%s remembered location %s", verb_string, display_url)
3015
3013
        return stored_location
3016
3014
 
3017
3015