Merge lp:~bialix/bzr/bug-406174 into lp:~bzr/bzr/trunk-old

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This branch fixed export to existing directory: if directory is empty then export will succeed, otherwise it fails with error. See bug #406174 for details.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr/bug-406174 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This branch fixed export to existing directory: if directory is empty then export will succeed, otherwise it fails with error. See bug #406174 for details.
>
>

 review approve
 merge approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkpwcEAACgkQJdeBCYSNAAOfGgCeJ24K38h1RY1FVydmAdLukKWw
RzQAoItgQjHfiebrvVKISAHjkRj6E2Xo
=0PJ4
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-07-29 21:38:13 +0000
+++ NEWS	2009-07-30 02:35:21 +0000
@@ -70,6 +70,10 @@
   causes a redirection loop when bzr tries to read a URL as a bundle.
   (Andrew Bennetts, #400847)
   
+* Fixed export to existing directory: if directory is empty then export 
+  will succeed, otherwise it fails with error.
+  (Alexander Belchenko, #406174)
+
 * Fixed spurious "Source branch does not support stacking" warning when
   pushing. (Andrew Bennetts, #388908)
 
 
=== modified file 'bzrlib/export/dir_exporter.py'
--- bzrlib/export/dir_exporter.py	2009-07-23 16:30:49 +0000
+++ bzrlib/export/dir_exporter.py	2009-07-30 02:35:21 +0000
@@ -17,7 +17,7 @@
 """Export a Tree to a non-versioned directory.
 """
 
-
+import errno
 import os
 import StringIO
 
@@ -43,7 +43,15 @@
            left in a half-assed state.
     """
     mutter('export version %r', tree)
-    os.mkdir(dest)
+    try:
+        os.mkdir(dest)
+    except OSError, e:
+        if e.errno == errno.EEXIST:
+            # check if directory empty
+            if os.listdir(dest) != []:
+                raise errors.BzrError("Can't export tree to non-empty directory.")
+        else:
+            raise
     for dp, ie in _export_iter_entries(tree, subdir):
         fullpath = osutils.pathjoin(dest, dp)
         if ie.kind == "file":
 
=== modified file 'bzrlib/tests/test_export.py'
--- bzrlib/tests/test_export.py	2009-07-23 18:36:54 +0000
+++ bzrlib/tests/test_export.py	2009-07-30 02:35:21 +0000
@@ -18,6 +18,7 @@
 
 
 from bzrlib import (
+    errors,
     export,
     osutils,
     tests,
@@ -42,3 +43,22 @@
         wt.add(['link'])
         export.export(wt, 'target', format="dir")
         self.failUnlessExists('target/link')
+
+    def test_dir_export_to_existing_empty_dir_success(self):
+        self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])
+        wt = self.make_branch_and_tree('source')
+        wt.add(['a', 'b', 'b/c'])
+        wt.commit('1')
+        self.build_tree(['target/'])
+        export.export(wt, 'target', format="dir")
+        self.failUnlessExists('target/a')
+        self.failUnlessExists('target/b')
+        self.failUnlessExists('target/b/c')
+
+    def test_dir_export_to_existing_nonempty_dir_fail(self):
+        self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])
+        wt = self.make_branch_and_tree('source')
+        wt.add(['a', 'b', 'b/c'])
+        wt.commit('1')
+        self.build_tree(['target/', 'target/foo'])
+        self.assertRaises(errors.BzrError, export.export, wt, 'target', format="dir")