Merge lp:~beuno/bzr-upload/bug-499525 into lp:bzr-upload

[Martin Albisetti]

[Martin Albisetti (beuno)]

This branch fixes bug 499525, which makes the behavior of ignoring directories wonky since it tries to upload files to unexisting dirs.

[Vincent Ladeuil (vila)]

Counter-proposal here: https://code.edge.launchpad.net/~vila/bzr-upload/499525-ignore/+merge/16906

The problem was far more complex than I initially thought, but I think the (counter-:)proposed implementation should address the same issues.

Voting disapprove here really means that the discussion should continue on the other merge proposal.

review: Disapprove

Unmerged revisions

=== modified file '__init__.py'
--- __init__.py	2009-12-02 10:02:05 +0000
+++ __init__.py	2009-12-23 19:22:13 +0000
@@ -289,7 +289,8 @@
 
     def upload_file(self, relpath, id, mode=None):
         ignored_files = self.get_ignored()
-        if relpath not in ignored_files:
+        is_ignored =  osutils.is_inside_any(ignored_files, relpath)
+        if is_ignored is False:
             if mode is None:
                 if self.tree.is_executable(id):
                     mode = 0775
@@ -322,7 +323,8 @@
 
     def make_remote_dir(self, relpath, mode=None):
         ignored_files = self.get_ignored()
-        if relpath not in ignored_files:
+        is_ignored =  osutils.is_inside_any(ignored_files, relpath)
+        if is_ignored is False:
             if mode is None:
                 mode = 0775
             self.to_transport.mkdir(relpath, mode)

=== modified file 'tests/test_upload.py'
--- tests/test_upload.py	2009-12-02 10:02:05 +0000
+++ tests/test_upload.py	2009-12-23 19:22:13 +0000
@@ -462,6 +462,19 @@
 
         self.failIfUpFileExists('dir')
 
+    def test_ignore_nested_directory(self):
+        self.make_branch_and_working_tree()
+        self.do_full_upload()
+        self.add_file('.bzrignore-upload','dir')
+        self.add_dir('dir')
+        self.add_dir('dir/foo')
+        self.add_file('dir/foo/bar','')
+
+        self.do_upload()
+
+        self.failIfUpFileExists('dir')
+        self.failIfUpFileExists('dir/foo/bar')
+
 
 class TestFullUpload(tests.TestCaseWithTransport, TestUploadMixin):