/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: Vincent Ladeuil
  • Date: 2009-06-22 12:52:39 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622125239-kabo9smxt9c3vnir
Use a consistent scheme for naming pyrex source files.

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)
237
 
        :param message_callback: A callback: message = message_callback(cmt_obj)
238
207
 
239
208
        :param timestamp: if not None, seconds-since-epoch for a
240
209
            postdated/predated commit.
241
210
 
242
 
        :param specific_files: If not None, commit only those files. An empty
243
 
            list means 'commit no files'.
 
211
        :param specific_files: If true, commit only those files.
244
212
 
245
213
        :param rev_id: If set, use this as the new revision id.
246
214
            Useful for test or import commands that need to tightly
263
231
        :param exclude: None or a list of relative paths to exclude from the
264
232
            commit. Pending changes to excluded files will be ignored by the
265
233
            commit.
266
 
        :param lossy: When committing to a foreign VCS, ignore any
267
 
            data that can not be natively represented.
268
234
        """
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
235
        mutter('preparing to commit')
297
236
 
298
237
        if working_tree is None:
321
260
            self.exclude = []
322
261
        self.local = local
323
262
        self.master_branch = None
 
263
        self.master_locked = False
324
264
        self.recursive = recursive
325
265
        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
266
        if specific_files is not None:
329
267
            self.specific_files = sorted(
330
268
                minimum_path_selection(specific_files))
331
269
        else:
332
270
            self.specific_files = None
333
 
 
 
271
            
334
272
        self.allow_pointless = allow_pointless
 
273
        self.revprops = revprops
335
274
        self.message_callback = message_callback
336
275
        self.timestamp = timestamp
337
276
        self.timezone = timezone
340
279
        self.verbose = verbose
341
280
 
342
281
        self.work_tree.lock_write()
343
 
        operation.add_cleanup(self.work_tree.unlock)
344
282
        self.parents = self.work_tree.get_parent_ids()
345
283
        # We can use record_iter_changes IFF iter_changes is compatible with
346
284
        # the command line parameters, and the repository has fast delta
347
285
        # generation. See bug 347649.
348
286
        self.use_record_iter_changes = (
 
287
            not self.specific_files and
349
288
            not self.exclude and 
350
289
            not self.branch.repository._format.supports_tree_reference and
351
290
            (self.branch.repository._format.fast_deltas or
352
291
             len(self.parents) < 2))
353
 
        self.pb = ui.ui_factory.nested_progress_bar()
354
 
        operation.add_cleanup(self.pb.finished)
 
292
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
355
293
        self.basis_revid = self.work_tree.last_revision()
356
294
        self.basis_tree = self.work_tree.basis_tree()
357
295
        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
296
        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)
 
297
            # Cannot commit with conflicts present.
 
298
            if len(self.work_tree.conflicts()) > 0:
 
299
                raise ConflictsInTree
 
300
 
 
301
            # Setup the bound branch variables as needed.
 
302
            self._check_bound_branch(possible_master_transports)
 
303
 
 
304
            # Check that the working tree is up to date
 
305
            old_revno, new_revno = self._check_out_of_date_tree()
 
306
 
 
307
            # Complete configuration setup
 
308
            if reporter is not None:
 
309
                self.reporter = reporter
 
310
            elif self.reporter is None:
 
311
                self.reporter = self._select_reporter()
 
312
            if self.config is None:
 
313
                self.config = self.branch.get_config()
 
314
 
 
315
            self._set_specific_file_ids()
 
316
 
 
317
            # Setup the progress bar. As the number of files that need to be
 
318
            # committed in unknown, progress is reported as stages.
 
319
            # We keep track of entries separately though and include that
 
320
            # information in the progress bar during the relevant stages.
 
321
            self.pb_stage_name = ""
 
322
            self.pb_stage_count = 0
 
323
            self.pb_stage_total = 5
 
324
            if self.bound_branch:
 
325
                self.pb_stage_total += 1
 
326
            self.pb.show_pct = False
 
327
            self.pb.show_spinner = False
 
328
            self.pb.show_eta = False
 
329
            self.pb.show_count = True
 
330
            self.pb.show_bar = True
 
331
 
 
332
            self._gather_parents()
 
333
            # After a merge, a selected file commit is not supported.
 
334
            # See 'bzr help merge' for an explanation as to why.
 
335
            if len(self.parents) > 1 and self.specific_files:
 
336
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
 
337
            # Excludes are a form of selected file commit.
 
338
            if len(self.parents) > 1 and self.exclude:
 
339
                raise errors.CannotCommitSelectedFileMerge(self.exclude)
 
340
 
 
341
            # Collect the changes
 
342
            self._set_progress_stage("Collecting changes", counter=True)
 
343
            self.builder = self.branch.get_commit_builder(self.parents,
 
344
                self.config, timestamp, timezone, committer, revprops, rev_id)
 
345
 
 
346
            try:
 
347
                self.builder.will_record_deletes()
 
348
                # find the location being committed to
 
349
                if self.bound_branch:
 
350
                    master_location = self.master_branch.base
 
351
                else:
 
352
                    master_location = self.branch.base
 
353
 
 
354
                # report the start of the commit
 
355
                self.reporter.started(new_revno, self.rev_id, master_location)
 
356
 
 
357
                self._update_builder_with_changes()
 
358
                self._check_pointless()
 
359
 
 
360
                # TODO: Now the new inventory is known, check for conflicts.
 
361
                # ADHB 2006-08-08: If this is done, populate_new_inv should not add
 
362
                # weave lines, because nothing should be recorded until it is known
 
363
                # that commit will succeed.
 
364
                self._set_progress_stage("Saving data locally")
 
365
                self.builder.finish_inventory()
 
366
 
 
367
                # Prompt the user for a commit message if none provided
 
368
                message = message_callback(self)
 
369
                self.message = message
 
370
 
 
371
                # Add revision data to the local branch
 
372
                self.rev_id = self.builder.commit(self.message)
 
373
 
 
374
            except Exception, e:
 
375
                mutter("aborting commit write group because of exception:")
 
376
                trace.log_exception_quietly()
 
377
                note("aborting commit write group: %r" % (e,))
 
378
                self.builder.abort()
 
379
                raise
 
380
 
 
381
            self._process_pre_hooks(old_revno, new_revno)
 
382
 
 
383
            # Upload revision data to the master.
 
384
            # this will propagate merged revisions too if needed.
 
385
            if self.bound_branch:
 
386
                self._set_progress_stage("Uploading data to master branch")
 
387
                # 'commit' to the master first so a timeout here causes the
 
388
                # local branch to be out of date
 
389
                self.master_branch.import_last_revision_info(
 
390
                    self.branch.repository, new_revno, self.rev_id)
 
391
 
 
392
            # and now do the commit locally.
 
393
            self.branch.set_last_revision_info(new_revno, self.rev_id)
 
394
 
 
395
            # Make the working tree up to date with the branch
 
396
            self._set_progress_stage("Updating the working tree")
 
397
            self.work_tree.update_basis_by_delta(self.rev_id,
 
398
                 self.builder.get_basis_delta())
 
399
            self.reporter.completed(new_revno, self.rev_id)
 
400
            self._process_post_hooks(old_revno, new_revno)
 
401
        finally:
 
402
            self._cleanup()
484
403
        return self.rev_id
485
404
 
486
405
    def _select_reporter(self):
508
427
            return
509
428
        raise PointlessCommit()
510
429
 
511
 
    def _check_bound_branch(self, operation, possible_master_transports=None):
 
430
    def _check_bound_branch(self, possible_master_transports=None):
512
431
        """Check to see if the local branch is bound.
