/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-08-14 23:35:48 UTC
  • mfrom: (2698 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2699.
  • Revision ID: aaron.bentley@utoronto.ca-20070814233548-ctlr8sb1lcufb3ny
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
399
399
            # the basis tree is a ghost so return an empty tree.
400
400
            return self.branch.repository.revision_tree(None)
401
401
 
 
402
    def _cleanup(self):
 
403
        self._flush_ignore_list_cache()
 
404
 
402
405
    @staticmethod
403
406
    @deprecated_method(zero_eight)
404
407
    def create(branch, directory):
800
803
        self._control_files.put(filename, my_file)
801
804
 
802
805
    @needs_write_lock # because merge pulls data into the branch.
803
 
    def merge_from_branch(self, branch, to_revision=None):
 
806
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
 
807
        merge_type=None):
804
808
        """Merge from a branch into this working tree.
805
809
 
806
810
        :param branch: The branch to merge from.
831
835
                merger.other_rev_id)
832
836
            merger.other_branch = branch
833
837
            merger.pp.next_phase()
834
 
            merger.find_base()
 
838
            if from_revision is None:
 
839
                merger.find_base()
 
840
            else:
 
841
                merger.set_base_revision(from_revision, branch)
835
842
            if merger.base_rev_id == merger.other_rev_id:
836
843
                raise errors.PointlessMerge
837
844
            merger.backup_files = False
838
 
            merger.merge_type = Merge3Merger
 
845
            if merge_type is None:
 
846
                merger.merge_type = Merge3Merger
 
847
            else:
 
848
                merger.merge_type = merge_type
839
849
            merger.set_interesting_files(None)
840
850
            merger.show_base = False
841
851
            merger.reprocess = False
2399
2409
            raise
2400
2410
 
2401
2411
    def unlock(self):
 
2412
        # do non-implementation specific cleanup
 
2413
        self._cleanup()
 
2414
 
2402
2415
        # we share control files:
2403
2416
        if self._control_files._lock_count == 3:
2404
2417
            # _inventory_is_modified is always False during a read lock.
2470
2483
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2471
2484
 
2472
2485
    def unlock(self):
 
2486
        # do non-implementation specific cleanup
 
2487
        self._cleanup()
2473
2488
        if self._control_files._lock_count == 1:
2474
2489
            # _inventory_is_modified is always False during a read lock.
2475
2490
            if self._inventory_is_modified: