/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2009-07-27 06:28:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727062835-o66p8it658tq1sma
Add CountedLock.get_physical_lock_status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
49
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
50
50
# the rest of the code; add a deprecation of the old name.
51
51
 
 
52
import os
 
53
import re
 
54
import sys
 
55
import time
 
56
 
 
57
from cStringIO import StringIO
 
58
 
52
59
from bzrlib import (
53
60
    debug,
54
61
    errors,
55
62
    revision,
56
63
    trace,
57
64
    tree,
58
 
    ui,
 
65
    xml_serializer,
59
66
    )
60
67
from bzrlib.branch import Branch
61
 
from bzrlib.cleanup import OperationWithCleanups
62
68
import bzrlib.config
63
69
from bzrlib.errors import (BzrError, PointlessCommit,
64
70
                           ConflictsInTree,
65
71
                           StrictCommitFailed
66
72
                           )
67
73
from bzrlib.osutils import (get_user_encoding,
68
 
                            is_inside_any,
 
74
                            kind_marker, isdir,isfile, is_inside_any,
 
75
                            is_inside_or_parent_of_any,
69
76
                            minimum_path_selection,
 
77
                            quotefn, sha_file, split_lines,
70
78
                            splitpath,
71
79
                            )
72
 
from bzrlib.trace import mutter, note, is_quiet
 
80
from bzrlib.testament import Testament
 
81
from bzrlib.trace import mutter, note, warning, is_quiet
73
82
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
74
83
from bzrlib import symbol_versioning
 
84
from bzrlib.symbol_versioning import (deprecated_passed,
 
85
        deprecated_function,
 
86
        DEPRECATED_PARAMETER)
 
87
from bzrlib.workingtree import WorkingTree
75
88
from bzrlib.urlutils import unescape_for_display
 
89
import bzrlib.ui
76
90
 
77
91
 
78
92
class NullCommitReporter(object):
132
146
 
133
147
    def completed(self, revno, rev_id):
134
148
        self._note('Committed revision %d.', revno)
135
 
        # self._note goes to the console too; so while we want to log the
136
 
        # rev_id, we can't trivially only log it. (See bug 526425). Long
137
 
        # term we should rearrange the reporting structure, but for now
138
 
        # we just mutter seperately. We mutter the revid and revno together
139
 
        # so that concurrent bzr invocations won't lead to confusion.
140
 
        mutter('Committed revid %s as revno %d.', rev_id, revno)
141
149
 
142
150
    def deleted(self, path):
143
151
        self._note('deleted %s', path)
174
182
        self.reporter = reporter
175
183
        self.config = config
176
184
 
177
 
    @staticmethod
178
 
    def update_revprops(revprops, branch, authors=None, author=None,
179
 
                        local=False, possible_master_transports=None):
180
 
        if revprops is None:
181
 
            revprops = {}
182
 
        if possible_master_transports is None:
183
 
            possible_master_transports = []
184
 
        if not 'branch-nick' in revprops:
185
 
            revprops['branch-nick'] = branch._get_nick(
186
 
                local,
187
 
                possible_master_transports)
188
 
        if authors is not None:
189
 
            if author is not None:
190
 
                raise AssertionError('Specifying both author and authors '
191
 
                        'is not allowed. Specify just authors instead')
192
 
            if 'author' in revprops or 'authors' in revprops:
193
 
                # XXX: maybe we should just accept one of them?
194
 
                raise AssertionError('author property given twice')
195
 
            if authors:
196
 
                for individual in authors:
197
 
                    if '\n' in individual:
198
 
                        raise AssertionError('\\n is not a valid character '
199
 
                                'in an author identity')
200
 
                revprops['authors'] = '\n'.join(authors)
201
 
        if author is not None:
202
 
            symbol_versioning.warn('The parameter author was deprecated'
203
 
                   ' in version 1.13. Use authors instead',
204
 
                   DeprecationWarning)
205
 
            if 'author' in revprops or 'authors' in revprops:
206
 
                # XXX: maybe we should just accept one of them?
207
 
                raise AssertionError('author property given twice')
208
 
            if '\n' in author:
209
 
                raise AssertionError('\\n is not a valid character '
210
 
                        'in an author identity')
211
 
            revprops['authors'] = author
212
 
        return revprops
213
 
 
214
185
    def commit(self,
215
186
               message=None,
216
187
               timestamp=None,
229
200
               message_callback=None,
230
201
               recursive='down',
231
202
               exclude=None,
232
 
               possible_master_transports=None,
233
 
               lossy=False):
 
203
               possible_master_transports=None):
234
204
        """Commit working copy as a new revision.
235
205
 
236
206
        :param message: the commit message (it or message_callback is required)
239
209
        :param timestamp: if not None, seconds-since-epoch for a
240
210
            postdated/predated commit.
241
211
 
242
 
        :param specific_files: If not None, commit only those files. An empty
243
 
            list means 'commit no files'.
 
212
        :param specific_files: If true, commit only those files.
244
213
 
245
214
        :param rev_id: If set, use this as the new revision id.
246
215
            Useful for test or import commands that need to tightly
263
232
        :param exclude: None or a list of relative paths to exclude from the
264
233
            commit. Pending changes to excluded files will be ignored by the
265
234
            commit.
266
 
        :param lossy: When committing to a foreign VCS, ignore any
267
 
            data that can not be natively represented.
268
235
        """
269
 
        operation = OperationWithCleanups(self._commit)
270
 
        self.revprops = revprops or {}
271
 
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
272
 
        self.config = config or self.config
273
 
        return operation.run(
274
 
               message=message,
275
 
               timestamp=timestamp,
276
 
               timezone=timezone,
277
 
               committer=committer,
278
 
               specific_files=specific_files,
279
 
               rev_id=rev_id,
280
 
               allow_pointless=allow_pointless,
281
 
               strict=strict,
282
 
               verbose=verbose,
283
 
               working_tree=working_tree,
284
 
               local=local,
285
 
               reporter=reporter,
286
 
               message_callback=message_callback,
287
 
               recursive=recursive,
288
 
               exclude=exclude,
289
 
               possible_master_transports=possible_master_transports,
290
 
               lossy=lossy)
291
 
 
292
 
    def _commit(self, operation, message, timestamp, timezone, committer,
293
 
            specific_files, rev_id, allow_pointless, strict, verbose,
294
 
            working_tree, local, reporter, message_callback, recursive,
295
 
            exclude, possible_master_transports, lossy):
296
236
        mutter('preparing to commit')
297
237
 
298
238
        if working_tree is None:
321
261
            self.exclude = []
322
262
        self.local = local
323
263
        self.master_branch = None
 
264
        self.master_locked = False
324
265
        self.recursive = recursive
325
266
        self.rev_id = None
326
 
        # self.specific_files is None to indicate no filter, or any iterable to
327
 
        # indicate a filter - [] means no files at all, as per iter_changes.
328
267
        if specific_files is not None:
329
268
            self.specific_files = sorted(
330
269
                minimum_path_selection(specific_files))
331
270
        else:
332
271
            self.specific_files = None
333
 
 
 
272
            
334
273
        self.allow_pointless = allow_pointless
 
274
        self.revprops = revprops
335
275
        self.message_callback = message_callback
336
276
        self.timestamp = timestamp
337
277
        self.timezone = timezone
340
280
        self.verbose = verbose
341
281
 
342
282
        self.work_tree.lock_write()
343
 
        operation.add_cleanup(self.work_tree.unlock)
344
283
        self.parents = self.work_tree.get_parent_ids()
345
284
        # We can use record_iter_changes IFF iter_changes is compatible with
346
285
        # the command line parameters, and the repository has fast delta
347
286
        # generation. See bug 347649.
348
287
        self.use_record_iter_changes = (
 
288
            not self.specific_files and
349
289
            not self.exclude and 
350
290
            not self.branch.repository._format.supports_tree_reference and
351
291
            (self.branch.repository._format.fast_deltas or
352
292
             len(self.parents) < 2))
353
 
        self.pb = ui.ui_factory.nested_progress_bar()
354
 
        operation.add_cleanup(self.pb.finished)
 
293
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
355
294
        self.basis_revid = self.work_tree.last_revision()
356
295
        self.basis_tree = self.work_tree.basis_tree()
357
296
        self.basis_tree.lock_read()
358
 
        operation.add_cleanup(self.basis_tree.unlock)
359
 
        # Cannot commit with conflicts present.
360
 
        if len(self.work_tree.conflicts()) > 0:
361
 
            raise ConflictsInTree
362
 
 
363
 
        # Setup the bound branch variables as needed.
364
 
        self._check_bound_branch(operation, possible_master_transports)
365
 
 
366
 
        # Check that the working tree is up to date
367
 
        old_revno, new_revno = self._check_out_of_date_tree()
368
 
 
369
 
        # Complete configuration setup
370
 
        if reporter is not None:
371
 
            self.reporter = reporter
372
 
        elif self.reporter is None:
373
 
            self.reporter = self._select_reporter()
374
 
        if self.config is None:
375
 
            self.config = self.branch.get_config()
376
 
 
377
 
        self._set_specific_file_ids()
378
 
 
379
 
        # Setup the progress bar. As the number of files that need to be
380
 
        # committed in unknown, progress is reported as stages.
381
 
        # We keep track of entries separately though and include that
382
 
        # information in the progress bar during the relevant stages.
383
 
        self.pb_stage_name = ""
384
 
        self.pb_stage_count = 0
385
 
        self.pb_stage_total = 5
386
 
        if self.bound_branch:
387
 
            # 2 extra stages: "Uploading data to master branch" and "Merging
388
 
            # tags to master branch"
389
 
            self.pb_stage_total += 2
390
 
        self.pb.show_pct = False
391
 
        self.pb.show_spinner = False
392
 
        self.pb.show_eta = False
393
 
        self.pb.show_count = True
394
 
        self.pb.show_bar = True
395
 
 
396
 
        self._gather_parents()
397
 
        # After a merge, a selected file commit is not supported.
398
 
        # See 'bzr help merge' for an explanation as to why.
399
 
        if len(self.parents) > 1 and self.specific_files is not None:
400
 
            raise errors.CannotCommitSelectedFileMerge(self.specific_files)
401
 
        # Excludes are a form of selected file commit.
402
 
        if len(self.parents) > 1 and self.exclude:
403
 
            raise errors.CannotCommitSelectedFileMerge(self.exclude)
404
 
 
405
 
        # Collect the changes
406
 
        self._set_progress_stage("Collecting changes", counter=True)
407
 
        self._lossy = lossy
408
 
        self.builder = self.branch.get_commit_builder(self.parents,
409
 
            self.config, timestamp, timezone, committer, self.revprops,
410
 
            rev_id, lossy=lossy)
411
 
        if not self.builder.supports_record_entry_contents and self.exclude:
412
 
            self.builder.abort()
413
 
            raise errors.ExcludesUnsupported(self.branch.repository)
414
 
 
415
297
        try:
416
 
            self.builder.will_record_deletes()
417
 
            # find the location being committed to
418
 
            if self.bound_branch:
419
 
                master_location = self.master_branch.base
420
 
            else:
421
 
                master_location = self.branch.base
422
 
 
423
 
            # report the start of the commit
424
 
            self.reporter.started(new_revno, self.rev_id, master_location)
425
 
 
426
 
            self._update_builder_with_changes()
427
 
            self._check_pointless()
428
 
 
429
 
            # TODO: Now the new inventory is known, check for conflicts.
430
 
            # ADHB 2006-08-08: If this is done, populate_new_inv should not add
431
 
            # weave lines, because nothing should be recorded until it is known
432
 
            # that commit will succeed.
433
 
            self._set_progress_stage("Saving data locally")
434
 
            self.builder.finish_inventory()
435
 
 
436
 
            # Prompt the user for a commit message if none provided
437
 
            message = message_callback(self)
438
 
            self.message = message
439
 
 
440
 
            # Add revision data to the local branch
441
 
            self.rev_id = self.builder.commit(self.message)
