Rev 5419: Merge backup-names into orphan-non-versioned-files in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5419 [merge]
revision-id: v.ladeuil+lp at free.fr-20100909204337-jdpaggctu2x23x5m
parent: v.ladeuil+lp at free.fr-20100909141334-mrdt8dya6hrcbu0a
parent: v.ladeuil+lp at free.fr-20100909202015-uwo1zl3ghnw1ogkk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Thu 2010-09-09 22:43:37 +0200
message:
  Merge backup-names into orphan-non-versioned-files
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-09-03 02:53:10 +0000
+++ b/NEWS	2010-09-09 20:20:15 +0000
@@ -20,6 +20,10 @@
   is now named "msg" instead of earlier "message".
   (Parth Malwankar, #603461)
 
+* ``BzrDir.generate_backup_name`` has been deprecated and replaced by a
+  private method. ``osutils.available_backup_name`` provides an extensible
+  replacement. (Vincent Ladeuil)
+
 * ``bzrlib.transform.TreeTransformBase.final_kind``,
   ``bzrlib.transform.TreeTransform.tree_kind`` and
   ``bzrlib.transform.TransformPreview.tree_kind`` now return None instead

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2010-09-09 13:41:52 +0000
+++ b/bzrlib/osutils.py	2010-09-09 20:43:37 +0000
@@ -2359,7 +2359,9 @@
 def available_backup_name(base, exists):
     """Find a non-existing backup file name.
 
-    This will *not* create anything, this only return a 'free' entry.
+    This will *not* create anything, this only return a 'free' entry.  This
+    should be used for checking names in a directory below a locked
+    tree/branch/repo to avoid race conditions.
 
     :param base: The base name.
     :param exists: A callable returning True if the passed path exists.

=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-09-09 08:14:39 +0000
+++ b/bzrlib/tests/test_transform.py	2010-09-09 20:43:37 +0000
@@ -822,9 +822,13 @@
         parent = tt.trans_id_file_id('parent-id')
         tt.new_file('file', parent, 'Contents')
         raw_conflicts = resolve_conflicts(tt)
+        # Since the directory doesn't exist it's seen as missing to resolve
+        # create a conflict asking for it to be created.
         self.assertLength(1, raw_conflicts)
         self.assertEqual(('missing parent', 'Created directory', 'new-1'),
                          raw_conflicts.pop())
+        # apply fail since the missing directory doesn't exist
+        self.assertRaises(errors.NoFinalPath, tt.apply)
 
     def test_moving_versioned_directories(self):
         create, root = self.get_transform()