← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/developers/plans.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-10-06 14:40:37 UTC
  • mto: (4728.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4731.
  • Revision ID: v.ladeuil+lp@free.fr-20091006144037-o76rgosv9hj3td0y
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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/plans.txt
 
1
Plans
 
2
=====
 
3
 
 
4
.. toctree::
 
5
   :hidden:
 
6
 
 
7
   performance-roadmap
 
8
   colocated-branches
 
9
   tortoise-strategy
 
10
   improved_chk_index
 
11
 
 
12
 
 
13
* `Performance roadmap <performance-roadmap.html>`_ |--| The roadmap 
 
14
  for fixing performance in bzr over the next few releases.
 
15
 
 
16
* `Co-located branches <colocated-branches.html>`_ |--| Planned(?) support
 
17
  for storing multiple branches in one file-system directory.
 
18
 
 
19
* `Bazaar Windows Shell Extension Options <tortoise-strategy.html>`_ |--|
 
20
  Implmentation strategy for Bazaar Windows Shell Extensions, aka
 
21
  TortoiseBzr.
 
22
 
 
23
* `CHK Optimized index <improved_chk_index.html>`_
 
24
 
 
25
 
 
26
.. |--| unicode:: U+2014
 
27
 
 
28
..
 
29
   vim: ft=rst tw=74 ai