← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

(jam) Handle bug #382709 by encoding paths as 'mbcs' when spawning
        external diff.

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,
 
62
    revision,
55
63
    trace,
56
64
    tree,
57
 
    ui,
 
65
    xml_serializer,
58
66
    )
59
67
from bzrlib.branch import Branch
60
 
from bzrlib.cleanup import OperationWithCleanups
61
68
import bzrlib.config
62
69
from bzrlib.errors import (BzrError, PointlessCommit,
63
70
                           ConflictsInTree,
64
71
                           StrictCommitFailed
65
72
                           )
66
73
from bzrlib.osutils import (get_user_encoding,
67
 
                            is_inside_any,
 
74
                            kind_marker, isdir,isfile, is_inside_any,
 
75
                            is_inside_or_parent_of_any,
68
76
                            minimum_path_selection,
 
77
                            quotefn, sha_file, split_lines,
69
78
                            splitpath,
70
79
                            )
71
 
from bzrlib.trace import mutter, note, is_quiet
 
80
from bzrlib.testament import Testament
 
81
from bzrlib.trace import mutter, note, warning, is_quiet
72
82
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
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
74
88
from bzrlib.urlutils import unescape_for_display
75
 
from bzrlib.i18n import gettext
 
89
import bzrlib.ui
 
90
 
76
91
 
77
92
class NullCommitReporter(object):
78
93
    """I report on progress of a commit."""
113
128
        note(format, *args)
114
129
 
115
130
    def snapshot_change(self, change, path):
116
 
        if path == '' and change in (gettext('added'), gettext('modified')):
 
131
        if path == '' and change in ('added', 'modified'):
117
132
            return
118
133
        self._note("%s %s", change, path)
119
134
 
127
142
                                   "to started.", DeprecationWarning,
128
143
                                   stacklevel=2)
129
144
            location = ''
130
 
        self._note(gettext('Committing%s'), location)
 
145
        self._note('Committing%s', location)
131
146
 
132
147
    def completed(self, revno, rev_id):
133
 
        self._note(gettext('Committed revision %d.'), revno)
134
 
        # self._note goes to the console too; so while we want to log the
135
 
        # rev_id, we can't trivially only log it. (See bug 526425). Long
136
 
        # term we should rearrange the reporting structure, but for now
137
 
        # we just mutter seperately. We mutter the revid and revno together
138
 
        # so that concurrent bzr invocations won't lead to confusion.
139
 
        mutter('Committed revid %s as revno %d.', rev_id, revno)
 
148
        self._note('Committed revision %d.', revno)
140
149
 
141
150
    def deleted(self, path):
142
 
        self._note(gettext('deleted %s'), path)
 
151
        self._note('deleted %s', path)
143
152
 
144
153
    def missing(self, path):
145
 
        self._note(gettext('missing %s'), path)
 
154
        self._note('missing %s', path)
146
155
 
147
156
    def renamed(self, change, old_path, new_path):
148
157
        self._note('%s %s => %s', change, old_path, new_path)
173
182
        self.reporter = reporter
174
183
        self.config = config
175
184
 
176
 
    @staticmethod
177
 
    def update_revprops(revprops, branch, authors=None, author=None,
178
 
                        local=False, possible_master_transports=None):
179
 
        if revprops is None:
180
 
            revprops = {}
181
 
        if possible_master_transports is None:
182
 
            possible_master_transports = []
183
 
        if not 'branch-nick' in revprops:
184
 
            revprops['branch-nick'] = branch._get_nick(
185
 
                local,
186
 
                possible_master_transports)
187
 
        if authors is not None:
188
 
            if author is not None:
189
 
                raise AssertionError('Specifying both author and authors '
190
 
                        'is not allowed. Specify just authors instead')
191
 
            if 'author' in revprops or 'authors' in revprops:
192
 
                # XXX: maybe we should just accept one of them?
193
 
                raise AssertionError('author property given twice')
194
 
            if authors:
195
 
                for individual in authors:
196
 
                    if '\n' in individual:
197
 
                        raise AssertionError('\\n is not a valid character '
198
 
                                'in an author identity')
199
 
                revprops['authors'] = '\n'.join(authors)
200
 
        if author is not None:
201
 
            symbol_versioning.warn('The parameter author was deprecated'
202
 
                   ' in version 1.13. Use authors instead',
203
 
                   DeprecationWarning)
