lp://staging/~beuno/bzr-upload/bug-499525

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/bzr-upload

Vincent Ladeuil: Disapprove on 2010-01-06

Diff: 46 lines (+17/-2)

2 files modified

__init__.py (+4/-2)
tests/test_upload.py (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #499525: .bzrignore-upload not work for directories

High

Fix Released

Link a bug report

Related blueprints

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.

63. By Vincent Ladeuil on 2009-09-05

 Make the doc more easily discoverable.

 * __init__.py:
 Populate the docstring with the README.
 (cmd_upload): Add a pointer to the plugins/upload help topic.

 * README:
 Move most of the content in the module docstring.

62. By Vincent Ladeuil on 2009-09-02

Fix bug #423331 by adding a way to configure the path used to
store the revid.

* tests/test_upload.py:
(TestUploadMixin.test_upload_revid_path_in_dir): Smoke test that
we can force a different path.
(TestFullUpload.test_full_upload_empty_tree,
TestIncrementalUpload.test_upload_for_the_first_time_do_a_full_upload):
Update references to the revid path.

* __init__.py:
(get_upload_revid_location, set_upload_revid_location): New config
variable.
(BzrUploader.set_uploaded_revid, BzrUploader.get_uploaded_revid):
Use the config variable defining the path.

* README:
Document the .bzr-upload.revid file and upload_revid_location
configuration variable.