Merge lp:~parthm/bzr/335033_and_300001 into lp:bzr

[Parth Malwankar]

[Parth Malwankar (parthm)]

This merge fixes #335033 and #300001

'bzr upgrade' now names the backup directory as 'backup.bzr.~N~' following the same convention as 'bzr revert'. This name (*~) is ignored by default. The first available integer (starting from 1) is used for N.

[Martin Pool (mbp)]

thanks

review: Approve

[Martin Pool (mbp)]

This fails in test_info:

Traceback (most recent call last):
  File "/home/mbp/lib/python/testtools/runtest.py", line 128, in _run_user
    return fn(*args)
  File "/home/mbp/lib/python/testtools/testcase.py", line 369, in _run_test_method
    testMethod()
  File "/home/mbp/bzr/335033-upgrade/bzrlib/tests/blackbox/test_info.py", line 231, in test_info_standalone
    ), out)
AssertionError: texts not equal:
  Checkout (format: knit)
  Location:
         checkout root: bound
    checkout of branch: standalone

  Related branches:
    parent branch: standalone

  Format:
         control: Meta directory format 1
    working tree: Working tree format 3
          branch: Branch format 5
      repository: Knit repository format 1

  In the working tree:
           1 unchanged
           0 modified
           0 added
           0 removed
           0 renamed
- 1 unknown
? ^
+ 0 unknown
? ^
- 0 ignored
? ^
+ 1 ignored
? ^
           0 versioned subdirectories

  Branch history:
           1 revision
           0 days old
     first revision: Thu 2010-02-18 13:29:12 +1100
    latest revision: Thu 2010-02-18 13:29:12 +1100

  Repository:
           1 revision

[Parth Malwankar (parthm)]

Sorry about that.
I just pushed the fix.

