Rev 5567: (vila) Get rid of references to bazaar-vcs.org (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Dec 14 16:27:19 GMT 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5567 [merge]
revision-id: pqm at pqm.ubuntu.com-20101214162712-3tjnh2884hvsv616
parent: pqm at pqm.ubuntu.com-20101212230226-5qpi01ir8epiis70
parent: v.ladeuil+lp at free.fr-20101207090639-l77s4ix6oqqn76jx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-12-14 16:27:12 +0000
message:
(vila) Get rid of references to bazaar-vcs.org (Vincent Ladeuil)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/per_branch/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
tools/win32/bazaar.url bazaar.url-20060622100836-b3yup582rt3y0nvm-4
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/buildout.cfg buildout.cfg-20090529141919-d4paovt3buwxgjpd-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2010-12-02 10:41:05 +0000
+++ b/bzrlib/bzrdir.py 2010-12-07 09:06:39 +0000
@@ -1663,7 +1663,7 @@
utf8_files = [('README',
"This is a Bazaar control directory.\n"
"Do not change any files in this directory.\n"
- "See http://bazaar-vcs.org/ for more information about Bazaar.\n"),
+ "See http://bazaar.canonical.com/ for more information about Bazaar.\n"),
('branch-format', self.get_format_string()),
]
# NB: no need to escape relative paths that are url safe.
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt 2010-09-29 05:35:26 +0000
+++ b/bzrlib/help_topics/en/configuration.txt 2010-12-07 09:06:39 +0000
@@ -322,7 +322,7 @@
create_signatures = always
check_signatures = always
- [http://bazaar-vcs.org/bzr/*]
+ [http://example.com/bzr/*]
check_signatures = require
The authentication configuration file, authentication.conf
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py 2010-12-02 10:41:05 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py 2010-12-07 09:06:39 +0000
@@ -38,7 +38,7 @@
# The XMLRPC server address can be overridden by setting the environment
# variable $BZR_LP_XMLRPC_URL
-# see http://bazaar-vcs.org/Specs/BranchRegistrationTool
+# see http://wiki.bazaar.canonical.com/Specs/BranchRegistrationTool
# Since we are a built-in plugin we share the bzrlib version
from bzrlib import version_info
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py 2010-11-26 17:33:55 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2010-12-07 09:06:39 +0000
@@ -133,9 +133,6 @@
class TestBranchRegistration(TestCaseWithTransport):
- SAMPLE_URL = 'http://bazaar-vcs.org/bzr/bzr.dev/'
- SAMPLE_OWNER = 'jhacker at foo.com'
- SAMPLE_BRANCH_ID = 'bzr.dev'
def setUp(self):
super(TestBranchRegistration, self).setUp()
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py 2010-08-29 14:32:45 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py 2010-12-07 09:06:39 +0000
@@ -187,7 +187,7 @@
self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
# We can also set a specific parent, and it should be honored
- random_parent = 'http://bazaar-vcs.org/path/to/branch'
+ random_parent = 'http://example.com/path/to/branch'
branch_b.set_parent(random_parent)
repo_d = self.make_repository('d')
branch_b.repository.copy_content_into(repo_d)
=== modified file 'bzrlib/tests/per_branch/test_parent.py'
--- a/bzrlib/tests/per_branch/test_parent.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/per_branch/test_parent.py 2010-12-07 09:06:39 +0000
@@ -40,7 +40,7 @@
def test_set_get_parent(self):
"""Set, re-get and reset the parent"""
b = self.make_branch('subdir')
- url = 'http://bazaar-vcs.org/bzr/bzr.dev'
+ url = 'http://example.com/bzr/bzr.dev'
b.set_parent(url)
self.assertEqual(url, b.get_parent())
self.assertEqual(url, b._get_parent_location())
=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py 2010-09-09 00:32:58 +0000
+++ b/bzrlib/tests/test_branch.py 2010-12-07 09:06:39 +0000
@@ -267,16 +267,16 @@
def test_config(self):
"""Ensure that all configuration data is stored in the branch"""
branch = self.make_branch('a', format=self.get_format_name())
- branch.set_parent('http://bazaar-vcs.org')
+ branch.set_parent('http://example.com')
self.failIfExists('a/.bzr/branch/parent')
- self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
- branch.set_push_location('sftp://bazaar-vcs.org')
+ self.assertEqual('http://example.com', branch.get_parent())
+ branch.set_push_location('sftp://example.com')
config = branch.get_config()._get_branch_data_config()
- self.assertEqual('sftp://bazaar-vcs.org',
+ self.assertEqual('sftp://example.com',
config.get_user_option('push_location'))
- branch.set_bound_location('ftp://bazaar-vcs.org')
+ branch.set_bound_location('ftp://example.com')
self.failIfExists('a/.bzr/branch/bound')
- self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
+ self.assertEqual('ftp://example.com', branch.get_bound_location())
def test_set_revision_history(self):
builder = self.make_branch_builder('.', format=self.get_format_name())
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2010-12-07 16:21:50 +0000
+++ b/bzrlib/tests/test_http.py 2010-12-14 16:27:12 +0000
@@ -354,27 +354,27 @@
def test_abs_url(self):
"""Construction of absolute http URLs"""
- t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
+ t = self._transport('http://example.com/bzr/bzr.dev/')
eq = self.assertEqualDiff
- eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
- eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
- eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
+ eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
+ eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
+ eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
eq(t.abspath('.bzr/1//2/./3'),
- 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
+ 'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
def test_invalid_http_urls(self):
"""Trap invalid construction of urls"""
- self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
+ self._transport('http://example.com/bzr/bzr.dev/')
self.assertRaises(errors.InvalidURL,
self._transport,
- 'http://http://bazaar-vcs.org/bzr/bzr.dev/')
+ 'http://http://example.com/bzr/bzr.dev/')
def test_http_root_urls(self):
"""Construction of URLs from server root"""
- t = self._transport('http://bzr.ozlabs.org/')
+ t = self._transport('http://example.com/')
eq = self.assertEqualDiff
eq(t.abspath('.bzr/tree-version'),
- 'http://bzr.ozlabs.org/.bzr/tree-version')
+ 'http://example.com/.bzr/tree-version')
def test_http_impl_urls(self):
"""There are servers which ask for particular clients to connect"""
=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py 2010-07-29 11:17:57 +0000
+++ b/bzrlib/tests/test_upgrade.py 2010-12-07 09:06:39 +0000
@@ -269,7 +269,7 @@
('.bzr/README',
'This is a Bazaar control directory.\n'
'Do not change any files in this directory.\n'
- 'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
+ 'See http://bazaar.canonical.com/ for more information about Bazaar.\n'),
('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
('.bzr/revision-history',
'mbp at sourcefrog.net-20051004035611-176b16534b086b3c\n'
@@ -311,7 +311,7 @@
( './.bzr/README',
'This is a Bazaar control directory.\n'
'Do not change any files in this directory.\n'
- 'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
+ 'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
),
( './.bzr/branch-format',
'Bazaar-NG branch, format 0.0.4\n'
@@ -377,7 +377,7 @@
( './.bzr/README',
'This is a Bazaar control directory.\n'
'Do not change any files in this directory.\n'
- 'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
+ 'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
),
( './.bzr/branch-format',
'Bazaar-NG branch, format 0.0.4\n'
=== modified file 'tools/win32/bazaar.url'
--- a/tools/win32/bazaar.url 2006-06-29 08:41:31 +0000
+++ b/tools/win32/bazaar.url 2010-12-07 09:06:39 +0000
@@ -1,5 +1,5 @@
[InternetShortcut]
-URL=http://bazaar-vcs.org/
+URL=http://bazaar.canonical.com
Hotkey=0
IconIndex=0
IconFile=
=== modified file 'tools/win32/build_release.py'
--- a/tools/win32/build_release.py 2009-07-31 19:09:31 +0000
+++ b/tools/win32/build_release.py 2010-12-07 09:06:39 +0000
@@ -85,7 +85,6 @@
bzr_dir = get_bzr_dir()
if not os.path.isdir(bzr_dir):
bzr_version = VERSIONS['bzr']
- # bzr_url = 'http://bazaar-vcs.org/bzr/bzr.' + bzr_version
bzr_url = 'lp:bzr/' + bzr_version
print "Getting bzr release %s from %s" % (bzr_version, bzr_url)
call_or_fail([bzr(), 'co', bzr_url, bzr_dir])
=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg 2009-08-20 09:30:34 +0000
+++ b/tools/win32/buildout.cfg 2010-12-07 09:06:39 +0000
@@ -50,7 +50,7 @@
# on Launchpad
# bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
bzr-release-url = lp:bzr/${settings:bzr-release}
-bzr-trunk-url = http://bazaar-vcs.org/bzr/bzr.dev
+bzr-trunk-url = lp:bzr
bzrtools-release = 1.18.0
bzrtools-release-tag = tag:release-${settings:bzrtools-release}
=== modified file 'tools/win32/bzr.iss.cog'
--- a/tools/win32/bzr.iss.cog 2009-08-05 18:56:37 +0000
+++ b/tools/win32/bzr.iss.cog 2010-12-07 09:06:39 +0000
@@ -71,9 +71,9 @@
AppComments="Bazaar: Friendly distributed version control system"
AppPublisher="Canonical Ltd."
-AppPublisherURL="http://www.bazaar-vcs.org"
-AppSupportURL="http://www.bazaar-vcs.org/BzrSupport"
-AppUpdatesURL="http://www.bazaar-vcs.org/WindowsDownloads"
+AppPublisherURL="http://bazaar.canonical.com"
+AppSupportURL="http://wiki.bazaar.canonical.com/BzrSupport"
+AppUpdatesURL="http://wiki.bazaar.canonical.com/WindowsDownloads"
; [[[cog cog.outl('AppVersion=%s' % VERSION) ]]]
; [[[end]]]
@@ -177,7 +177,7 @@
[Icons]
Name: "{group}\Documentation index"; Filename: "{app}\doc\index.html"; WorkingDir: "{app}\doc";
-Name: "{group}\Bazaar Home Page"; Filename: "{app}\bazaar.url"; Comment: "http://www.bazaar-vcs.org";
+Name: "{group}\Bazaar Home Page"; Filename: "{app}\bazaar.url"; Comment: "http://bazaar.canonical.com";
Name: "{group}\Start Bzr in cmd shell"; Filename: "{cmd}"; Parameters: "/K start_bzr.bat"; WorkingDir: "{app}"; IconFilename: "{app}\bzr.exe"; Comment: "Open new Bzr session";
; NOTE: Intent is to change the log file location - the line below will need to change to reflect that.
Name: "{group}\Open Bzr log file"; Filename: "notepad.exe"; Parameters: "{userdocs}\.bzr.log"; Comment: "Launch notepad to view the bzr log file";
More information about the bazaar-commits
mailing list