← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
34
34
    """
35
35
 
36
36
    def __init__(self, branch, inv, revision_id):
37
 
        # for compatability the 'branch' parameter has not been renamed to 
 
37
        # for compatability the 'branch' parameter has not been renamed to
38
38
        # repository at this point. However, we should change RevisionTree's
39
 
        # construction to always be via Repository and not via direct 
 
39
        # construction to always be via Repository and not via direct
40
40
        # construction - this will mean that we can change the constructor
41
41
        # with much less chance of breaking client code.
42
42
        self._repository = branch
58
58
            parent_ids = self._repository.get_revision(
59
59
                self._revision_id).parent_ids
60
60
        return parent_ids
61
 
        
 
61
 
62
62
    def get_revision_id(self):
63
63
        """Return the revision id associated with this tree."""
64
64
        return self._revision_id