← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-18 20:42:38 UTC
  • mfrom: (2625 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070718204238-5gi11fx04q7zt72d
[merge] bzr.dev 2625

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
52
52
    ignores,
53
53
    merge,
54
54
    osutils,
 
55
    revision as _mod_revision,
55
56
    revisiontree,
56
57
    textui,
57
58
    transform,
1089
1090
        # missing on access.
1090
1091
        for rev_id, tree in parents_list:
1091
1092
            rev_id = osutils.safe_revision_id(rev_id)
 
1093
            _mod_revision.check_not_reserved_id(rev_id)
1092
1094
            if tree is not None:
1093
1095
                real_trees.append((rev_id, tree))
1094
1096
            else:
1488
1490
            return parent_details[1]
1489
1491
        return None
1490
1492
 
 
1493
    def get_weave(self, file_id):
 
1494
        return self._repository.weave_store.get_weave(file_id,
 
1495
                self._repository.get_transaction())
 
1496
 
1491
1497
    def get_file(self, file_id):
1492
1498
        return StringIO(self.get_file_text(file_id))
1493
1499