~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tree classes, representing directory at point in time.
18
"""
19
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
20
import os
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
21
from cStringIO import StringIO
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
22
from warnings import warn
800 by Martin Pool
Merge John's import-speedup branch:
23
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
import bzrlib
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
25
from bzrlib import delta
26
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
27
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
28
from bzrlib import errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
29
from bzrlib.inventory import Inventory
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
30
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
31
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
32
import bzrlib.revision
33
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
34
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
35
558 by Martin Pool
- All top-level classes inherit from object
36
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
37
    """Abstract file tree.
38
39
    There are several subclasses:
40
    
41
    * `WorkingTree` exists as files on disk editable by the user.
42
43
    * `RevisionTree` is a tree as recorded at some point in the past.
44
45
    Trees contain an `Inventory` object, and also know how to retrieve
46
    file texts mentioned in the inventory, either from a working
47
    directory or from a store.
48
49
    It is possible for trees to contain files that are not described
50
    in their inventory or vice versa; for this use `filenames()`.
51
52
    Trees can be compared, etc, regardless of whether they are working
53
    trees or versioned trees.
54
    """
55
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
56
    def changes_from(self, other, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
57
        extra_trees=None, require_versioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
58
        """Return a TreeDelta of the changes from other to this tree.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
59
60
        :param other: A tree to compare with.
61
        :param specific_files: An optional list of file paths to restrict the
62
            comparison to. When mapping filenames to ids, all matches in all
63
            trees (including optional extra_trees) are used, and all children of
64
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
65
        :param want_unchanged: An optional boolean requesting the inclusion of
66
            unchanged entries in the result.
67
        :param extra_trees: An optional list of additional trees to use when
68
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
69
        :param require_versioned: An optional boolean (defaults to False). When
70
            supplied and True all the 'specific_files' must be versioned, or
71
            a PathsNotVersionedError will be thrown.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
72
1852.8.4 by Robert Collins
Hook InterTree into Tree.
73
        The comparison will be performed by an InterTree object looked up on 
74
        self and other.
75
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
76
        # Martin observes that Tree.changes_from returns a TreeDelta and this
77
        # may confuse people, because the class name of the returned object is
78
        # a synonym of the object referenced in the method name.
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
79
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
80
            want_unchanged=want_unchanged,
81
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
82
            extra_trees=extra_trees,
83
            require_versioned=require_versioned,
84
            )
1852.8.4 by Robert Collins
Hook InterTree into Tree.
85
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
86
    def conflicts(self):
87
        """Get a list of the conflicts in the tree.
88
89
        Each conflict is an instance of bzrlib.conflicts.Conflict.
90
        """
91
        return []
92
93
    def get_parent_ids(self):
94
        """Get the parent ids for this tree. 
95
96
        :return: a list of parent ids. [] is returned to indicate
97
        a tree with no parents.
98
        :raises: BzrError if the parents are not known.
99
        """
100
        raise NotImplementedError(self.get_parent_ids)
101
    
1 by mbp at sourcefrog
import from baz patch-364
102
    def has_filename(self, filename):
103
        """True if the tree has given filename."""
104
        raise NotImplementedError()
105
1185.12.39 by abentley
Propogated has_or_had_id to Tree
106
    def has_id(self, file_id):
107
        return self.inventory.has_id(file_id)
108
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
109
    __contains__ = has_id
110
1185.12.39 by abentley
Propogated has_or_had_id to Tree
111
    def has_or_had_id(self, file_id):
112
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
113
            return True
1 by mbp at sourcefrog
import from baz patch-364
114
        return self.inventory.has_id(file_id)
115
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
116
    def __iter__(self):
117
        return iter(self.inventory)
118
1 by mbp at sourcefrog
import from baz patch-364
119
    def id2path(self, file_id):
120
        return self.inventory.id2path(file_id)
121
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
122
    def is_control_filename(self, filename):
123
        """True if filename is the name of a control file in this tree.
124
        
125
        :param filename: A filename within the tree. This is a relative path
126
        from the root of this tree.
127
128
        This is true IF and ONLY IF the filename is part of the meta data
129
        that bzr controls in this tree. I.E. a random .bzr directory placed
130
        on disk will not be a control file for this tree.
131
        """
132
        return self.bzrdir.is_control_filename(filename)
133
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
134
    def iter_entries_by_dir(self):
135
        """Walk the tree in 'by_dir' order.
136
137
        This will yield each entry in the tree as a (path, entry) tuple. The
138
        order that they are yielded is: the contents of a directory are 
139
        preceeded by the parent of a directory, and all the contents of a 
140
        directory are grouped together.
141
        """