513
432
 
514
433
        If it is bound, then most of the commit will actually be
549
468
        # so grab the lock
550
469
        self.bound_branch = self.branch
551
470
        self.master_branch.lock_write()
552
 
        operation.add_cleanup(self.master_branch.unlock)
 
471
        self.master_locked = True
553
472
 
554
473
    def _check_out_of_date_tree(self):
555
474
        """Check that the working tree is up to date.
640
559
                     old_revno, old_revid, new_revno, self.rev_id,
641
560
                     tree_delta, future_tree)
642
561
 
 
562
    def _cleanup(self):
 
563
        """Cleanup any open locks, progress bars etc."""
 
564
        cleanups = [self._cleanup_bound_branch,
 
565
                    self.basis_tree.unlock,
 
566
                    self.work_tree.unlock,
 
567
                    self.pb.finished]
 
568
        found_exception = None
 
569
        for cleanup in cleanups:
 
570
            try:
 
571
                cleanup()
 
572
            # we want every cleanup to run no matter what.
 
573
            # so we have a catchall here, but we will raise the
 
574
            # last encountered exception up the stack: and
 
575
            # typically this will be useful enough.
 
576
            except Exception, e:
 
577
                found_exception = e
 
578
        if found_exception is not None:
 
579
            # don't do a plan raise, because the last exception may have been
 
580
            # trashed, e is our sure-to-work exception even though it loses the
 
581
            # full traceback. XXX: RBC 20060421 perhaps we could check the
 
582
            # exc_info and if its the same one do a plain raise otherwise
 
583
            # 'raise e' as we do now.
 
584
            raise e
 
585
 
 
586
    def _cleanup_bound_branch(self):
 
587
        """Executed at the end of a try/finally to cleanup a bound branch.
 
