Merge lp:~parthm/bzr/242522-symlink-repo-to-usb-stick into lp:bzr

[Parth Malwankar]

This patch updates updates transform.create_symlink to issue a warning in case the target filesystem (e.g. fat mounted on Linux) does not support symlinks. It catches OSError EPERM and issues a warning to the user. The branch is created / updated but the symlink is not created.

This patch along with https://code.launchpad.net/~parthm/bzr/81689-win-symlink-warning/+merge/93784 allow bzr to work with repos containing symlinks on file systems that don't allow symlinks by ignoring symlinks (i.e. not creating them at all).

[Parth Malwankar (parthm)]

Marking as in-progress at the moment. Will resubmit along with 81689 patch to ensure that both patches have consistent behavior and messages.

Unmerged revisions

6478. By Parth Malwankar on 2012-02-26

updated release notes

6477. By Parth Malwankar on 2012-02-26

added test

6476. By Parth Malwankar on 2012-02-25

symlink skipped if target filesystem does not support symlinks

=== modified file 'bzrlib/tests/test_transform.py'
--- bzrlib/tests/test_transform.py	2012-02-06 23:38:33 +0000
+++ bzrlib/tests/test_transform.py	2012-02-26 05:32:20 +0000
@@ -1556,6 +1556,27 @@
         self.addCleanup(wt.unlock)
         self.assertEqual(wt.kind(wt.path2id("foo")), "symlink")
 
+    def test_no_target_symlink(self):
+        def symlink_eperm(source, link_name):
+            e = OSError()
+            e.errno = errno.EPERM
+            raise e
+        self.requireFeature(SymlinkFeature)
+        wt = self.make_branch_and_tree('.')
+        self.build_tree(['foo'])
+        wt.add(['foo'])
+        wt.commit("one")
+        tt = TreeTransform(wt)
+        self.addCleanup(tt.finalize)
+        foo_trans_id = tt.trans_id_tree_path("foo")
+        tt.delete_contents(foo_trans_id)
+        os_symlink = getattr(os, 'symlink', None)
+        os.symlink = symlink_eperm
+        try:
+            tt.create_symlink("bar", foo_trans_id)
+        finally:
+            os.symlink = os_symlink
+
     def test_dir_to_file(self):
         wt = self.make_branch_and_tree('.')
         self.build_tree(['foo/', 'foo/bar'])

=== modified file 'bzrlib/transform.py'
--- bzrlib/transform.py	2012-02-06 23:38:33 +0000
+++ bzrlib/transform.py	2012-02-26 05:32:20 +0000
@@ -1382,7 +1382,13 @@
         See also new_symlink.
         """
         if has_symlinks():
-            os.symlink(target, self._limbo_name(trans_id))
+            try:
+                os.symlink(target, self._limbo_name(trans_id))
+            except OSError, e:
+                if e.errno != errno.EPERM:
+                    raise
+                path = FinalPaths(self).get_path(trans_id)
+                trace.warning('Unable to create symlink "%s".' % (path,))
             unique_add(self._new_contents, trans_id, 'symlink')
         else:
             try:

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-02-25 14:13:19 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-02-26 05:32:20 +0000
@@ -47,6 +47,11 @@
 * Fix ``bzr config`` display for ``RegistryOption`` values.
   (Vincent Ladeuil, #930182)
 
+* Operations like ``branch`` and ``push`` no longer crash with ``OSError``
+  when the target file system does not support symlinks. Symlinks are
+  not created on the target and warning is shown.
+  (Parth Malwankar, #242522)
+
 Documentation
 *************