← Back to branch summary

~oddbloke/pqm/249041

« back to all changes in this revision

Viewing changes to pqm/__init__.py

  • Committer: Robert Collins
  • Date: 2007-11-29 21:40:54 UTC
  • Revision ID: robertc@robertcollins.net-20071129214054-ug81smra1d7tgmcj
Lock correctness for bzr merges, allowing use with packs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pqm/__init__.py
1415
1415
 
1416
1416
    def do_star_merge(self, sender, from_branch, local_dir):
1417
1417
        from bzrlib.workingtree import WorkingTree
 
1418
        tree = WorkingTree.open(local_dir)
 
1419
        tree.lock_write()
 
1420
        try:
 
1421
            return self._do_star_merge(sender, from_branch, local_dir, tree)
 
1422
        finally:
 
1423
            tree.unlock()
 
1424
 
 
1425
    def _do_star_merge(self, sender, from_branch, local_dir, tree):
1418
1426
        from bzrlib.merge import Merger, Merge3Merger
1419
 
        tree = WorkingTree.open(local_dir)
1420
1427
        merger = Merger(tree.branch, this_tree=tree)
1421
1428
        merger.check_basis(True)
1422
1429
        merger.set_other([from_branch, -1])