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