Rev 3282: (Martin Albisetti) Change backup dir from .bzr.backup to backup.bzr in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Mar 15 22:34:32 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3282
revision-id:pqm at pqm.ubuntu.com-20080315223418-lzsk2wwoz9f56awd
parent: pqm at pqm.ubuntu.com-20080315210035-5qwda8bre2nwsra3
parent: ian.clatworthy at canonical.com-20080314213115-0pfbmhzbhb781wvd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-03-15 22:34:18 +0000
message:
(Martin Albisetti) Change backup dir from .bzr.backup to backup.bzr
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3280.1.1
revision-id:ian.clatworthy at canonical.com-20080314213115-0pfbmhzbhb781wvd
parent: pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
parent: beuno at beuno-laptop-20080304120258-niwcc83h9lyy6l60
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2008-03-14 16:31:15 -0500
message:
(Martin Albisetti) Change backup dir from .bzr.backup to backup.bzr
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3250.3.2
revision-id:beuno at beuno-laptop-20080304120258-niwcc83h9lyy6l60
parent: beuno at beuno-laptop-20080304115602-mh7a0770z346vl15
committer: Martin Albisetti <beuno at beuno-laptop>
branch nick: bzr.backup
timestamp: Tue 2008-03-04 12:02:58 +0000
message:
Changed the tests to reflect the backup dir rename
modified:
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
------------------------------------------------------------
revno: 3250.3.1
revision-id:beuno at beuno-laptop-20080304115602-mh7a0770z346vl15
parent: pqm at pqm.ubuntu.com-20080304113936-4wrordr8lrxhvfdl
committer: Martin Albisetti <beuno at beuno-laptop>
branch nick: bzr.backup
timestamp: Tue 2008-03-04 11:56:02 +0000
message:
Changed backuo dir from .bzr.backup to .backup.bzr
modified:
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
=== modified file 'NEWS'
--- a/NEWS 2008-03-15 13:51:09 +0000
+++ b/NEWS 2008-03-15 22:34:18 +0000
@@ -31,6 +31,9 @@
* Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
+ * The backup directory created by ``upgrade`` is now called
+ ``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
+
FEATURES:
* ``branch`` and ``checkout`` can hard-link working tree files, which is
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- a/bzrlib/tests/blackbox/test_upgrade.py 2007-12-21 15:43:24 +0000
+++ b/bzrlib/tests/blackbox/test_upgrade.py 2008-03-14 21:31:15 +0000
@@ -109,7 +109,7 @@
['upgrade', '--format=metaweave', url])
self.assertEqualDiff("""starting upgrade of %s
making backup of tree history
-%s.bzr has been backed up to %s.bzr.backup
+%s.bzr has been backed up to %sbackup.bzr
if conversion fails, you can move this directory back to .bzr
if it succeeds, you can remove this directory if you wish
starting upgrade from format 5 to 6
@@ -133,7 +133,7 @@
['upgrade', '--format=knit', url])
self.assertEqualDiff("""starting upgrade of %s
making backup of tree history
-%s.bzr has been backed up to %s.bzr.backup
+%s.bzr has been backed up to %sbackup.bzr
if conversion fails, you can move this directory back to .bzr
if it succeeds, you can remove this directory if you wish
starting repository conversion
@@ -172,7 +172,7 @@
out, err = self.run_bzr(['upgrade', '--format=knit', url])
self.assertEqualDiff("""starting upgrade of %s
making backup of tree history
-%s.bzr has been backed up to %s.bzr.backup
+%s.bzr has been backed up to %sbackup.bzr
if conversion fails, you can move this directory back to .bzr
if it succeeds, you can remove this directory if you wish
starting upgrade from format 6 to metadir
=== modified file 'bzrlib/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py 2008-03-09 22:16:24 +0000
+++ b/bzrlib/tests/test_upgrade.py 2008-03-14 21:31:15 +0000
@@ -80,26 +80,26 @@
rt.unlock()
# check a backup was made:
transport = get_transport(b.base)
- transport.stat('.bzr.backup')
- transport.stat('.bzr.backup/README')
- transport.stat('.bzr.backup/branch-format')
- transport.stat('.bzr.backup/revision-history')
- transport.stat('.bzr.backup/merged-patches')
- transport.stat('.bzr.backup/pending-merged-patches')
- transport.stat('.bzr.backup/pending-merges')
- transport.stat('.bzr.backup/branch-name')
- transport.stat('.bzr.backup/branch-lock')
- transport.stat('.bzr.backup/inventory')
- transport.stat('.bzr.backup/stat-cache')
- transport.stat('.bzr.backup/text-store')
- transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
- transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
- transport.stat('.bzr.backup/inventory-store/')
- transport.stat('.bzr.backup/inventory-store/mbp at sourcefrog.net-20051004035611-176b16534b086b3c.gz')
- transport.stat('.bzr.backup/inventory-store/mbp at sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
- transport.stat('.bzr.backup/revision-store/')
- transport.stat('.bzr.backup/revision-store/mbp at sourcefrog.net-20051004035611-176b16534b086b3c.gz')
- transport.stat('.bzr.backup/revision-store/mbp at sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
+ transport.stat('backup.bzr')
+ transport.stat('backup.bzr/README')
+ transport.stat('backup.bzr/branch-format')
+ transport.stat('backup.bzr/revision-history')
+ transport.stat('backup.bzr/merged-patches')
+ transport.stat('backup.bzr/pending-merged-patches')
+ transport.stat('backup.bzr/pending-merges')
+ transport.stat('backup.bzr/branch-name')
+ transport.stat('backup.bzr/branch-lock')
+ transport.stat('backup.bzr/inventory')
+ transport.stat('backup.bzr/stat-cache')
+ transport.stat('backup.bzr/text-store')
+ transport.stat('backup.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
+ transport.stat('backup.bzr/text-store/foo-20051004035756-4081373d897c3453.gz')
+ transport.stat('backup.bzr/inventory-store/')
+ transport.stat('backup.bzr/inventory-store/mbp at sourcefrog.net-20051004035611-176b16534b086b3c.gz')
+ transport.stat('backup.bzr/inventory-store/mbp at sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
+ transport.stat('backup.bzr/revision-store/')
+ transport.stat('backup.bzr/revision-store/mbp at sourcefrog.net-20051004035611-176b16534b086b3c.gz')
+ transport.stat('backup.bzr/revision-store/mbp at sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
def test_upgrade_with_ghosts(self):
"""Upgrade v0.0.4 tree containing ghost references.
@@ -156,9 +156,9 @@
transport = get_transport('.')
transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
assert not transport.has('.bzr/stat-cache')
- # XXX: upgrade fails if a .bzr.backup is already present
+ # XXX: upgrade fails if a backup.bzr is already present
# -- David Allouche 2006-08-11
- transport.delete_tree('.bzr.backup')
+ transport.delete_tree('backup.bzr')
# At this point, we have a format6 branch without checkout files.
upgrade('.', bzrdir.BzrDirMetaFormat1())
# The upgrade should not have set up a working tree.
=== modified file 'bzrlib/upgrade.py'
--- a/bzrlib/upgrade.py 2006-08-17 19:51:54 +0000
+++ b/bzrlib/upgrade.py 2008-03-14 21:31:15 +0000
@@ -68,8 +68,8 @@
def _backup_control_dir(self):
self.pb.note('making backup of tree history')
- self.transport.copy_tree('.bzr', '.bzr.backup')
- self.pb.note('%s.bzr has been backed up to %s.bzr.backup',
+ self.transport.copy_tree('.bzr', 'backup.bzr')
+ self.pb.note('%s.bzr has been backed up to %sbackup.bzr',
self.transport.base,
self.transport.base)
self.pb.note('if conversion fails, you can move this directory back to .bzr')
More information about the bazaar-commits
mailing list