/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 bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-02 20:46:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060502204611-02caa5c20fb84ef8
Moved url functions into bzrlib.urlutils

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
44
44
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
45
45
from bzrlib.transport.local import LocalTransport
46
46
import bzrlib.ui
 
47
import bzrlib.urlutils as urlutils
47
48
from bzrlib.workingtree import WorkingTree
48
49
 
49
50
 
426
427
                raise BzrCommandError("No pull location known or specified.")
427
428
            else:
428
429
                self.outf.write("Using saved location: %s\n" 
429
 
                    % bzrlib.osutils.urlfordisplay(stored_loc))
 
430
                    % urlutils.unescape_for_display(stored_loc))
430
431
                location = stored_loc
431
432
 
432
433
        branch_from = Branch.open(location)
504
505
                raise BzrCommandError("No push location known or specified.")
505
506
            else:
506
507
                self.outf.write("Using saved location: %s" 
507
 
                    % bzrlib.osutils.urlfordisplay(stored_loc))
 
508
                    % urlutils.unescape_for_display(stored_loc))
508
509
                location = stored_loc
509
510
 
510
511
        transport = get_transport(location)
1954
1955
                raise BzrCommandError("No merge branch known or specified.")
1955
1956
            else:
1956
1957
                print (u"Using saved branch: %s" 
1957
 
                    % bzrlib.osutils.urlfordisplay(stored_loc))
 
1958
                    % urlutils.unescape_for_display(stored_loc))
1958
1959
                branch = stored_loc
1959
1960
 
1960
1961
        if revision is None or len(revision) < 1: