~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: 2010-03-29 06:37:23 UTC
  • mfrom: (5106.2.2 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20100329063723-tbei64isc40zz7v8
(mbp) avoid truncating svn urls

Show diffs side-by-side

added added

removed removed

Lines of Context:
1428
1428
            branch_location = tree.branch.base
1429
1429
        self.add_cleanup(tree.unlock)
1430
1430
        # get rid of the final '/' and be ready for display
1431
 
        branch_location = urlutils.unescape_for_display(branch_location[:-1],
1432
 
                                                        self.outf.encoding)
 
1431
        branch_location = urlutils.unescape_for_display(
 
1432
            branch_location.rstrip('/'),
 
1433
            self.outf.encoding)
1433
1434
        existing_pending_merges = tree.get_parent_ids()[1:]
1434
1435
        if master is None:
1435
1436
            old_tip = None