204
 
            if 'author' in revprops or 'authors' in revprops:
205
 
                # XXX: maybe we should just accept one of them?
206
 
                raise AssertionError('author property given twice')
207
 
            if '\n' in author:
208
 
                raise AssertionError('\\n is not a valid character '
209
 
                        'in an author identity')
210
 
            revprops['authors'] = author
211
 
        return revprops
212
 
 
213
185
    def commit(self,
214
186
               message=None,
215
187
               timestamp=None,
228
200
               message_callback=None,
229
201
               recursive='down',
230
202
               exclude=None,
231
 
               possible_master_transports=None,
232
 
               lossy=False):
 
203
               possible_master_transports=None):
233
204
        """Commit working copy as a new revision.
234
205
 
235
206
        :param message: the commit message (it or message_callback is required)
238
209
        :param timestamp: if not None, seconds-since-epoch for a
239
210
            postdated/predated commit.
240
211
 
241
 
        :param specific_files: If not None, commit only those files. An empty
242
 
            list means 'commit no files'.
 
212
        :param specific_files: If true, commit only those files.
243
213
 
244
214
        :param rev_id: If set, use this as the new revision id.
245
215
            Useful for test or import commands that need to tightly
262
232
        :param exclude: None or a list of relative paths to exclude from the
263
233
            commit. Pending changes to excluded files will be ignored by the
264
234
            commit.
265
 
        :param lossy: When committing to a foreign VCS, ignore any
266
 
            data that can not be natively represented.
267
235
        """
268
 
        operation = OperationWithCleanups(self._commit)
269
 
        self.revprops = revprops or {}
270
 
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
271
 
        self.config = config or self.config
272
 
        return operation.run(
273
 
               message=message,
274
 
               timestamp=timestamp,
275
 
               timezone=timezone,
276
 
               committer=committer,
277
 
               specific_files=specific_files,
278
 
               rev_id=rev_id,
279
 
               allow_pointless=allow_pointless,
280
 
               strict=strict,
281
 
               verbose=verbose,
282
 
               working_tree=working_tree,
283
 
               local=local,
284
 
               reporter=reporter,
285
 
               message_callback=message_callback,
286
 
               recursive=recursive,
287
 
               exclude=exclude,
288
 
               possible_master_transports=possible_master_transports,
289
 
               lossy=lossy)
290
 
 
291
 
    def _commit(self, operation, message, timestamp, timezone, committer,
292
 
            specific_files, rev_id, allow_pointless, strict, verbose,
293
 
            working_tree, local, reporter, message_callback, recursive,
294
 
            exclude, possible_master_transports, lossy):
295
236
        mutter('preparing to commit')
296
237
 
297
238
        if working_tree is None:
320
261
            self.exclude = []
321
262
        self.local = local
322
263
        self.master_branch = None
 
264
        self.master_locked = False
323
265
        self.recursive = recursive
324
266
        self.rev_id = None
325
 
        # self.specific_files is None to indicate no filter, or any iterable to
326
 
        # indicate a filter - [] means no files at all, as per iter_changes.
327
267
        if specific_files is not None:
328
268
            self.specific_files = sorted(
329
269
                minimum_path_selection(specific_files))
330
270
        else:
331
271
            self.specific_files = None
332
 
 
 
272
            
333
273
        self.allow_pointless = allow_pointless
 
274
        self.revprops = revprops
334
275
        self.message_callback = message_callback
335
276
        self.timestamp = timestamp
336
277
        self.timezone = timezone
339
280
        self.verbose = verbose
340
281
 
341
282
        self.work_tree.lock_write()
342
 
        operation.add_cleanup(self.work_tree.unlock)
343
283
        self.parents = self.work_tree.get_parent_ids()
344
284
        # We can use record_iter_changes IFF iter_changes is compatible with
345
285
        # the command line parameters, and the repository has fast delta
346
286
        # generation. See bug 347649.
347
287
        self.use_record_iter_changes = (
 
288
            not self.specific_files and
348
289
            not self.exclude and 
349
290
            not self.branch.repository._format.supports_tree_reference and
350
291
            (self.branch.repository._format.fast_deltas or
351
292
             len(self.parents) < 2))
352
 
        self.pb = ui.ui_factory.nested_progress_bar()
