← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-04-27 20:40:28 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060427204028-3da252d058d4a9d2
builtins now use urlfordisplay to display nicer paths to the user.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
37
37
from bzrlib.log import show_one_log
38
38
from bzrlib.merge import Merge3Merger
39
39
from bzrlib.option import Option
 
40
import bzrlib.osutils
40
41
from bzrlib.progress import DummyProgress, ProgressPhase
41
42
from bzrlib.revisionspec import RevisionSpec
42
43
import bzrlib.trace
424
425
            if stored_loc is None:
425
426
                raise BzrCommandError("No pull location known or specified.")
426
427
            else:
427
 
                self.outf.write("Using saved location: %s\n" % stored_loc)
 
428
                self.outf.write("Using saved location: %s\n" 
 
429
                    % bzrlib.osutils.urlfordisplay(stored_loc))
428
430
                location = stored_loc
429
431
 
430
432
        branch_from = Branch.open(location)
501
503
            if stored_loc is None:
502
504
                raise BzrCommandError("No push location known or specified.")
503
505
            else:
504
 
                self.outf.write("Using saved location: %s" % stored_loc)
 
506
                self.outf.write("Using saved location: %s" 
 
507
                    % bzrlib.osutils.urlfordisplay(stored_loc))
505
508
                location = stored_loc
506
509
 
507
510
        transport = get_transport(location)
1950
1953
            if stored_loc is None:
1951
1954
                raise BzrCommandError("No merge branch known or specified.")
1952
1955
            else:
1953
 
                print "Using saved branch: %s" % stored_loc
 
1956
                print (u"Using saved branch: %s" 
 
1957
                    % bzrlib.osutils.urlfordisplay(stored_loc))
1954
1958
                branch = stored_loc
1955
1959
 
1956
1960
        if revision is None or len(revision) < 1: