~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Robert Collins
  • Date: 2006-09-10 23:42:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2000.
  • Revision ID: robertc@robertcollins.net-20060910234217-0ae24d8e666d60d6
All WorkingTree methods which write to the tree, but not to the branch
have been converted to use ``needs_tree_write_lock`` rather than 
``needs_write_lock``. Also converted is the revert, conflicts and tree
transform modules. This provides a modest performance improvement on 
metadir style trees, due to the reduce lock-acquisition, and a more
significant performance improvement on lightweight checkouts from 
remote branches, where trivial operations used to pay a significant 
penalty. It also provides the basis for allowing readonly checkouts.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
88
88
 
89
89
 
90
90
def resolve(tree, paths=None, ignore_misses=False):
91
 
    tree.lock_write()
 
91
    tree.lock_tree_write()
92
92
    try:
93
93
        tree_conflicts = tree.conflicts()
94
94
        if paths is None: