/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_4.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
1372
1372
 
1373
1373
 
1374
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
 
1375
 
1375
1376
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1377
                   accelerator_tree=None, hardlink=False):
1377
1378
        """See WorkingTreeFormat.initialize().
1755
1756
            return None
1756
1757
        parent_index = self._get_parent_index()
1757
1758
        last_changed_revision = entry[1][parent_index][4]
1758
 
        return self._repository.get_revision(last_changed_revision).timestamp
 
1759
        try:
 
1760
            rev = self._repository.get_revision(last_changed_revision)
 
1761
        except errors.NoSuchRevision:
 
1762
            raise errors.FileTimestampUnavailable(self.id2path(file_id))
 
1763
        return rev.timestamp
1759
1764
 
1760
1765
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1761
1766
        entry = self._get_entry(file_id=file_id, path=path)
1828
1833
        entry = self._get_entry(file_id=file_id)[1]
1829
1834
        if entry is None:
1830
1835
            raise errors.NoSuchId(tree=self, file_id=file_id)
1831
 
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
 
1836
        parent_index = self._get_parent_index()
 
1837
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
1832
1838
 
1833
1839
    def stored_kind(self, file_id):
1834
1840
        """See Tree.stored_kind"""
1974
1980
        return result
1975
1981
 
1976
1982
    @classmethod
1977
 
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
 
1983
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
 
1984
                                                  target):
1978
1985
        from bzrlib.tests.test__dirstate_helpers import \
1979
 
            CompiledDirstateHelpersFeature
1980
 
        if not CompiledDirstateHelpersFeature.available():
1981
 
            from bzrlib.tests import UnavailableFeature
1982
 
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
 
1986
            compiled_dirstate_helpers_feature
 
1987
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1983
1988
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1984
1989
        result = klass.make_source_parent_tree(source, target)
1985
1990
        result[1]._iter_changes = ProcessEntryC