/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5247.1.4 by Vincent Ladeuil
Merge cleanup into first-try
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
846 by Martin Pool
- start adding refactored/simplified hash cache
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
846 by Martin Pool
- start adding refactored/simplified hash cache
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
846 by Martin Pool
- start adding refactored/simplified hash cache
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
846 by Martin Pool
- start adding refactored/simplified hash cache
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
19
# TODO: Up-front, stat all files in order and remove those which are deleted or
20
# out-of-date.  Don't actually re-read them until they're needed.  That ought
21
# to bring all the inodes into core so that future stats to them are fast, and
953 by Martin Pool
- refactor imports and stats for hashcache
22
# it preserves the nice property that any caller will always get up-to-date
23
# data except in unavoidable cases.
864 by Martin Pool
doc
24
25
# TODO: Perhaps return more details on the file to avoid statting it
26
# again: nonexistent, file type, size, etc
27
1213 by Martin Pool
- move import in hashcache
28
# TODO: Perhaps use a Python pickle instead of a text file; might be faster.
29
864 by Martin Pool
doc
30
31
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
32
CACHE_HEADER = "### bzr hashcache v5\n"
859 by Martin Pool
- add HashCache.write and a simple test for it
33
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
34
import os
35
import stat
36
import time
953 by Martin Pool
- refactor imports and stats for hashcache
37
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
38
from . import (
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
39
    atomicfile,
40
    errors,
41
    filters as _mod_filters,
42
    osutils,
43
    trace,
44
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
45
from .sixish import (
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
46
    text_type,
47
    )
1540.1.1 by Martin Pool
[patch] stat-cache fixes from Denys
48
49
1185.59.10 by Denys Duchier
hashcache: new constants and improved comment
50
FP_MTIME_COLUMN = 1
51
FP_CTIME_COLUMN = 2
1092.2.6 by Robert Collins
symlink support updated to work
52
FP_MODE_COLUMN = 5
859 by Martin Pool
- add HashCache.write and a simple test for it
53
846 by Martin Pool
- start adding refactored/simplified hash cache
54
55
56
class HashCache(object):
57
    """Cache for looking up file SHA-1.
58
59
    Files are considered to match the cached value if the fingerprint
60
    of the file has not changed.  This includes its mtime, ctime,
61
    device number, inode number, and size.  This should catch
62
    modifications or replacement of the file by a new one.
63
64
    This may not catch modifications that do not change the file's
65
    size and that occur within the resolution window of the
66
    timestamps.  To handle this we specifically do not cache files
67
    which have changed since the start of the present second, since
68
    they could undetectably change again.
69
70
    This scheme may fail if the machine's clock steps backwards.
71
    Don't do that.
72
73
    This does not canonicalize the paths passed in; that should be
74
    done by the caller.
75
860 by Martin Pool
- refactor hashcache to use just one dictionary
76
    _cache
77
        Indexed by path, points to a two-tuple of the SHA-1 of the file.
78
        and its fingerprint.
846 by Martin Pool
- start adding refactored/simplified hash cache
79
80
    stat_count
81
        number of times files have been statted
82
83
    hit_count
84
        number of times files have been retrieved from the cache, avoiding a
85
        re-read
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
86
846 by Martin Pool
- start adding refactored/simplified hash cache
87
    miss_count
88
        number of misses (times files have been completely re-read)
89
    """
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
90
    needs_write = False
91
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
92
    def __init__(self, root, cache_file_name, mode=None,
93
            content_filter_stack_provider=None):
94
        """Create a hash cache in base dir, and set the file mode to mode.
95
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
96
        :param content_filter_stack_provider: a function that takes a
97
            path (relative to the top of the tree) and a file-id as
3368.2.19 by Ian Clatworthy
first round of changes from abentley's review
98
            parameters and returns a stack of ContentFilters.
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
99
            If None, no content filtering is performed.
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
100
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
101
        if not isinstance(root, text_type):
102
            raise ValueError("Base dir for hashcache must be text")
103
        self.root = root
846 by Martin Pool
- start adding refactored/simplified hash cache
104
        self.hit_count = 0
105
        self.miss_count = 0
106
        self.stat_count = 0
107
        self.danger_count = 0
953 by Martin Pool
- refactor imports and stats for hashcache
108
        self.removed_count = 0
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
109
        self.update_count = 0
860 by Martin Pool
- refactor hashcache to use just one dictionary
110
        self._cache = {}
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
111
        self._mode = mode
6621.18.3 by Martin
Remove remaining uses of safe_unicode from hashcache
112
        self._cache_file_name = cache_file_name
3368.2.23 by Ian Clatworthy
cleanup some method names
113
        self._filter_provider = content_filter_stack_provider
846 by Martin Pool
- start adding refactored/simplified hash cache
114
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
115
    def cache_file_name(self):
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
116
        return self._cache_file_name
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
117
846 by Martin Pool
- start adding refactored/simplified hash cache
118
    def clear(self):
860 by Martin Pool
- refactor hashcache to use just one dictionary
119
        """Discard all cached information.
120
121
        This does not reset the counters."""
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
122
        if self._cache:
123
            self.needs_write = True
124
            self._cache = {}
846 by Martin Pool
- start adding refactored/simplified hash cache
125
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
126
    def scan(self):
127
        """Scan all files and remove entries where the cache entry is obsolete.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
128
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
129
        Obsolete entries are those where the file has been modified or deleted
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
130
        since the entry was inserted.
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
131
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
132
        # Stat in inode order as optimisation for at least linux.
133
        def inode_order(path_and_cache):
134
            return path_and_cache[1][1][3]
135
        for inum, path, cache_entry in sorted(self._cache, key=inode_order):
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
136
            abspath = osutils.pathjoin(self.root, path)
1845.1.3 by Martin Pool
Improvements to hashcache testing:
137
            fp = self._fingerprint(abspath)
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
138
            self.stat_count += 1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
139
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
140
            cache_fp = cache_entry[1]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
141
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
142
            if (not fp) or (cache_fp != fp):
143
                # not here or not a regular file anymore
144
                self.removed_count += 1
145
                self.needs_write = True
146
                del self._cache[path]
147
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
148
    def get_sha1(self, path, stat_value=None):
953 by Martin Pool
- refactor imports and stats for hashcache
149
        """Return the sha1 of a file.
846 by Martin Pool
- start adding refactored/simplified hash cache
150
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
151
        abspath = osutils.pathjoin(self.root, path)
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
152
        self.stat_count += 1
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
153
        file_fp = self._fingerprint(abspath, stat_value)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
154
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
155
        if not file_fp:
156
            # not a regular file or not existing
157
            if path in self._cache:
158
                self.removed_count += 1
159
                self.needs_write = True
160
                del self._cache[path]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
161
            return None
953 by Martin Pool
- refactor imports and stats for hashcache
162
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
163
        if path in self._cache:
164
            cache_sha1, cache_fp = self._cache[path]
860 by Martin Pool
- refactor hashcache to use just one dictionary
165
        else:
166
            cache_sha1, cache_fp = None, None
846 by Martin Pool
- start adding refactored/simplified hash cache
167
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
168
        if cache_fp == file_fp:
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
169
            ## mutter("hashcache hit for %s %r -> %s", path, file_fp, cache_sha1)
170
            ## mutter("now = %s", time.time())
846 by Martin Pool
- start adding refactored/simplified hash cache
171
            self.hit_count += 1
860 by Martin Pool
- refactor hashcache to use just one dictionary
172
            return cache_sha1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
173
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
174
        self.miss_count += 1
1092.2.6 by Robert Collins
symlink support updated to work
175
176
        mode = file_fp[FP_MODE_COLUMN]
177
        if stat.S_ISREG(mode):
3368.2.23 by Ian Clatworthy
cleanup some method names
178
            if self._filter_provider is None:
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
179
                filters = []
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
180
            else:
3368.2.23 by Ian Clatworthy
cleanup some method names
181
                filters = self._filter_provider(path=path, file_id=None)
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
182
            digest = self._really_sha1_file(abspath, filters)
1092.2.6 by Robert Collins
symlink support updated to work
183
        elif stat.S_ISLNK(mode):
6621.18.3 by Martin
Remove remaining uses of safe_unicode from hashcache
184
            target = osutils.readlink(abspath)
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
185
            digest = osutils.sha_string(target.encode('UTF-8'))
1092.2.6 by Robert Collins
symlink support updated to work
186
        else:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
187
            raise errors.BzrError("file %r: unknown file stat mode: %o"
188
                                  % (abspath, mode))
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
189
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
190
        # window of 3 seconds to allow for 2s resolution on windows,
191
        # unsynchronized file servers, etc.
1845.1.3 by Martin Pool
Improvements to hashcache testing:
192
        cutoff = self._cutoff_time()
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
193
        if file_fp[FP_MTIME_COLUMN] >= cutoff \
194
                or file_fp[FP_CTIME_COLUMN] >= cutoff:
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
195
            # changed too recently; can't be cached.  we can
196
            # return the result and it could possibly be cached
197
            # next time.
1185.59.10 by Denys Duchier
hashcache: new constants and improved comment
198
            #
199
            # the point is that we only want to cache when we are sure that any
200
            # subsequent modifications of the file can be detected.  If a
201
            # modification neither changes the inode, the device, the size, nor
202
            # the mode, then we can only distinguish it by time; therefore we
203
            # need to let sufficient time elapse before we may cache this entry
204
            # again.  If we didn't do this, then, for example, a very quick 1
205
            # byte replacement in the file might go undetected.
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
206
            ## mutter('%r modified too recently; not caching', path)
207
            self.danger_count += 1
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
208
            if cache_fp:
209
                self.removed_count += 1
210
                self.needs_write = True
211
                del self._cache[path]
846 by Martin Pool
- start adding refactored/simplified hash cache
212
        else:
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
213
            ## mutter('%r added to cache: now=%f, mtime=%d, ctime=%d',
214
            ##        path, time.time(), file_fp[FP_MTIME_COLUMN],
215
            ##        file_fp[FP_CTIME_COLUMN])
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
216
            self.update_count += 1
217
            self.needs_write = True
218
            self._cache[path] = (digest, file_fp)
219
        return digest
1845.1.3 by Martin Pool
Improvements to hashcache testing:
220
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
221
    def _really_sha1_file(self, abspath, filters):
1845.1.3 by Martin Pool
Improvements to hashcache testing:
222
        """Calculate the SHA1 of a file by reading the full text"""
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
223
        return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
224
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
225
    def write(self):
859 by Martin Pool
- add HashCache.write and a simple test for it
226
        """Write contents of cache to file."""
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
227
        outf = atomicfile.AtomicFile(self.cache_file_name(), 'wb',
228
                                     new_mode=self._mode)
859 by Martin Pool
- add HashCache.write and a simple test for it
229
        try:
1908.4.8 by John Arbash Meinel
Small tweak to hashcache to make it write out faster
230
            outf.write(CACHE_HEADER)
859 by Martin Pool
- add HashCache.write and a simple test for it
231
860 by Martin Pool
- refactor hashcache to use just one dictionary
232
            for path, c  in self._cache.iteritems():
1908.4.8 by John Arbash Meinel
Small tweak to hashcache to make it write out faster
233
                line_info = [path.encode('utf-8'), '// ', c[0], ' ']
234
                line_info.append(' '.join([str(fld) for fld in c[1]]))
235
                line_info.append('\n')
236
                outf.write(''.join(line_info))
859 by Martin Pool
- add HashCache.write and a simple test for it
237
            outf.commit()
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
238
            self.needs_write = False
1845.1.1 by mbp at sourcefrog
Refactor and improve hashcache tests
239
            ## mutter("write hash cache: %s hits=%d misses=%d stat=%d recent=%d updates=%d",
240
            ##        self.cache_file_name(), self.hit_count, self.miss_count,
241
            ##        self.stat_count,
242
            ##        self.danger_count, self.update_count)
859 by Martin Pool
- add HashCache.write and a simple test for it
243
        finally:
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
244
            outf.close()
862 by Martin Pool
- code to re-read hashcache from file
245
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
246
    def read(self):
862 by Martin Pool
- code to re-read hashcache from file
247
        """Reinstate cache from file.
248
249
        Overwrites existing cache.
250
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
251
        If the cache file has the wrong version marker, this just clears
862 by Martin Pool
- code to re-read hashcache from file
252
        the cache."""
253
        self._cache = {}
254
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
255
        fn = self.cache_file_name()
256
        try:
948 by Martin Pool
- more buffering when reading/writing hashcache
257
            inf = file(fn, 'rb', buffering=65000)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
258
        except IOError as e:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
259
            trace.mutter("failed to open %s: %s", fn, e)
1214 by Martin Pool
- hashcache should be written out if it can't be read
260
            # better write it now so it is valid
261
            self.needs_write = True
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
262
            return
263
862 by Martin Pool
- code to re-read hashcache from file
264
        hdr = inf.readline()
265
        if hdr != CACHE_HEADER:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
266
            trace.mutter('cache header marker not found at top of %s;'
267
                         ' discarding cache', fn)
1214 by Martin Pool
- hashcache should be written out if it can't be read
268
            self.needs_write = True
862 by Martin Pool
- code to re-read hashcache from file
269
            return
270
271
        for l in inf:
272
            pos = l.index('// ')
273
            path = l[:pos].decode('utf-8')
274
            if path in self._cache:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
275
                trace.warning('duplicated path %r in cache' % path)
862 by Martin Pool
- code to re-read hashcache from file
276
                continue
277
278
            pos += 3
279
            fields = l[pos:].split(' ')
1092.2.6 by Robert Collins
symlink support updated to work
280
            if len(fields) != 7:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
281
                trace.warning("bad line in hashcache: %r" % l)
862 by Martin Pool
- code to re-read hashcache from file
282
                continue
283
284
            sha1 = fields[0]
285
            if len(sha1) != 40:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
286
                trace.warning("bad sha1 in hashcache: %r" % sha1)
862 by Martin Pool
- code to re-read hashcache from file
287
                continue
288
6621.18.1 by Martin
Remove or fix use of long type and nearby type issues
289
            fp = tuple(map(int, fields[1:]))
862 by Martin Pool
- code to re-read hashcache from file
290
291
            self._cache[path] = (sha1, fp)
292
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
293
        # GZ 2009-09-20: Should really use a try/finally block to ensure close
294
        inf.close()
295
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
296
        self.needs_write = False
1845.1.3 by Martin Pool
Improvements to hashcache testing:
297
298
    def _cutoff_time(self):
299
        """Return cutoff time.
300
301
        Files modified more recently than this time are at risk of being
302
        undetectably modified and so can't be cached.
303
        """
304
        return int(time.time()) - 3
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
305
2012.1.18 by Aaron Bentley
rename fs param to stat_value
306
    def _fingerprint(self, abspath, stat_value=None):
307
        if stat_value is None:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
308
            try:
2012.1.18 by Aaron Bentley
rename fs param to stat_value
309
                stat_value = os.lstat(abspath)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
310
            except OSError:
311
                # might be missing, etc
312
                return None
2012.1.18 by Aaron Bentley
rename fs param to stat_value
313
        if stat.S_ISDIR(stat_value.st_mode):
1845.1.3 by Martin Pool
Improvements to hashcache testing:
314
            return None
315
        # we discard any high precision because it's not reliable; perhaps we
316
        # could do better on some systems?
6621.18.1 by Martin
Remove or fix use of long type and nearby type issues
317
        return (stat_value.st_size, int(stat_value.st_mtime),
318
                int(stat_value.st_ctime), stat_value.st_ino,
2012.1.18 by Aaron Bentley
rename fs param to stat_value
319
                stat_value.st_dev, stat_value.st_mode)