~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 4721.3.2

From Revision 4721.3.2 to 4712

Rev	Summary	Authors	Date
4721.3.2	Simplify mutable_tree.has_changes() and update call sites. Simplify mutable_tree.has_changes() and update call sites. * bzrlib/workingtree.py: (WorkingTree.merge_from_branch): Add a force parameter. Replace the check_basis() call by the corresponding code, taken the new 'force' parameter into account. * bzrlib/tests/test_status.py: (TestStatus.make_multiple_pending_tree): Add force=True on supplementary merges. * bzrlib/tests/test_reconfigure.py: (TestReconfigure): Add a test for pending merges. * bzrlib/tests/test_msgeditor.py: (MsgEditorTest.make_multiple_pending_tree): Add force=True on supplementary merges. * bzrlib/tests/blackbox/test_uncommit.py: (TestUncommit.test_uncommit_octopus_merge): Add force=True on supplementary merges. * bzrlib/send.py: (send): Use the simplified has_changes(). Fix typo in comment too. * bzrlib/reconfigure.py: (Reconfigure._check): Use the simplified has_changes(). * bzrlib/mutabletree.py: (MutableTree.has_changes): Make the tree parameter optional but retain it for tests. Add a pending merges check. * bzrlib/merge.py: (Merger.ensure_revision_trees, Merger.file_revisions, Merger.check_basis, Merger.compare_basis): Deprecate. * bzrlib/bundle/apply_bundle.py: (merge_bundle): Replace the check_basis() call by the corresponding code. * bzrlib/builtins.py: (cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use the simplified has_changes(). (cmd_merge.run): Replace the check_basis call() by the corresponding code (minus the alredy done has_changes() check).	Vincent Ladeuil	15 years ago
4721.3.1	Cleanup imports. Cleanup imports.	Vincent Ladeuil	15 years ago
4721.2.8	merge trunk to get test cleanups and resolve conflicts merge trunk to get test cleanups and resolve conflicts	Vincent Ladeuil	15 years ago
4721.2.7	Final tweak. Final tweak. * bzrlib/tests/blackbox/test_dpush.py: (TestDpushStrictMixin.setUp): This is really the mixin setup.	Vincent Ladeuil	15 years ago
4721.2.6	More agressive test sharing between push and dpush. More agressive test sharing between push and dpush. * bzrlib/tests/blackbox/test_push.py: (TestPushStrictWithChanges.setUp): I'm pretty sure some review asked for that comment... * bzrlib/tests/blackbox/test_dpush.py: (TestDpushStrictMixin): Minimize differences against TestPushStrict* test. (TestDpushStrictWithChanges, TestDpushStrictWithoutChanges): Remove duplication from the TestPush counterparts.	Vincent Ladeuil	15 years ago
4721.2.5	Some refactoring. Some refactoring. * bzrlib/tests/test_foreign.py: (register_dummy_foreign_for_test): Factored out now that we have 3 uses. (DummyForeignVcsTests): Use register_dummy_foreign_for_test. * bzrlib/tests/blackbox/test_dpush.py: (TestDpush, TestDpushStrictMixin): Use register_dummy_foreign_for_test.	Vincent Ladeuil	15 years ago
4721.2.4	More test cleanup. More test cleanup. * bzrlib/tests/test_foreign.py: Cleanup imports.	Vincent Ladeuil	15 years ago
4721.2.3	Make all test pass by implement --strict for dpush. Make all test pass by implement --strict for dpush. * bzrlib/tests/blackbox/test_dpush.py: Make all tests pass. (TestDpush.test_dpush_wt_diff): Adjust the test. * bzrlib/help_topics/en/configuration.txt: (dpush_strict): Document the configuration variable. * bzrlib/foreign.py: (cmd_dpush.run): Check that the working tree has no changes when strict is on.	Vincent Ladeuil	15 years ago
4721.2.2	Start testing and implementing --strict for dpush. Start testing and implementing --strict for dpush. * bzrlib/tests/blackbox/test_dpush.py: (load_tests, TestDpushStrictMixin, TestDpushStrictWithoutChanges, TestDpushStrictWithChanges): Copied from test_push with minimal changes to have running tests with some even passing. * bzrlib/foreign.py: (cmd_dpush): Add the --strict option.	Vincent Ladeuil	15 years ago
4721.2.1	Some test cleamup. Some test cleamup. * bzrlib/tests/blackbox/test_send.py: Fix typos. * bzrlib/tests/blackbox/test_dpush.py: Fix imports.	Vincent Ladeuil	15 years ago
4721	(mbp) updated instructions about api stability (mbp) updated instructions about api stability	Canonical.com Patch ...	15 years ago
4720	(andrew) Add --subunit to 'make check'. (andrew) Add --subunit to 'make check'.	Canonical.com Patch ...	15 years ago
4719	(Jelmer) Remove unnecessary --default-rich-root arguments in... (Jelmer) Remove unnecessary --default-rich-root arguments in the user guide.	Canonical.com Patch ...	15 years ago
4718	PreviewTree.get_file_mtime works with unmodified files. PreviewTree.get_file_mtime works with unmodified files.	Canonical.com Patch ...	15 years ago
4717	(robertc) Refactor test_breakin to not wait for 10 seconds b... (robertc) Refactor test_breakin to not wait for 10 seconds but instead kill the child process more rapidly. (Robert Collins)	Canonical.com Patch ...	15 years ago
4716	(jam) Merge the 2.0 stable series to bzr.dev, (jam) Merge the 2.0 stable series to bzr.dev, including 2.0.0 and CHKInventory.filter()	Canonical.com Patch ...	15 years ago
4715	(mbp) deprecate ProgressTask.note (mbp) deprecate ProgressTask.note	Canonical.com Patch ...	15 years ago
4714	(vila) Last tweaks and NEWS entry for shell-like tests (vila) Last tweaks and NEWS entry for shell-like tests	Canonical.com Patch ...	15 years ago
4713	(andrew) Remove last two HPSS VFS calls during incremental p... (andrew) Remove last two HPSS VFS calls during incremental push.	Canonical.com Patch ...	15 years ago
4712	(mbp) deprecate trace.info, error, show_error (mbp) deprecate trace.info, error, show_error	Canonical.com Patch ...	15 years ago

Older »