← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2008-09-19 06:53:41 UTC
  • mto: (3696.5.1 commit-updates)
  • mto: This revision was merged to the branch mainline in revision 3741.
  • Revision ID: robertc@robertcollins.net-20080919065341-5t5w1p2gi926nfia
First cut - make it work - at updating the tree stat cache during commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
548
548
                # path is missing on disk.
549
549
                continue
550
550
 
 
551
    def _observed_sha1(self, file_id, path, sha1):
 
552
        """See MutableTree._observed_sha1."""
 
553
        state = self.current_dirstate()
 
554
        entry = self._get_entry(file_id=file_id, path=path)
 
555
        statvalue = os.lstat(self.abspath(path))
 
556
        state._observed_sha1(entry, sha1, statvalue)
 
557
 
551
558
    def kind(self, file_id):
552
559
        """Return the kind of a file.
553
560
 
1110
1117
                real_trees.append((rev_id, tree))
1111
1118
            else:
1112
1119
                real_trees.append((rev_id,
1113
 
                    self.branch.repository.revision_tree(None)))
 
1120
                    self.branch.repository.revision_tree(
 
1121
                        _mod_revision.NULL_REVISION)))
1114
1122
                ghosts.append(rev_id)
1115
1123
            accepted_revisions.add(rev_id)
1116
1124
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)