/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
6813.3.1 by Martin
Make hashcache pass tests on Python 3
32
CACHE_HEADER = b"### 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,
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
47
    viewitems,
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
48
    )
1540.1.1 by Martin Pool
[patch] stat-cache fixes from Denys
49
50
1185.59.10 by Denys Duchier
hashcache: new constants and improved comment
51
FP_MTIME_COLUMN = 1
52
FP_CTIME_COLUMN = 2
1092.2.6 by Robert Collins
symlink support updated to work
53
FP_MODE_COLUMN = 5
859 by Martin Pool
- add HashCache.write and a simple test for it
54
846 by Martin Pool
- start adding refactored/simplified hash cache
55
56
57
class HashCache(object):
58
    """Cache for looking up file SHA-1.
59
60
    Files are considered to match the cached value if the fingerprint
61
    of the file has not changed.  This includes its mtime, ctime,
62
    device number, inode number, and size.  This should catch
63
    modifications or replacement of the file by a new one.
64
65
    This may not catch modifications that do not change the file's
66
    size and that occur within the resolution window of the
67
    timestamps.  To handle this we specifically do not cache files
68
    which have changed since the start of the present second, since
69
    they could undetectably change again.
70
71
    This scheme may fail if the machine's clock steps backwards.
72
    Don't do that.
73
74
    This does not canonicalize the paths passed in; that should be
75
    done by the caller.
76
860 by Martin Pool
- refactor hashcache to use just one dictionary
77
    _cache
78
        Indexed by path, points to a two-tuple of the SHA-1 of the file.
79
        and its fingerprint.
846 by Martin Pool
- start adding refactored/simplified hash cache
80
81
    stat_count
82
        number of times files have been statted
83
84
    hit_count
85
        number of times files have been retrieved from the cache, avoiding a
86
        re-read
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
87
846 by Martin Pool
- start adding refactored/simplified hash cache
88
    miss_count
89
        number of misses (times files have been completely re-read)
90
    """
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.
91
    needs_write = False
92
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
93
    def __init__(self, root, cache_file_name, mode=None,
94
            content_filter_stack_provider=None):
95
        """Create a hash cache in base dir, and set the file mode to mode.
96
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
97
        :param content_filter_stack_provider: a function that takes a
98
            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
99
            parameters and returns a stack of ContentFilters.
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
100
            If None, no content filtering is performed.
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
101
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
102
        if not isinstance(root, text_type):
103
            raise ValueError("Base dir for hashcache must be text")
104
        self.root = root
846 by Martin Pool
- start adding refactored/simplified hash cache
105
        self.hit_count = 0
106
        self.miss_count = 0
107
        self.stat_count = 0
108
        self.danger_count = 0
953 by Martin Pool
- refactor imports and stats for hashcache
109
        self.removed_count = 0
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
110
        self.update_count = 0
860 by Martin Pool
- refactor hashcache to use just one dictionary
111
        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.
112
        self._mode = mode
6621.18.3 by Martin
Remove remaining uses of safe_unicode from hashcache
113
        self._cache_file_name = cache_file_name
3368.2.23 by Ian Clatworthy
cleanup some method names
114
        self._filter_provider = content_filter_stack_provider
846 by Martin Pool
- start adding refactored/simplified hash cache
115
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.
116
    def cache_file_name(self):
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
117
        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.
118
846 by Martin Pool
- start adding refactored/simplified hash cache
119
    def clear(self):
860 by Martin Pool
- refactor hashcache to use just one dictionary
120
        """Discard all cached information.
121
122
        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.
123
        if self._cache:
124
            self.needs_write = True
125
            self._cache = {}
846 by Martin Pool
- start adding refactored/simplified hash cache
126
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
127
    def scan(self):
128
        """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
129
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
130
        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
131
        since the entry was inserted.
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
132
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
133
        # Stat in inode order as optimisation for at least linux.
134
        def inode_order(path_and_cache):
135
            return path_and_cache[1][1][3]
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
136
        for path, cache_val in sorted(viewitems(self._cache), key=inode_order):
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
137
            abspath = osutils.pathjoin(self.root, path)
1845.1.3 by Martin Pool
Improvements to hashcache testing:
138
            fp = self._fingerprint(abspath)
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
139
            self.stat_count += 1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
140
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
141
            if not fp or cache_val[1] != fp:
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
142
                # not here or not a regular file anymore
143
                self.removed_count += 1
144
                self.needs_write = True
145
                del self._cache[path]
146
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
147
    def get_sha1(self, path, stat_value=None):
953 by Martin Pool
- refactor imports and stats for hashcache
148
        """Return the sha1 of a file.
846 by Martin Pool
- start adding refactored/simplified hash cache
149
        """
6621.18.2 by Martin
Make bzrlib.hashcache python 3 compatible
150
        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
151
        self.stat_count += 1
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
152
        file_fp = self._fingerprint(abspath, stat_value)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
153
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
154
        if not file_fp:
155
            # not a regular file or not existing
156
            if path in self._cache:
157
                self.removed_count += 1
158
                self.needs_write = True
159
                del self._cache[path]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
160
            return None
953 by Martin Pool
- refactor imports and stats for hashcache
161
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
162
        if path in self._cache:
163
            cache_sha1, cache_fp = self._cache[path]
860 by Martin Pool
- refactor hashcache to use just one dictionary
164
        else:
165
            cache_sha1, cache_fp = None, None
846 by Martin Pool
- start adding refactored/simplified hash cache
166
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
167
        if cache_fp == file_fp:
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
168
            ## mutter("hashcache hit for %s %r -> %s", path, file_fp, cache_sha1)
169
            ## mutter("now = %s", time.time())
846 by Martin Pool
- start adding refactored/simplified hash cache
170
            self.hit_count += 1
860 by Martin Pool
- refactor hashcache to use just one dictionary
171
            return cache_sha1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
173
        self.miss_count += 1
1092.2.6 by Robert Collins
symlink support updated to work
174
175
        mode = file_fp[FP_MODE_COLUMN]
176
        if stat.S_ISREG(mode):
3368.2.23 by Ian Clatworthy
cleanup some method names
177
            if self._filter_provider is None:
3368.2.5 by Ian Clatworthy
incorporate jameinel's review feedback
178
                filters = []
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
179
            else:
3368.2.23 by Ian Clatworthy
cleanup some method names
180
                filters = self._filter_provider(path=path, file_id=None)
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
181
            digest = self._really_sha1_file(abspath, filters)
1092.2.6 by Robert Collins
symlink support updated to work
182
        elif stat.S_ISLNK(mode):
6621.18.3 by Martin
Remove remaining uses of safe_unicode from hashcache
183
            target = osutils.readlink(abspath)
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
184
            digest = osutils.sha_string(target.encode('UTF-8'))
1092.2.6 by Robert Collins
symlink support updated to work
185
        else:
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
186
            raise errors.BzrError("file %r: unknown file stat mode: %o"
187
                                  % (abspath, mode))
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
188
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
189
        # window of 3 seconds to allow for 2s resolution on windows,
190
        # unsynchronized file servers, etc.
1845.1.3 by Martin Pool
Improvements to hashcache testing:
191
        cutoff = self._cutoff_time()
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
192
        if file_fp[FP_MTIME_COLUMN] >= cutoff \
193
                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
194
            # changed too recently; can't be cached.  we can
195
            # return the result and it could possibly be cached
196
            # next time.
1185.59.10 by Denys Duchier
hashcache: new constants and improved comment
197
            #
198
            # the point is that we only want to cache when we are sure that any
199
            # subsequent modifications of the file can be detected.  If a
200
            # modification neither changes the inode, the device, the size, nor
201
            # the mode, then we can only distinguish it by time; therefore we
202
            # need to let sufficient time elapse before we may cache this entry
203
            # again.  If we didn't do this, then, for example, a very quick 1
204
            # 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
205
            ## mutter('%r modified too recently; not caching', path)
206
            self.danger_count += 1
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
207
            if cache_fp:
208
                self.removed_count += 1
209
                self.needs_write = True
210
                del self._cache[path]
846 by Martin Pool
- start adding refactored/simplified hash cache
211
        else:
1845.1.2 by mbp at sourcefrog
Use larger time window on hashcache to be safe with fractional times
212
            ## mutter('%r added to cache: now=%f, mtime=%d, ctime=%d',
213
            ##        path, time.time(), file_fp[FP_MTIME_COLUMN],
214
            ##        file_fp[FP_CTIME_COLUMN])
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
215
            self.update_count += 1
216
            self.needs_write = True
217
            self._cache[path] = (digest, file_fp)
218
        return digest
1845.1.3 by Martin Pool
Improvements to hashcache testing:
219
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
220
    def _really_sha1_file(self, abspath, filters):
1845.1.3 by Martin Pool
Improvements to hashcache testing:
221
        """Calculate the SHA1 of a file by reading the full text"""
4241.14.15 by Vincent Ladeuil
Fix one unicode readlink related test failure.
222
        return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
223
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.
224
    def write(self):
859 by Martin Pool
- add HashCache.write and a simple test for it
225
        """Write contents of cache to file."""
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
226
        with atomicfile.AtomicFile(self.cache_file_name(), 'wb',
227
                new_mode=self._mode) as outf:
1908.4.8 by John Arbash Meinel
Small tweak to hashcache to make it write out faster
228
            outf.write(CACHE_HEADER)
859 by Martin Pool
- add HashCache.write and a simple test for it
229
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
230
            for path, c  in viewitems(self._cache):
6813.3.1 by Martin
Make hashcache pass tests on Python 3
231
                line_info = [path.encode('utf-8'), b'// ', c[0], b' ']
232
                line_info.append(b'%d %d %d %d %d %d' % c[1])
233
                line_info.append(b'\n')
234
                outf.write(b''.join(line_info))
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.
235
            self.needs_write = False
1845.1.1 by mbp at sourcefrog
Refactor and improve hashcache tests
236
            ## mutter("write hash cache: %s hits=%d misses=%d stat=%d recent=%d updates=%d",
237
            ##        self.cache_file_name(), self.hit_count, self.miss_count,
238
            ##        self.stat_count,
239
            ##        self.danger_count, self.update_count)
862 by Martin Pool
- code to re-read hashcache from file
240
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.
241
    def read(self):
862 by Martin Pool
- code to re-read hashcache from file
242
        """Reinstate cache from file.
243
244
        Overwrites existing cache.
245
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
246
        If the cache file has the wrong version marker, this just clears
862 by Martin Pool
- code to re-read hashcache from file
247
        the cache."""
248
        self._cache = {}
249
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.
250
        fn = self.cache_file_name()
251
        try:
6813.3.1 by Martin
Make hashcache pass tests on Python 3
252
            inf = open(fn, 'rb', buffering=65000)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
253
        except IOError as e:
6855.3.1 by Jelmer Vernooij
Several more fixes.
254
            trace.mutter("failed to open %s: %s", fn, str(e))
1214 by Martin Pool
- hashcache should be written out if it can't be read
255
            # better write it now so it is valid
256
            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.
257
            return
258
6813.3.1 by Martin
Make hashcache pass tests on Python 3
259
        with inf:
260
            hdr = inf.readline()
261
            if hdr != CACHE_HEADER:
262
                trace.mutter('cache header marker not found at top of %s;'
263
                             ' discarding cache', fn)
264
                self.needs_write = True
265
                return
266
267
            for l in inf:
268
                pos = l.index(b'// ')
269
                path = l[:pos].decode('utf-8')
270
                if path in self._cache:
271
                    trace.warning('duplicated path %r in cache' % path)
272
                    continue
273
274
                pos += 3
275
                fields = l[pos:].split(b' ')
276
                if len(fields) != 7:
277
                    trace.warning("bad line in hashcache: %r" % l)
278
                    continue
279
280
                sha1 = fields[0]
281
                if len(sha1) != 40:
282
                    trace.warning("bad sha1 in hashcache: %r" % sha1)
283
                    continue
284
285
                fp = tuple(map(int, fields[1:]))
286
287
                self._cache[path] = (sha1, fp)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
288
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.
289
        self.needs_write = False
1845.1.3 by Martin Pool
Improvements to hashcache testing:
290
291
    def _cutoff_time(self):
292
        """Return cutoff time.
293
294
        Files modified more recently than this time are at risk of being
295
        undetectably modified and so can't be cached.
296
        """
297
        return int(time.time()) - 3
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
298
2012.1.18 by Aaron Bentley
rename fs param to stat_value
299
    def _fingerprint(self, abspath, stat_value=None):
300
        if stat_value is None:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
301
            try:
2012.1.18 by Aaron Bentley
rename fs param to stat_value
302
                stat_value = os.lstat(abspath)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
303
            except OSError:
304
                # might be missing, etc
305
                return None
2012.1.18 by Aaron Bentley
rename fs param to stat_value
306
        if stat.S_ISDIR(stat_value.st_mode):
1845.1.3 by Martin Pool
Improvements to hashcache testing:
307
            return None
308
        # we discard any high precision because it's not reliable; perhaps we
309
        # could do better on some systems?
6621.18.1 by Martin
Remove or fix use of long type and nearby type issues
310
        return (stat_value.st_size, int(stat_value.st_mtime),
311
                int(stat_value.st_ctime), stat_value.st_ino,
2012.1.18 by Aaron Bentley
rename fs param to stat_value
312
                stat_value.st_dev, stat_value.st_mode)