lp:~vila/bzr-upload/499525-ignore

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-upload

Martin Albisetti (community): Approve on 2010-01-06

Diff: 327 lines (+165/-38)

3 files modified

NEWS (+5/-0)
__init__.py (+65/-30)
tests/test_upload.py (+95/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

73. By Vincent Ladeuil on 2010-01-06

Cleanup.

* __init__.py:
(BzrUploader.upload_file, BzrUploader.make_remote_dir,
BzrUploader.delete_remote_file, BzrUploader.delete_remote_dir):
Remove useless handling of is_ignored(), higher levels take care
of that.

72. By Vincent Ladeuil on 2010-01-06

Handle regexps in .bzrignore-upload and take parents into account.

* tests/test_upload.py:
(UploadUtilsMixin._get_cmd_upload): The hell with bzrlib
regressions, just use sys.stdout.
(TestUploadMixin.test_ignore_regexp): Ensure regexps are handled.
(TestUploadMixin.test_ignore_change_file_into_dir,
TestUploadMixin.test_ignore_change_dir_into_file,
TestUploadMixin.test_ignore_delete_dir_in_subdir,
TestIncrementalUpload.test_ignore_delete_one_file): More ignore tests.

* __init__.py:
(BzrUploader._get_ignored, BzrUploader.is_ignored): Handle regexps
and ensure no parents are ignored.
(BzrUploader.upload_file, BzrUploader.make_remote_dir,
BzrUploader.delete_remote_dir, BzrUploader.delete_remote_file):
Use is_ignored.
(BzrUploader.upload_full_tree, BzrUploader.upload_tree): Use
is_ignored.

71. By Martin Albisetti on 2009-12-23

Write a test that verifies that nested files in ignored dirs dont get uploaded

70. By Martin Albisetti on 2009-12-23

Remove commented lines for debugging

69. By Martin Albisetti on 2009-12-23

Files and directories inside an ignored dir are not ignored. Bug #499525

68. By Vincent Ladeuil on 2009-12-02

Cleanup some pending changes.

* tests/test_upload.py:
Fix imports.
(TestUploadFromRemoteBranch.setUp): Refactor some setup common to
all tests.

* __init__.py:
(CannotUploadToWorkingTree): Renamed from
CannotUploadToWorkingTreeError, no need to prefix with error, we
know that.
(DivergedUploadedTree): Replace DIvergedError.
(cmd_upload.run): Simplify locking.

67. By Martin Albisetti on 2009-11-30

Allow ignoring files and directories for upload with a .bzrupload-ignore file (Martin Albisetti)

66. By Vincent Ladeuil on 2009-10-05

(gary) Add --overwrite option

65. By Vincent Ladeuil on 2009-10-05

Fix spurious failures.

* tests/test_upload.py:
(get_transport_scenarios): Better ftp/sftp selection.
(TestUploadFromRemoteBranch.make_remote_branch_without_working_tree):
Skip some tests that escape isolation until I can find a better
way.

64. By Vincent Ladeuil on 2009-09-05

 Fix compatibility with bzr.

 * __init__.py:
 (_get_branch_bool_option): Ensure compatibility with earlier bzr
 versions, at least for now.