442
 
 
443
 
        except Exception, e:
444
 
            mutter("aborting commit write group because of exception:")
445
 
            trace.log_exception_quietly()
446
 
            note("aborting commit write group: %r" % (e,))
447
 
            self.builder.abort()
448
 
            raise
449
 
 
450
 
        self._process_pre_hooks(old_revno, new_revno)
451
 
 
452
 
        # Upload revision data to the master.
453
 
        # this will propagate merged revisions too if needed.
454
 
        if self.bound_branch:
455
 
            self._set_progress_stage("Uploading data to master branch")
456
 
            # 'commit' to the master first so a timeout here causes the
457
 
            # local branch to be out of date
458
 
            (new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
459
 
                self.branch, new_revno, self.rev_id, lossy=lossy)
460
 
            if lossy:
461
 
                self.branch.fetch(self.master_branch, self.rev_id)
462
 
 
463
 
        # and now do the commit locally.
464
 
        self.branch.set_last_revision_info(new_revno, self.rev_id)
465
 
 
466
 
        # Merge local tags to remote
467
 
        if self.bound_branch:
468
 
            self._set_progress_stage("Merging tags to master branch")
469
 
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
470
 
            if tag_conflicts:
471
 
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
472
 
                note("Conflicting tags in bound branch:\n" +
473
 
                    "\n".join(warning_lines))
474
 
 
475
 
        # Make the working tree be up to date with the branch. This
476
 
        # includes automatic changes scheduled to be made to the tree, such
477
 
        # as updating its basis and unversioning paths that were missing.
478
 
        self.work_tree.unversion(self.deleted_ids)
479
 
        self._set_progress_stage("Updating the working tree")
480
 
        self.work_tree.update_basis_by_delta(self.rev_id,
481
 
             self.builder.get_basis_delta())
482
 
        self.reporter.completed(new_revno, self.rev_id)
483
 
        self._process_post_hooks(old_revno, new_revno)
 
298
            # Cannot commit with conflicts present.
 
299
            if len(self.work_tree.conflicts()) > 0:
 
300
                raise ConflictsInTree
 
301
 
 
302
            # Setup the bound branch variables as needed.
 
303
            self._check_bound_branch(possible_master_transports)
 
304
 
 
305
            # Check that the working tree is up to date
 
306
            old_revno, new_revno = self._check_out_of_date_tree()
 
307
 
 
308
            # Complete configuration setup
 
309
            if reporter is not None:
 
310
                self.reporter = reporter
 
311
            elif self.reporter is None:
 
312
                self.reporter = self._select_reporter()
 
313
            if self.config is None:
 
314
                self.config = self.branch.get_config()
 
315
 
 
316
            self._set_specific_file_ids()
 
317
 
 
318
            # Setup the progress bar. As the number of files that need to be
 
319
            # committed in unknown, progress is reported as stages.
 
320
            # We keep track of entries separately though and include that
 
321
            # information in the progress bar during the relevant stages.
 
322
            self.pb_stage_name = ""
 
323
            self.pb_stage_count = 0
 
324
            self.pb_stage_total = 5
 
325
            if self.bound_branch:
 
326
                self.pb_stage_total += 1
 
327
            self.pb.show_pct = False
 
328
            self.pb.show_spinner = False
 
329
            self.pb.show_eta = False
 
330
            self.pb.show_count = True
 
331
            self.pb.show_bar = True
 
332
 
 
333
            self._gather_parents()
 
334
            # After a merge, a selected file commit is not supported.
 
335
            # See 'bzr help merge' for an explanation as to why.
 
336
            if len(self.parents) > 1 and self.specific_files:
 
337
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
 
338
            # Excludes are a form of selected file commit.
 
339
            if len(self.parents) > 1 and self.exclude:
 
340
                raise errors.CannotCommitSelectedFileMerge(self.exclude)
 
341
 
 
342
            # Collect the changes
 
343
            self._set_progress_stage("Collecting changes", counter=True)
 
344
            self.builder = self.branch.get_commit_builder(self.parents,
 
345
                self.config, timestamp, timezone, committer, revprops, rev_id)
 
346
 
 
347
            try:
 
348
                self.builder.will_record_deletes()
 
349
                # find the location being committed to
 
350
                if self.bound_branch:
 
351
                    master_location = self.master_branch.base
 
352
                else:
 
353
                    master_location = self.branch.base
 
354
 
 
355
                # report the start of the commit
 
356
                self.reporter.started(new_revno, self.rev_id, master_location)
 
357
 
 
358
                self._update_builder_with_changes()
 
359
                self._check_pointless()
 
360
 
 
361
                # TODO: Now the new inventory is known, check for conflicts.
 
362
                # ADHB 2006-08-08: If this is done, populate_new_inv should not add
 
363
                # weave lines, because nothing should be recorded until it is known
 
364
                # that commit will succeed.
 
365
                self._set_progress_stage("Saving data locally")
 
366
                self.builder.finish_inventory()
 
367
 
 
368
                # Prompt the user for a commit message if none provided
 
369
                message = message_callback(self)
 
370
                self.message = message
 
371
 
 
372
                # Add revision data to the local branch
 
373
                self.rev_id = self.builder.commit(self.message)
 
374
 
 
375
            except Exception, e:
 
376
                mutter("aborting commit write group because of exception:")
 
377
                trace.log_exception_quietly()
 
378
                note("aborting commit write group: %r" % (e,))
 
379
                self.builder.abort()
 
380
                raise
 
381
 
 
382
            self._process_pre_hooks(old_revno, new_revno)
 
383
 
 
384
            # Upload revision data to the master.
 
385
            # this will propagate merged revisions too if needed.
 
386
            if self.bound_branch:
 
387
                self._set_progress_stage("Uploading data to master branch")
 
388
                # 'commit' to the master first so a timeout here causes the
 
389
                # local branch to be out of date
 
390
                self.master_branch.import_last_revision_info(
 
391
                    self.branch.repository, new_revno, self.rev_id)
 
392
 
 
393
            # and now do the commit locally.
 
394
            self.branch.set_last_revision_info(new_revno, self.rev_id)
 
395
 
 
396
            # Make the working tree be up to date with the branch. This
 
397
            # includes automatic changes scheduled to be made to the tree, such
 
398
            # as updating its basis and unversioning paths that were missing.
 
399
            self.work_tree.unversion(self.deleted_ids)
 
400
            self._set_progress_stage("Updating the working tree")
 
401
            self.work_tree.update_basis_by_delta(self.rev_id,
 
402
                 self.builder.get_basis_delta())
 
403
            self.reporter.completed(new_revno, self.rev_id)
 
404
            self._process_post_hooks(old_revno, new_revno)
 
405
        finally:
 
406
            self._cleanup()
484
407
        return self.rev_id
485
408
 
486
409
    def _select_reporter(self):
508
431
            return
509
432
        raise PointlessCommit()
510
433
 
511
 
    def _check_bound_branch(self, operation, possible_master_transports=None):
 
434
    def _check_bound_branch(self, possible_master_transports=None):
512
435
        """Check to see if the local branch is bound.
513
436
 
514
437
        If it is bound, then most of the commit will actually be
549
472
        # so grab the lock
550
473
        self.bound_branch = self.branch
551
474
        self.master_branch.lock_write()
552
 
        operation.add_cleanup(self.master_branch.unlock)
 
475
        self.master_locked = True
553
476
 
554
477
    def _check_out_of_date_tree(self):
555
478
        """Check that the working tree is up to date.
640
563
                     old_revno, old_revid, new_revno, self.rev_id,
641
564
                     tree_delta, future_tree)
642
565
 
 
566
    def _cleanup(self):
 
567
        """Cleanup any open locks, progress bars etc."""
 
568
        cleanups = [self._cleanup_bound_branch,
 
569
                    self.basis_tree.unlock,
 
570
                    self.work_tree.unlock,
 
571
                    self.pb.finished]
 
572
        found_exception = None
 
573
        for cleanup in cleanups:
 
574
            try:
 
575
                cleanup()
 
576
            # we want every cleanup to run no matter what.
 