588
 
 
589
        If the branch wasn't bound, this is a no-op.
 
590
        If it was, it resents self.branch to the local branch, instead
 
591
        of being the master.
 
592
        """
 
593
        if not self.bound_branch:
 
594
            return
 
595
        if self.master_locked:
 
596
            self.master_branch.unlock()
 
597
 
643
598
    def _gather_parents(self):
644
599
        """Record the parents of a merge for merge detection."""
645
600
        # TODO: Make sure that this list doesn't contain duplicate
660
615
        """Update the commit builder with the data about what has changed.
661
616
        """
662
617
        exclude = self.exclude
663
 
        specific_files = self.specific_files
 
618
        specific_files = self.specific_files or []
664
619
        mutter("Selecting files for commit with filter %s", specific_files)
665
620
 
666
621
        self._check_strict()
667
622
        if self.use_record_iter_changes:
668
 
            iter_changes = self.work_tree.iter_changes(self.basis_tree,
669
 
                specific_files=specific_files)
 
623
            iter_changes = self.work_tree.iter_changes(self.basis_tree)
670
624
            iter_changes = self._filter_iter_changes(iter_changes)
671
625
            for file_id, path, fs_hash in self.builder.record_iter_changes(
672
626
                self.work_tree, self.basis_revid, iter_changes):
725
679
                            reporter.snapshot_change('modified', new_path)
726
680
            self._next_progress_entry()
727
681
        # Unversion IDs that were found to be deleted
728
 
        self.deleted_ids = deleted_ids
 
682
        self.work_tree.unversion(deleted_ids)
729
683
 
730
684
    def _record_unselected(self):
731
685
        # If specific files are selected, then all un-selected files must be
844
798
                # _update_builder_with_changes.
845
799
                continue
846
800
            content_summary = self.work_tree.path_content_summary(path)
847
 
            kind = content_summary[0]
848
801
            # Note that when a filter of specific files is given, we must only
849
802
            # skip/record deleted files matching that filter.
850
803
            if not specific_files or is_inside_any(specific_files, path):
851
 
                if kind == 'missing':
 
804
                if content_summary[0] == 'missing':
852
805
                    if not deleted_paths:
853
806
                        # path won't have been split yet.
854
807
                        path_segments = splitpath(path)
861
814
                    continue
862
815
            # TODO: have the builder do the nested commit just-in-time IF and
863
816
            # only if needed.
864
 
            if kind == 'tree-reference':
 
817
            if content_summary[0] == 'tree-reference':
865
818
                # enforce repository nested tree policy.
866
819
                if (not self.work_tree.supports_tree_reference() or
867
820
                    # repository does not support it either.
868
821
                    not self.branch.repository._format.supports_tree_reference):
869
 
                    kind = 'directory'
870
 
                    content_summary = (kind, None, None, None)
871
 
                elif self.recursive == 'down':
 
822
                    content_summary = ('directory',) + content_summary[1:]
 
823
            kind = content_summary[0]
 
824
            # TODO: specific_files filtering before nested tree processing
 
825
            if kind == 'tree-reference':
 
826
                if self.recursive == 'down':
872
827
                    nested_revision_id = self._commit_nested_tree(
873
828
                        file_id, path)
874
 
                    content_summary = (kind, None, None, nested_revision_id)
 
829
                    content_summary = content_summary[:3] + (
 
830
                        nested_revision_id,)
875
831
                else:
876
 
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
877
 
                    content_summary = (kind, None, None, nested_revision_id)
 
832
                    content_summary = content_summary[:3] + (
 
833
                        self.work_tree.get_reference_revision(file_id),)
878
834
 
879
835
            # Record an entry for this item
880
836
            # Note: I don't particularly want to have the existing_ie
886
842
                content_summary)
887
843
 
888
844
        # Unversion IDs that were found to be deleted
889
 
        self.deleted_ids = deleted_ids
 
845
        self.work_tree.unversion(deleted_ids)
890
846
 
891
847
    def _commit_nested_tree(self, file_id, path):
892
848
        "Commit a nested tree."