Rev 6085: (jelmer) Format URLs for display when printing them inside 'bzr upgrade'. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Aug 20 03:12:56 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6085 [merge]
revision-id: pqm at pqm.ubuntu.com-20110820031245-5e0bpa72b333273n
parent: pqm at pqm.ubuntu.com-20110819234346-skoz7yvpd5watlmj
parent: jelmer at samba.org-20110819193639-q2htdpaiqnu6d1ef
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-08-20 03:12:45 +0000
message:
(jelmer) Format URLs for display when printing them inside 'bzr upgrade'.
(Jelmer Vernooij)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2011-08-08 16:28:55 +0000
+++ b/bzrlib/bzrdir.py 2011-08-17 09:27:29 +0000
@@ -634,8 +634,9 @@
old_path = self.root_transport.abspath('.bzr')
backup_dir = self._available_backup_name('backup.bzr')
new_path = self.root_transport.abspath(backup_dir)
- ui.ui_factory.note('making backup of %s\n to %s'
- % (old_path, new_path,))
+ ui.ui_factory.note('making backup of %s\n to %s' % (
+ urlutils.unescape_for_display(old_path, 'utf-8'),
+ urlutils.unescape_for_display(new_path, 'utf-8')))
self.root_transport.copy_tree('.bzr', backup_dir)
return (old_path, new_path)
finally:
=== modified file 'bzrlib/tests/blackbox/test_update.py'
--- a/bzrlib/tests/blackbox/test_update.py 2011-06-10 08:11:44 +0000
+++ b/bzrlib/tests/blackbox/test_update.py 2011-08-16 14:07:34 +0000
@@ -18,14 +18,12 @@
"""Tests for the update command of bzr."""
import os
-import re
from bzrlib import (
branch,
bzrdir,
osutils,
tests,
- urlutils,
workingtree,
)
from bzrlib.tests.script import ScriptRunner
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- a/bzrlib/tests/blackbox/test_upgrade.py 2011-08-12 13:04:56 +0000
+++ b/bzrlib/tests/blackbox/test_upgrade.py 2011-08-19 19:36:39 +0000
@@ -23,6 +23,7 @@
controldir,
lockable_files,
ui,
+ urlutils,
)
from bzrlib.tests import (
features,
@@ -100,12 +101,12 @@
# when upgrading a checkout, the branch location and a suggestion
# to upgrade it should be emitted even if the checkout is up to
# date
- burl = self.get_transport('current_format_branch').base
- curl = self.get_transport('current_format_checkout').base
+ burl = self.get_transport('current_format_branch').local_abspath(".")
+ curl = self.get_transport('current_format_checkout').local_abspath(".")
(out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
self.assertEqual(
- 'Upgrading branch %s ...\nThis is a checkout.'
- ' The branch (%s) needs to be upgraded separately.\n'
+ 'Upgrading branch %s/ ...\nThis is a checkout.'
+ ' The branch (%s/) needs to be upgraded separately.\n'
% (curl, burl),
out)
msg = 'The branch format %s is already at the most recent format.' % (
@@ -139,19 +140,21 @@
# setup an old format branch we can upgrade from.
path = 'old_format_branch'
self.make_branch_and_tree(path, format=old_format)
- url = self.get_transport(path).base
+ transport = self.get_transport(path)
+ url = transport.base
+ display_url = transport.local_abspath('.')
# check --format takes effect
controldir.ControlDirFormat._set_default_format(old_format)
backup_dir = 'backup.bzr.~1~'
(out, err) = self.run_bzr(
['upgrade', '--format=2a', url])
- self.assertEqualDiff("""Upgrading branch %s ...
-starting upgrade of %s
-making backup of %s.bzr
- to %s%s
+ self.assertEqualDiff("""Upgrading branch %s/ ...
+starting upgrade of %s/
+making backup of %s/.bzr
+ to %s/%s
starting upgrade from old test format to 2a
finished
-""" % (url, url, url, url, backup_dir), out)
+""" % (display_url, display_url, display_url, display_url, backup_dir), out)
self.assertEqualDiff("", err)
self.assertTrue(isinstance(
bzrdir.BzrDir.open(self.get_url(path))._format,
@@ -161,19 +164,21 @@
# users can force an upgrade to knit format from a metadir pack 0.92
# branch to a 2a branch.
self.make_branch_and_tree('branch', format='knit')
- url = self.get_transport('branch').base
+ transport = self.get_transport('branch')
+ url = transport.base
+ display_url = transport.local_abspath('.')
# check --format takes effect
backup_dir = 'backup.bzr.~1~'
(out, err) = self.run_bzr(
['upgrade', '--format=pack-0.92', url])
- self.assertEqualDiff("""Upgrading branch %s ...
-starting upgrade of %s
-making backup of %s.bzr
- to %s%s
+ self.assertEqualDiff("""Upgrading branch %s/ ...
+starting upgrade of %s/
+making backup of %s/.bzr
+ to %s/%s
starting repository conversion
repository converted
finished
-""" % (url, url, url, url, backup_dir),
+""" % (display_url, display_url, display_url, display_url, backup_dir),
out)
self.assertEqualDiff("", err)
converted_dir = bzrdir.BzrDir.open(self.get_url('branch'))
@@ -224,6 +229,7 @@
self.make_branch_and_tree("old_format_branch", format="knit")
t = self.get_transport("old_format_branch")
url = t.base
+ display_url = t.local_abspath('.')
backup_dir1 = 'backup.bzr.~1~'
backup_dir2 = 'backup.bzr.~2~'
# explicitly create backup_dir1. bzr should create the .~2~ directory
@@ -231,14 +237,14 @@
t.mkdir(backup_dir1)
(out, err) = self.run_bzr(
['upgrade', '--format=2a', url])
- self.assertEqualDiff("""Upgrading branch %s ...
-starting upgrade of %s
-making backup of %s.bzr
- to %s%s
+ self.assertEqualDiff("""Upgrading branch %s/ ...
+starting upgrade of %s/
+making backup of %s/.bzr
+ to %s/%s
starting repository conversion
repository converted
finished
-""" % (url, url, url, url, backup_dir2), out)
+""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
self.assertEqualDiff("", err)
self.assertTrue(isinstance(
bzrdir.BzrDir.open(self.get_url("old_format_branch"))._format,
@@ -253,8 +259,10 @@
self.run_bzr('init --format=pack-0.92')
t = self.get_transport()
url = t.base
+ display_url = urlutils.unescape_for_display(url,
+ 'utf-8')
out, err = self.run_bzr(['upgrade', '--format=2a', url])
- backup_dir = 'backup.bzr.%7E1%7E'
+ backup_dir = 'backup.bzr.~1~'
self.assertEqualDiff("""Upgrading branch %s ...
starting upgrade of %s
making backup of %s.bzr
@@ -262,7 +270,7 @@
starting repository conversion
repository converted
finished
-""" % (url, url, url, url, backup_dir), out)
+""" % (display_url, display_url, display_url, display_url, backup_dir), out)
self.assertEqual('', err)
=== modified file 'bzrlib/upgrade.py'
--- a/bzrlib/upgrade.py 2011-05-18 16:42:48 +0000
+++ b/bzrlib/upgrade.py 2011-08-17 09:27:29 +0000
@@ -21,6 +21,7 @@
errors,
trace,
ui,
+ urlutils,
)
from bzrlib.bzrdir import (
BzrDir,
@@ -72,7 +73,8 @@
if branch.user_url != self.bzrdir.user_url:
ui.ui_factory.note(
'This is a checkout. The branch (%s) needs to be upgraded'
- ' separately.' % (branch.user_url,))
+ ' separately.' % (urlutils.unescape_for_display(
+ branch.user_url, 'utf-8')))
del branch
except (errors.NotBranchError, errors.IncompatibleRepositories):
# might not be a format we can open without upgrading; see e.g.
@@ -96,7 +98,8 @@
raise errors.BzrError("cannot upgrade from bzrdir format %s" %
self.bzrdir._format)
self.bzrdir.check_conversion_target(format)
- ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
+ ui.ui_factory.note('starting upgrade of %s' %
+ urlutils.unescape_for_display(self.transport.base, 'utf-8'))
self.backup_oldpath, self.backup_newpath = self.bzrdir.backup_bzrdir()
while self.bzrdir.needs_format_conversion(format):
@@ -274,7 +277,8 @@
bzr_object, bzr_label = _get_object_and_label(control_dir)
type_label = label or bzr_label
child_pb.update("Upgrading %s" % (type_label), i+1, len(items))
- ui.ui_factory.note('Upgrading %s %s ...' % (type_label, location,))
+ ui.ui_factory.note('Upgrading %s %s ...' % (type_label,
+ urlutils.unescape_for_display(location, 'utf-8'),))
try:
if not dry_run:
cv = Convert(control_dir=control_dir, format=format)
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt 2011-08-19 12:54:18 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2011-08-20 03:12:45 +0000
@@ -91,6 +91,9 @@
Entering an empty commit message in the message editor still triggers
an error. (Jelmer Vernooij)
+* Locations printed by ``bzr upgrade`` are now formatted before display.
+ (Jelmer Vernooij)
+
Bug Fixes
*********
More information about the bazaar-commits
mailing list