577
            # so we have a catchall here, but we will raise the
 
578
            # last encountered exception up the stack: and
 
579
            # typically this will be useful enough.
 
580
            except Exception, e:
 
581
                found_exception = e
 
582
        if found_exception is not None:
 
583
            # don't do a plan raise, because the last exception may have been
 
584
            # trashed, e is our sure-to-work exception even though it loses the
 
585
            # full traceback. XXX: RBC 20060421 perhaps we could check the
 
586
            # exc_info and if its the same one do a plain raise otherwise
 
587
            # 'raise e' as we do now.
 
588
            raise e
 
589
 
 
590
    def _cleanup_bound_branch(self):
 
591
        """Executed at the end of a try/finally to cleanup a bound branch.
 
592
 
 
593
        If the branch wasn't bound, this is a no-op.
 
594
        If it was, it resents self.branch to the local branch, instead
 
595
        of being the master.
 
596
        """
 
597
        if not self.bound_branch:
 
598
            return
 
599
        if self.master_locked:
 
600
            self.master_branch.unlock()
 
601
 
643
602
    def _gather_parents(self):
644
603
        """Record the parents of a merge for merge detection."""
645
604
        # TODO: Make sure that this list doesn't contain duplicate
660
619
        """Update the commit builder with the data about what has changed.
661
620
        """
662
621
        exclude = self.exclude
663
 
        specific_files = self.specific_files
 
622
        specific_files = self.specific_files or []
664
623
        mutter("Selecting files for commit with filter %s", specific_files)
665
624
 
666
625
        self._check_strict()
667
626
        if self.use_record_iter_changes:
668
 
            iter_changes = self.work_tree.iter_changes(self.basis_tree,
669
 
                specific_files=specific_files)
 
627
            iter_changes = self.work_tree.iter_changes(self.basis_tree)
670
628
            iter_changes = self._filter_iter_changes(iter_changes)
671
629
            for file_id, path, fs_hash in self.builder.record_iter_changes(
672
630
                self.work_tree, self.basis_revid, iter_changes):
844
802
                # _update_builder_with_changes.
845
803
                continue
846
804
            content_summary = self.work_tree.path_content_summary(path)
847
 
            kind = content_summary[0]
848
805
            # Note that when a filter of specific files is given, we must only
849
806
            # skip/record deleted files matching that filter.
850
807
            if not specific_files or is_inside_any(specific_files, path):
851
 
                if kind == 'missing':
 
808
                if content_summary[0] == 'missing':
852
809
                    if not deleted_paths:
853
810
                        # path won't have been split yet.
854
811
                        path_segments = splitpath(path)
861
818
                    continue
862
819
            # TODO: have the builder do the nested commit just-in-time IF and
863
820
            # only if needed.
864
 
            if kind == 'tree-reference':
 
821
            if content_summary[0] == 'tree-reference':
865
822
                # enforce repository nested tree policy.
866
823
                if (not self.work_tree.supports_tree_reference() or
867
824
                    # repository does not support it either.
868
825
                    not self.branch.repository._format.supports_tree_reference):
869
 
                    kind = 'directory'
870
 
                    content_summary = (kind, None, None, None)
871
 
                elif self.recursive == 'down':
 
826
                    content_summary = ('directory',) + content_summary[1:]
 
827
            kind = content_summary[0]
 
828
            # TODO: specific_files filtering before nested tree processing
 
829
            if kind == 'tree-reference':
 
830
                if self.recursive == 'down':
872
831
                    nested_revision_id = self._commit_nested_tree(
873
832
                        file_id, path)
874
 
                    content_summary = (kind, None, None, nested_revision_id)
 
833
                    content_summary = content_summary[:3] + (
 
834
                        nested_revision_id,)
875
835
                else:
876
 
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
877
 
                    content_summary = (kind, None, None, nested_revision_id)
 
836
                    content_summary = content_summary[:3] + (
 
837
                        self.work_tree.get_reference_revision(file_id),)
878
838
 
879
839
            # Record an entry for this item
880
840
            # Note: I don't particularly want to have the existing_ie