/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: Martin Pool
  • Date: 2011-06-28 17:25:26 UTC
  • mfrom: (5999 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6001.
  • Revision ID: mbp@canonical.com-20110628172526-10cok2s17dvw7x62
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
496
496
        finally:
497
497
            file.close()
498
498
 
499
 
    def _get_ancestors(self, default_revision):
500
 
        ancestors = set([default_revision])
501
 
        for parent_id in self.get_parent_ids():
502
 
            ancestors.update(self.branch.repository.get_ancestry(
503
 
                             parent_id, topo_sorted=False))
504
 
        return ancestors
505
 
 
506
499
    def get_parent_ids(self):
507
500
        """See Tree.get_parent_ids.
508
501
 
3021
3014
    missing_parent_conflicts = False
3022
3015
    """If this format supports missing parent conflicts."""
3023
3016
 
 
3017
    supports_versioned_directories = None
 
3018
 
3024
3019
    @classmethod
3025
3020
    def find_format_string(klass, a_bzrdir):
3026
3021
        """Return format name for the working tree object in a_bzrdir."""