353
 
        operation.add_cleanup(self.pb.finished)
 
293
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
354
294
        self.basis_revid = self.work_tree.last_revision()
355
295
        self.basis_tree = self.work_tree.basis_tree()
356
296
        self.basis_tree.lock_read()
357
 
        operation.add_cleanup(self.basis_tree.unlock)
358
 
        # Cannot commit with conflicts present.
359
 
        if len(self.work_tree.conflicts()) > 0:
360
 
            raise ConflictsInTree
361
 
 
362
 
        # Setup the bound branch variables as needed.
363
 
        self._check_bound_branch(operation, possible_master_transports)
364
 
 
365
 
        # Check that the working tree is up to date
366
 
        old_revno, new_revno = self._check_out_of_date_tree()
367
 
 
368
 
        # Complete configuration setup
369
 
        if reporter is not None:
370
 
            self.reporter = reporter
371
 
        elif self.reporter is None:
372
 
            self.reporter = self._select_reporter()
373
 
        if self.config is None:
374
 
            self.config = self.branch.get_config()
375
 
 
376
 
        self._set_specific_file_ids()
377
 
 
378
 
        # Setup the progress bar. As the number of files that need to be
379
 
        # committed in unknown, progress is reported as stages.
380
 
        # We keep track of entries separately though and include that
381
 
        # information in the progress bar during the relevant stages.
382
 
        self.pb_stage_name = ""
383
 
        self.pb_stage_count = 0
384
 
        self.pb_stage_total = 5
385
 
        if self.bound_branch:
386
 
            # 2 extra stages: "Uploading data to master branch" and "Merging
387
 
            # tags to master branch"
388
 
            self.pb_stage_total += 2
389
 
        self.pb.show_pct = False
390
 
        self.pb.show_spinner = False
391
 
        self.pb.show_eta = False
392
 
        self.pb.show_count = True
393
 
        self.pb.show_bar = True
394
 
 
395
 
        self._gather_parents()
396
 
        # After a merge, a selected file commit is not supported.
397
 
        # See 'bzr help merge' for an explanation as to why.
398
 
        if len(self.parents) > 1 and self.specific_files is not None:
399
 
            raise errors.CannotCommitSelectedFileMerge(self.specific_files)
400
 
        # Excludes are a form of selected file commit.
401
 
        if len(self.parents) > 1 and self.exclude:
402
 
            raise errors.CannotCommitSelectedFileMerge(self.exclude)
403
 
 
404
 
        # Collect the changes
405
 
        self._set_progress_stage("Collecting changes", counter=True)
406
 
        self._lossy = lossy
407
 
        self.builder = self.branch.get_commit_builder(self.parents,
408
 
            self.config, timestamp, timezone, committer, self.revprops,
409
 
            rev_id, lossy=lossy)
410
 
        if not self.builder.supports_record_entry_contents and self.exclude:
411
 
            self.builder.abort()
412
 
            raise errors.ExcludesUnsupported(self.branch.repository)
413
 
 
414
297
        try:
415
 
            self.builder.will_record_deletes()
416
 
            # find the location being committed to
417
 
            if self.bound_branch:
418
 
                master_location = self.master_branch.base
419
 
            else:
420
 
                master_location = self.branch.base
421
 
 
422
 
            # report the start of the commit
423
 
            self.reporter.started(new_revno, self.rev_id, master_location)
424
 
 
425
 
            self._update_builder_with_changes()
426
 
            self._check_pointless()
427
 
 
428
 
            # TODO: Now the new inventory is known, check for conflicts.
429
 
            # ADHB 2006-08-08: If this is done, populate_new_inv should not add
430
 
            # weave lines, because nothing should be recorded until it is known
431
 
            # that commit will succeed.
432
 
            self._set_progress_stage("Saving data locally")
433
 
            self.builder.finish_inventory()
434
 
 
435
 
            # Prompt the user for a commit message if none provided
436
 
            message = message_callback(self)
437
 
            self.message = message
438
 
 
439
 
            # Add revision data to the local branch
440
 
            self.rev_id = self.builder.commit(self.message)
441
 
 
442
 
        except Exception, e:
443
 
            mutter("aborting commit write group because of exception:")
444
 
            trace.log_exception_quietly()
445
 
            self.builder.abort()
446
 
            raise
