~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

[merge] bzr.dev 2294

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
 
from bzrlib import revision
 
21
from bzrlib import (
 
22
    osutils,
 
23
    revision,
 
24
    )
22
25
from bzrlib.tree import Tree
23
26
 
24
27
 
41
44
        self._repository = branch
42
45
        self._weave_store = branch.weave_store
43
46
        self._inventory = inv
44
 
        self._revision_id = revision_id
 
47
        self._revision_id = osutils.safe_revision_id(revision_id)
45
48
 
46
49
    def get_parent_ids(self):
47
50
        """See Tree.get_parent_ids.