=== modified file 'NEWS'
--- NEWS	2010-02-12 15:15:24 +0000
+++ NEWS	2010-02-15 11:40:31 +0000
@@ -70,6 +70,11 @@
   prevents ``bzr status --short`` from crashing when those files are
   present.  (John Arbash Meinel, #303275)
 
+* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
+  of ``backup.bzr``. This directory is ignored by bzr commands such as
+  ``add``.
+  (Parth Malwankar, #335033, #300001)
+
 API Changes
 ***********
 

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2010-02-10 17:52:08 +0000
+++ bzrlib/bzrdir.py	2010-02-15 11:40:31 +0000
@@ -575,6 +575,15 @@
 
         :return: Tuple with old path name and new path name
         """
+        def name_gen(base='backup.bzr'):
+            counter = 1
+            name = "%s.~%d~" % (base, counter)
+            while self.root_transport.has(name):
+                counter += 1
+                name = "%s.~%d~" % (base, counter)
+            return name
+
+        backup_dir=name_gen()
         pb = ui.ui_factory.nested_progress_bar()
         try:
             # FIXME: bug 300001 -- the backup fails if the backup directory
@@ -584,9 +593,9 @@
             # FIXME: bug 262450 -- the backup directory should have the same
             # permissions as the .bzr directory (probably a bug in copy_tree)
             old_path = self.root_transport.abspath('.bzr')
-            new_path = self.root_transport.abspath('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,))
-            self.root_transport.copy_tree('.bzr', 'backup.bzr')
+            self.root_transport.copy_tree('.bzr', backup_dir)
             return (old_path, new_path)
         finally:
             pb.finished()

=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- bzrlib/tests/blackbox/test_upgrade.py	2010-01-25 17:48:22 +0000
+++ bzrlib/tests/blackbox/test_upgrade.py	2010-02-15 11:40:31 +0000
@@ -101,17 +101,18 @@
         url = get_transport(self.get_url('format_5_branch')).base
         # check --format takes effect
         bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
+        backup_dir = 'backup.bzr.~1~'
         (out, err) = self.run_bzr(
             ['upgrade', '--format=metaweave', url])
         self.assertEqualDiff("""starting upgrade of %s
 making backup of %s.bzr
-  to %sbackup.bzr
+  to %s%s
 starting upgrade from format 5 to 6
 adding prefixes to weaves
 adding prefixes to revision-store
 starting upgrade from format 6 to metadir
 finished
-""" % (url, url, url), out)
+""" % (url, url, url, backup_dir), out)
         self.assertEqualDiff("", err)
         self.assertTrue(isinstance(
             bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
@@ -124,15 +125,16 @@
         url = get_transport(self.get_url('metadir_weave_branch')).base
         # check --format takes effect
         bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
+        backup_dir = 'backup.bzr.~1~'
         (out, err) = self.run_bzr(
             ['upgrade', '--format=knit', url])
         self.assertEqualDiff("""starting upgrade of %s
 making backup of %s.bzr
-  to %sbackup.bzr
+  to %s%s
 starting repository conversion
 repository converted
 finished
-""" % (url, url, url), out)
+""" % (url, url, url, backup_dir), out)
         self.assertEqualDiff("", err)
         converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
         self.assertTrue(isinstance(converted_dir._format,
@@ -145,6 +147,33 @@
         self.run_bzr('upgrade --format=knit repo')
 
 
+    def test_upgrade_with_existing_backup_dir(self):
+        self.make_format_5_branch()
+        transport = get_transport(self.get_url('format_5_branch'))
+        url = transport.base
+        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
+        backup_dir1 = 'backup.bzr.~1~'
+        backup_dir2 = 'backup.bzr.~2~'
+        # explicitly create backup_dir1. bzr should create the .~2~ directory
+        # as backup
+        transport.mkdir(backup_dir1)
+        (out, err) = self.run_bzr(
+            ['upgrade', '--format=metaweave', url])
+        self.assertEqualDiff("""starting upgrade of %s
+making backup of %s.bzr
+  to %s%s
+starting upgrade from format 5 to 6
+adding prefixes to weaves
+adding prefixes to revision-store
+starting upgrade from format 6 to metadir
+finished
+""" % (url, url, url, backup_dir2), out)
+        self.assertEqualDiff("", err)
+        self.assertTrue(isinstance(
+            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
+            bzrdir.BzrDirMetaFormat1))
+        self.assertTrue(transport.has(backup_dir2))
+
 class SFTPTests(TestCaseWithSFTPServer):
     """Tests for upgrade over sftp."""
 
@@ -153,14 +182,15 @@
         t = get_transport(self.get_url())
         url = t.base
         out, err = self.run_bzr(['upgrade', '--format=knit', url])
+        backup_dir = 'backup.bzr.~1~'
         self.assertEqualDiff("""starting upgrade of %s
 making backup of %s.bzr
-  to %sbackup.bzr
+  to %s%s
 starting upgrade from format 6 to metadir
 starting repository conversion
 repository converted
 finished
-""" % (url, url, url), out)
+""" % (url, url, url,backup_dir), out)
         self.assertEqual('', err)
 
 

=== modified file 'bzrlib/tests/test_upgrade.py'
--- bzrlib/tests/test_upgrade.py	2010-02-10 17:52:08 +0000
+++ bzrlib/tests/test_upgrade.py	2010-02-15 11:40:31 +0000
@@ -79,27 +79,28 @@
         finally:
             rt.unlock()
         # check a backup was made:
+        backup_dir = 'backup.bzr.~1~'
         transport = get_transport(b.base)
-        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/[e-mail]')
-        transport.stat('backup.bzr/inventory-store/[e-mail]')
-        transport.stat('backup.bzr/revision-store/')
-        transport.stat('backup.bzr/revision-store/[e-mail]')
-        transport.stat('backup.bzr/revision-store/[e-mail]')
+        transport.stat(backup_dir)
+        transport.stat(backup_dir + '/README')
+        transport.stat(backup_dir + '/branch-format')
+        transport.stat(backup_dir + '/revision-history')
+        transport.stat(backup_dir + '/merged-patches')
+        transport.stat(backup_dir + '/pending-merged-patches')
+        transport.stat(backup_dir + '/pending-merges')
+        transport.stat(backup_dir + '/branch-name')
+        transport.stat(backup_dir + '/branch-lock')
+        transport.stat(backup_dir + '/inventory')
+        transport.stat(backup_dir + '/stat-cache')
+        transport.stat(backup_dir + '/text-store')
+        transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
+        transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
+        transport.stat(backup_dir + '/inventory-store/')
+        transport.stat(backup_dir + '/inventory-store/[e-mail]')
+        transport.stat(backup_dir + '/inventory-store/[e-mail]')
+        transport.stat(backup_dir + '/revision-store/')
+        transport.stat(backup_dir + '/revision-store/[e-mail]')
+        transport.stat(backup_dir + '/revision-store/[e-mail]')
 
     def test_upgrade_with_ghosts(self):
         """Upgrade v0.0.4 tree containing ghost references.
@@ -157,7 +158,7 @@
         self.assertFalse(transport.has('.bzr/stat-cache'))
         # XXX: upgrade fails if a backup.bzr is already present
         # -- David Allouche 2006-08-11
-        transport.delete_tree('backup.bzr')
+        transport.delete_tree('backup.bzr.~1~')
         # At this point, we have a format6 branch without checkout files.
         upgrade('.', bzrdir.BzrDirMetaFormat1())
         # The upgrade should not have set up a working tree.