142
        return self.inventory.iter_entries_by_dir()
143
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
144
    def kind(self, file_id):
145
        raise NotImplementedError("subclasses must implement kind")
146
1 by mbp at sourcefrog
import from baz patch-364
147
    def _get_inventory(self):
148
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
149
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
150
    def get_file(self, file_id):
151
        """Return a file object for the file file_id in the tree."""
152
        raise NotImplementedError(self.get_file)
153
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
154
    def get_file_by_path(self, path):
155
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
156
157
    inventory = property(_get_inventory,
158
                         doc="Inventory of this Tree")
159
160
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
161
        if not __debug__:
162
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
163
        fp = fingerprint_file(f)
164
        f.seek(0)
165
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
166
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
167
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
168
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
169
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
170
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
171
                         "store is probably damaged/corrupt"])
172
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
173
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
174
            raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
175
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
176
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
177
                     "store is probably damaged/corrupt"])
178
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
179
    def path2id(self, path):
180
        """Return the id for path in this tree."""
181
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
182
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
183
    def print_file(self, file_id):
184
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
185
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
186
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
187
188
    def lock_read(self):
189
        pass
190
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
191
    def unknowns(self):
192
        """What files are present in this tree and unknown.
193
        
194
        :return: an iterator over the unknown files.
195
        """
196
        return iter([])
197
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
198
    def unlock(self):
199
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
200
201
    def filter_unversioned_files(self, paths):
202
        """Filter out paths that are not versioned.
203
204
        :return: set of paths.
205
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
206
        # NB: we specifically *don't* call self.has_filename, because for
207
        # WorkingTrees that can indicate files that exist on disk but that 
208
        # are not versioned.
209
        pred = self.inventory.has_filename
210
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
211
212
213
# for compatibility
214
from bzrlib.revisiontree import RevisionTree
215
 
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
216
1 by mbp at sourcefrog
import from baz patch-364
217
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
218
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
219
    def __init__(self):
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
220
        self._inventory = Inventory()
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
221
        warn('EmptyTree is deprecated as of bzr 0.9 please use '
222
            'repository.revision_tree instead.',
223
            DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
224
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
225
    def get_parent_ids(self):
226
        return []
227
1092.2.6 by Robert Collins
symlink support updated to work
228
    def get_symlink_target(self, file_id):
229
        return None
230
1 by mbp at sourcefrog
import from baz patch-364
231
    def has_filename(self, filename):
232
        return False
233
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
234
    def kind(self, file_id):
235
        assert self._inventory[file_id].kind == "directory"
236
        return "directory"
237
1907.1.5 by Aaron Bentley
Remove include_root parameter from list_files
238
    def list_files(self):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
239
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
240
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
241
    def __contains__(self, file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
242
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
243
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
244
    def get_file_sha1(self, file_id, path=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
245
        return None
246
247
1 by mbp at sourcefrog
import from baz patch-364
248
######################################################################
249
# diff
250
251
# TODO: Merge these two functions into a single one that can operate
252
# on either a whole tree or a set of files.
253
254
# TODO: Return the diff in order by filename, not by category or in
255
# random order.  Can probably be done by lock-stepping through the
256
# filenames from both trees.
257
258
259
def file_status(filename, old_tree, new_tree):
260
    """Return single-letter status, old and new names for a file.
261
262
    The complexity here is in deciding how to represent renames;
263
    many complex cases are possible.
264
    """
265
    old_inv = old_tree.inventory
266
    new_inv = new_tree.inventory
267
    new_id = new_inv.path2id(filename)
268
    old_id = old_inv.path2id(filename)
269
270
    if not new_id and not old_id:
271
        # easy: doesn't exist in either; not versioned at all
272
        if new_tree.is_ignored(filename):
273
            return 'I', None, None
274
        else:
275
            return '?', None, None
276
    elif new_id:
277
        # There is now a file of this name, great.
278
        pass
279
    else:
280
        # There is no longer a file of this name, but we can describe
281
        # what happened to the file that used to have
282
        # this name.  There are two possibilities: either it was
283
        # deleted entirely, or renamed.
284
        assert old_id
285
        if new_inv.has_id(old_id):
286
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
287
        else:
288
            return 'D', old_inv.id2path(old_id), None
289
290
    # if the file_id is new in this revision, it is added
291
    if new_id and not old_inv.has_id(new_id):
292
        return 'A'
293
294
    # if there used to be a file of this name, but that ID has now
295
    # disappeared, it is deleted
296
    if old_id and not new_inv.has_id(old_id):
297
        return 'D'
298
299
    return 'wtf?'
300
301
    
302
164 by mbp at sourcefrog
new 'renames' command
303
def find_renames(old_inv, new_inv):
304
    for file_id in old_inv:
305
        if file_id not in new_inv:
306
            continue
307
        old_name = old_inv.id2path(file_id)
308
        new_name = new_inv.id2path(file_id)
309
        if old_name != new_name:
310
            yield (old_name, new_name)
311
            
678 by Martin Pool
- export to tarballs
312
1551.7.22 by Aaron Bentley
Changes from review
313
def find_ids_across_trees(filenames, trees, require_versioned=True):
314
    """Find the ids corresponding to specified filenames.
