Merge lp:~beuno/bzr-upload/ignores into lp:bzr-upload
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~beuno/bzr-upload/ignores |
Merge into: | lp:bzr-upload |
Diff against target: |
236 lines (+74/-29) 3 files modified
README (+0/-1) __init__.py (+53/-27) tests/test_upload.py (+21/-1) |
To merge this branch: | bzr merge lp:~beuno/bzr-upload/ignores |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | 2009-11-28 | Approve on 2009-11-30 | |
Review via email:
|
Martin Albisetti (beuno) wrote : | # |
- 73. By Martin Albisetti on 2009-11-28
-
2009 tests!
- 74. By Martin Albisetti on 2009-11-28
-
Fix all the tests I broke :)
Alexander Belchenko (bialix) wrote : | # |
Martin, on the last bzr sprint in Mooloolaba it was decided to keep different config and settings fro plugins in subdirectory .bzrmeta. You may want to ask Ian Clatworthy for details. So, if you change your code to use .bzrmeta/
(I've got here from your article about TDD ;-)
Vincent Ladeuil (vila) wrote : | # |
It looks like you re-introduce the README file that has been moved in the __init__.py so that the documentation can be automatically generated.
I suspect that's because you started with an old branch.
The test sounds right, you may want to add one (and some code too :) for directories.
The diff is larger than it should, could it be because you introduced spurious spaces ?
195 + ignored_files = self.get_ignored()
196 + if relpath not in ignored_files:
197 + self.get_ignored()
That self.get_ignored() call seems useless.
Martin Albisetti (beuno) wrote : | # |
On Sat, Nov 28, 2009 at 1:58 PM, Vincent Ladeuil <email address hidden> wrote:
> It looks like you re-introduce the README file that has been moved in the __init__.py so that the documentation can be automatically generated.
I did it on purpose :)
People getting the branch/tarball don't really find that information
since it's buried in the python file.
If you feel strongly about not having the duplication, I'll be happy
to drop that change.
> The test sounds right, you may want to add one (and some code too :) for directories.
That sounds sane :)
I will work on that and poke you again.
> The diff is larger than it should, could it be because you introduced spurious spaces ?
The opposite. I removed whitespace.
> 195 + ignored_files = self.get_ignored()
> 196 + if relpath not in ignored_files:
> 197 + self.get_ignored()
>
> That self.get_ignored() call seems useless.
Yes, thanks for catching that. Removed.
--
Martin
- 75. By Martin Albisetti on 2009-11-28
-
Remove left over line
- 76. By Martin Albisetti on 2009-11-28
-
Remove duplication from README
Vincent Ladeuil (vila) wrote : | # |
bialix is right, but let's file a bug for that (so we can land this fix).
Martin Albisetti (beuno) wrote : | # |
Ok, updated with ignoring dirs, and a test to prove it.
I think I addressed all comments, Vincent.
- 77. By Martin Albisetti on 2009-11-30
-
Add test for ignoring a dir
- 78. By Martin Albisetti on 2009-11-30
-
Actually ignore the dirs. Test pass!
This branch provides support for ignoring files specifically on upload, but not on versioning.
The file is .bzrignore-upload, and there is a test attached, I'm not sure how much to test as I'm re-using bzr's API (directories as well as files?).