447
 
 
448
 
        self._process_pre_hooks(old_revno, new_revno)
449
 
 
450
 
        # Upload revision data to the master.
451
 
        # this will propagate merged revisions too if needed.
452
 
        if self.bound_branch:
453
 
            self._set_progress_stage("Uploading data to master branch")
454
 
            # 'commit' to the master first so a timeout here causes the
455
 
            # local branch to be out of date
456
 
            (new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
457
 
                self.branch, new_revno, self.rev_id, lossy=lossy)
458
 
            if lossy:
459
 
                self.branch.fetch(self.master_branch, self.rev_id)
460
 
 
461
 
        # and now do the commit locally.
462
 
        self.branch.set_last_revision_info(new_revno, self.rev_id)
463
 
 
464
 
        # Merge local tags to remote
465
 
        if self.bound_branch:
466
 
            self._set_progress_stage("Merging tags to master branch")
467
 
            tag_updates, tag_conflicts = self.branch.tags.merge_to(
468
 
                self.master_branch.tags)
469
 
            if tag_conflicts:
470
 
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
471
 
                note( gettext("Conflicting tags in bound branch:\n{0}".format(
472
 
                    "\n".join(warning_lines))) )
473
 
 
474
 
        # Make the working tree be up to date with the branch. This
475
 
        # includes automatic changes scheduled to be made to the tree, such
476
 
        # as updating its basis and unversioning paths that were missing.
477
 
        self.work_tree.unversion(self.deleted_ids)
478
 
        self._set_progress_stage("Updating the working tree")
479
 
        self.work_tree.update_basis_by_delta(self.rev_id,
480
 
             self.builder.get_basis_delta())
481
 
        self.reporter.completed(new_revno, self.rev_id)
482
 
        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()
483
407
        return self.rev_id
484
408
 
485
409
    def _select_reporter(self):
494
418
        # A merge with no effect on files
495
419
        if len(self.parents) > 1:
496
420
            return
 
421
        # TODO: we could simplify this by using self.builder.basis_delta.
 
422
 
 
423
        # The initial commit adds a root directory, but this in itself is not
 
424
        # a worthwhile commit.
 
425
        if (self.basis_revid == revision.NULL_REVISION and
 
426
            ((self.builder.new_inventory is not None and
 
427
             len(self.builder.new_inventory) == 1) or
 
428
            len(self.builder._basis_delta) == 1)):
 
429
            raise PointlessCommit()
497
430
        if self.builder.any_changes():
498
431
            return
499
432
        raise PointlessCommit()
500
433
 
501
 
    def _check_bound_branch(self, operation, possible_master_transports=None):
 
434
    def _check_bound_branch(self, possible_master_transports=None):
502
435
        """Check to see if the local branch is bound.
503
436
 
504
437
        If it is bound, then most of the commit will actually be
539
472
        # so grab the lock
540
473
        self.bound_branch = self.branch
541
474
        self.master_branch.lock_write()
542
 
        operation.add_cleanup(self.master_branch.unlock)
 
475
        self.master_locked = True
543
476
 
544
477
    def _check_out_of_date_tree(self):
545
478
        """Check that the working tree is up to date.
630
563
                     old_revno, old_revid, new_revno, self.rev_id,
631
564
                     tree_delta, future_tree)
632
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
 
633
602
    def _gather_parents(self):
634
603
        """Record the parents of a merge for merge detection."""
635
604
        # TODO: Make sure that this list doesn't contain duplicate
650
619
        """Update the commit builder with the data about what has changed.
651
620
        """
652
621
        exclude = self.exclude
653
 
        specific_files = self.specific_files
 
622
        specific_files = self.specific_files or []
654
623
        mutter("Selecting files for commit with filter %s", specific_files)
655
624
 
656
625
        self._check_strict()
657
626
        if self.use_record_iter_changes:
658
 
            iter_changes = self.work_tree.iter_changes(self.basis_tree,
659
 
                specific_files=specific_files)
 
627
            iter_changes = self.work_tree.iter_changes(self.basis_tree)
660
628
            iter_changes = self._filter_iter_changes(iter_changes)
661
629
            for file_id, path, fs_hash in self.builder.record_iter_changes(
662
630
                self.work_tree, self.basis_revid, iter_changes):
695
663
                # Reset the new path (None) and new versioned flag (False)