315
    
316
    All matches in all trees will be used, and all children of matched
317
    directories will be used.
318
319
    :param filenames: The filenames to find file_ids for
320
    :param trees: The trees to find file_ids within
321
    :param require_versioned: if true, all specified filenames must occur in
322
    at least one tree.
323
    :return: a set of file ids for the specified filenames and their children.
324
    """
325
    if not filenames:
326
        return None
327
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
328
                                                    require_versioned)
329
    return _find_children_across_trees(specified_ids, trees)
330
331
332
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
333
    """Find the ids corresponding to specified filenames.
334
    
335
    All matches in all trees will be used.
336
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
337
    :param filenames: The filenames to find file_ids for
338
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
339
    :param require_versioned: if true, all specified filenames must occur in
340
    at least one tree.
341
    :return: a set of file ids for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
342
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
343
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
344
    interesting_ids = set()
345
    for tree_path in filenames:
346
        not_found = True
347
        for tree in trees:
348
            file_id = tree.inventory.path2id(tree_path)
349
            if file_id is not None:
350
                interesting_ids.add(file_id)
351
                not_found = False
352
        if not_found:
353
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
354
    if len(not_versioned) > 0 and require_versioned:
355
        raise errors.PathsNotVersionedError(not_versioned)
356
    return interesting_ids
357
358
359
def _find_children_across_trees(specified_ids, trees):
360
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
361
    
1551.7.22 by Aaron Bentley
Changes from review
362
    All matches in all trees will be used.
363
364
    :param trees: The trees to find file_ids within
365
    :return: a set containing all specified ids and their children 
366
    """
367
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
368
    pending = interesting_ids
369
    # now handle children of interesting ids
370
    # we loop so that we handle all children of each id in both trees
371
    while len(pending) > 0:
372
        new_pending = set()
373
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
374
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
375
                if file_id not in tree:
376
                    continue
377
                entry = tree.inventory[file_id]
378
                for child in getattr(entry, 'children', {}).itervalues():
379
                    if child.file_id not in interesting_ids:
380
                        new_pending.add(child.file_id)
381
        interesting_ids.update(new_pending)
382
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
383
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
384
385
386
class InterTree(InterObject):
387
    """This class represents operations taking place between two Trees.
388
389
    Its instances have methods like 'compare' and contain references to the
390
    source and target trees these operations are to be carried out on.
391
392
    clients of bzrlib should not need to use InterTree directly, rather they
393
    should use the convenience methods on Tree such as 'Tree.compare()' which
394
    will pass through to InterTree as appropriate.
395
    """
396
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
397
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
398
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
399
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
400
    def compare(self, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
401
        extra_trees=None, require_versioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
402
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
403
404
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
405
        :param specific_files: An optional list of file paths to restrict the
406
            comparison to. When mapping filenames to ids, all matches in all
407
            trees (including optional extra_trees) are used, and all children of
408
            matched directories are included.
409
        :param want_unchanged: An optional boolean requesting the inclusion of
410
            unchanged entries in the result.
411
        :param extra_trees: An optional list of additional trees to use when
412
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
413
        :param require_versioned: An optional boolean (defaults to False). When
414
            supplied and True all the 'specific_files' must be versioned, or
415
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
416
        """
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
417
        # NB: show_status depends on being able to pass in non-versioned files and
418
        # report them as unknown
419
        trees = (self.source, self.target)
420
        if extra_trees is not None:
421
            trees = trees + tuple(extra_trees)
422
        specific_file_ids = find_ids_across_trees(specific_files,
423
            trees, require_versioned=require_versioned)
424
        if specific_files and not specific_file_ids:
425
            # All files are unversioned, so just return an empty delta
426
            # _compare_trees would think we want a complete delta
427
            return delta.TreeDelta()
428
        return delta._compare_trees(self.source, self.target, want_unchanged,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
429
            specific_file_ids)