lp:~vila/bzr/284038-push-strict

Created by Vincent Ladeuil on 2009-06-10 and last modified on 2009-06-30
Get this branch:
bzr branch lp:~vila/bzr/284038-push-strict
Only Vincent Ladeuil can upload to this branch. If you are Vincent Ladeuil please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Vincent Ladeuil
Project:
Bazaar
Status:
Merged

Recent revisions

4493. By Vincent Ladeuil on 2009-06-30

Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

4492. By Vincent Ladeuil on 2009-06-30

Fix failing tests.

4491. By Vincent Ladeuil on 2009-06-30

Start addressing jam's concerns.

4490. By Vincent Ladeuil on 2009-06-29

--strict is meaningless when --revision is specified.

* tests/blackbox/test_push.py:
(load_tests): Switch to name based indirection following IRC chat
with lifeless, spiv and poolie.
(TestPushStrictWithChanges._changes_type): Now a string
(TestPushStrictWithChanges.setUp): Use getattr to call the right
bound method.
(TestPushStrict.make_local_branch_and_tree): Add one commit so we
have meat for push --revision.
(TestPushStrict.assertPushSucceeds): Add a pushed_revid parameter.
(TestPushStrictWithChanges.test_push_with_revision): New test.

* builtins.py:
(cmd_push.run): Don't look at --strict' when '--revision' is
specified.

4489. By Vincent Ladeuil on 2009-06-29

Add tests for push --strict against pending merges.

* tests/blackbox/test_push.py:
(load_tests): Test push --strict for uncommitted changes and
pending merges.
(TestPushStrict): Helpers for --strict option tests.
(TestPushStrictWithoutChanges, TestPushStrictWithChanges): Test
the --strict option.

4488. By Vincent Ladeuil on 2009-06-29

--strict is now the default for push.

* tests/blackbox/test_push.py:
(TestPushStrict.test_push_default,
TestPushStrict.test_push_bogus_config_var_ignored): --strict
defaults to True now.

* builtins.py:
(cmd_push.run): Make --strict true by default. Handle usage in
tree-less branches (uncovered by the test suite !).

4487. By Canonical.com Patch Queue Manager <email address hidden> on 2009-06-26

(jam) When getting a ConnectionError during 'bzr pull/merge' don't
 try to connect a second time.

4486. By Canonical.com Patch Queue Manager <email address hidden> on 2009-06-26

(vila) Cleanup send tests

4485. By Canonical.com Patch Queue Manager <email address hidden> on 2009-06-26

(jml) Merge changes from 1.16.1.

4484. By Canonical.com Patch Queue Manager <email address hidden> on 2009-06-26

(mbp) reduce transport activity droppings

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar RepositoryFormatKnitPack6 (bzr 1.9)
Stacked on:
lp:~bzr/bzr/trunk-old
This branch contains Public information 
Everyone can see this information.

Subscribers