696
664
                change = (change[0], (change[1][0], None), change[2],
697
665
                    (change[3][0], False)) + change[4:]
698
 
                new_path = change[1][1]
699
 
                versioned = False
700
666
            elif kind == 'tree-reference':
701
667
                if self.recursive == 'down':
702
668
                    self._commit_nested_tree(change[0], change[1][1])
706
672
                    if new_path is None:
707
673
                        reporter.deleted(old_path)
708
674
                    elif old_path is None:
709
 
                        reporter.snapshot_change(gettext('added'), new_path)
 
675
                        reporter.snapshot_change('added', new_path)
710
676
                    elif old_path != new_path:
711
 
                        reporter.renamed(gettext('renamed'), old_path, new_path)
 
677
                        reporter.renamed('renamed', old_path, new_path)
712
678
                    else:
713
679
                        if (new_path or 
714
680
                            self.work_tree.branch.repository._format.rich_root_data):
715
681
                            # Don't report on changes to '' in non rich root
716
682
                            # repositories.
717
 
                            reporter.snapshot_change(gettext('modified'), new_path)
 
683
                            reporter.snapshot_change('modified', new_path)
718
684
            self._next_progress_entry()
719
685
        # Unversion IDs that were found to be deleted
720
686
        self.deleted_ids = deleted_ids
726
692
        if self.specific_files or self.exclude:
727
693
            specific_files = self.specific_files or []
728
694
            for path, old_ie in self.basis_inv.iter_entries():
729
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
695
                if old_ie.file_id in self.builder.new_inventory:
730
696
                    # already added - skip.
731
697
                    continue
732
698
                if (is_inside_any(specific_files, path)
836
802
                # _update_builder_with_changes.
837
803
                continue
838
804
            content_summary = self.work_tree.path_content_summary(path)
839
 
            kind = content_summary[0]
840
805
            # Note that when a filter of specific files is given, we must only
841
806
            # skip/record deleted files matching that filter.
842
807
            if not specific_files or is_inside_any(specific_files, path):
843
 
                if kind == 'missing':
 
808
                if content_summary[0] == 'missing':
844
809
                    if not deleted_paths:
845
810
                        # path won't have been split yet.
846
811
                        path_segments = splitpath(path)
853
818
                    continue
854
819
            # TODO: have the builder do the nested commit just-in-time IF and
855
820
            # only if needed.
856
 
            if kind == 'tree-reference':
 
821
            if content_summary[0] == 'tree-reference':
857
822
                # enforce repository nested tree policy.
858
823
                if (not self.work_tree.supports_tree_reference() or
859
824
                    # repository does not support it either.
860
825
                    not self.branch.repository._format.supports_tree_reference):
861
 
                    kind = 'directory'
862
 
                    content_summary = (kind, None, None, None)
863
 
                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':
864
831
                    nested_revision_id = self._commit_nested_tree(
865
832
                        file_id, path)
866
 
                    content_summary = (kind, None, None, nested_revision_id)
 
833
                    content_summary = content_summary[:3] + (
 
834
                        nested_revision_id,)
867
835
                else:
868
 
                    nested_revision_id = self.work_tree.get_reference_revision(file_id)
869
 
                    content_summary = (kind, None, None, nested_revision_id)
 
836
                    content_summary = content_summary[:3] + (
 
837
                        self.work_tree.get_reference_revision(file_id),)
870
838
 
871
839
            # Record an entry for this item
872
840
            # Note: I don't particularly want to have the existing_ie
943
911
            self.reporter.renamed(change, old_path, path)
944
912
            self._next_progress_entry()
945
913
        else:
946
 
            if change == gettext('unchanged'):
 
914
            if change == 'unchanged':
947
915
                return
948
916
            self.reporter.snapshot_change(change, path)
949
917
            self._next_progress_entry()
965
933
 
966
934
    def _emit_progress(self):
967
935
        if self.pb_entries_count is not None:
968
 
            text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
 
936
            text = "%s [%d] - Stage" % (self.pb_stage_name,
969
937
                self.pb_entries_count)
970
938
        else:
971
 
            text = gettext("%s - Stage") % (self.pb_stage_name, )
 
939
            text = "%s - Stage" % (self.pb_stage_name, )
972
940
        self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
973
941
 
974
942
    def _set_specific_file_ids(self):