To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2009-12-24 18:03:15 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20091224180315-wwa4b0joqd8h480b
Replace --interactive by --action.
* bzrlib/tests/test_conflicts.py:
Switch from --interactive to --action.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestResolve): Delete the --interactive tests.
* bzrlib/conflicts.py:
(cmd_resolve.run): Add an 'action' parameter. Refactor to clarify
what action is executed when. Get rid of the --interactive attempt.
(resolve): Add an 'action' parameter. Refactor to make the
conflict deletion depends on the resolution success.
(_resolve_interactive): Deleted.
(ConflictList.remove_files): Use conflict.cleanup()
(Conflict._do): Helper to execute an arbitratry resolution action.
(Conflict.cleanup, Conflict.done, Conflict.keep_mine,
Conflict.take_their): Declare the abstract methods.
(PathConflict.cleanup, PathConflict.done): Do-nothing
implementations.
(ContentsConflict.cleanup): Specific cleanup (strange).
(TextConflict.cleanup): Specific cleanup.
(HandledConflict.done, HandledConflict.cleanup): Do nothing
implementations.
(UnversionedParent.keep_mine, UnversionedParent.take_their): Hmm,
forced do-nothing implementations, something weird is going on
here.
* bzrlib/tests/test_conflicts.py:
Switch from --interactive to --action.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestResolve): Delete the --interactive tests.
* bzrlib/conflicts.py:
(cmd_resolve.run): Add an 'action' parameter. Refactor to clarify
what action is executed when. Get rid of the --interactive attempt.
(resolve): Add an 'action' parameter. Refactor to make the
conflict deletion depends on the resolution success.
(_resolve_interactive): Deleted.
(ConflictList.remove_files): Use conflict.cleanup()
(Conflict._do): Helper to execute an arbitratry resolution action.
(Conflict.cleanup, Conflict.done, Conflict.keep_mine,
Conflict.take_their): Declare the abstract methods.
(PathConflict.cleanup, PathConflict.done): Do-nothing
implementations.
(ContentsConflict.cleanup): Specific cleanup (strange).
(TextConflict.cleanup): Specific cleanup.
(HandledConflict.done, HandledConflict.cleanup): Do nothing
implementations.
(UnversionedParent.keep_mine, UnversionedParent.take_their): Hmm,
forced do-nothing implementations, something weird is going on
here.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.8 KB |
|
|
|
test_branch.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.5 KB |
|
|
|
test_cat.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2 KB |
|
|
|
test_checkout.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_commit.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.5 KB |
|
|
|
test_init.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.2 KB |
|
|
|
test_init_repository.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.3 KB |
|
|
|
test_merge.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_missing.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.4 KB |
|
|
|
test_pull.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2 KB |
|
|
|
test_push.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.6 KB |
|
|
|
test_update.py |
4879.1.3 | 15 years ago | Vincent Ladeuil | Cleanup tests and tweak the text displayed. * bzr | 1.5 KB |
|
|