← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 11:17:57 UTC
  • mfrom: (5050.3.17 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729111757-018h3pcefo7z0dnq
Merge lp:bzr/2.2 into lp:bzr.

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-2010 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
52
52
from bzrlib import (
53
53
    debug,
54
54
    errors,
 
55
    revision,
55
56
    trace,
56
57
    tree,
57
 
    ui,
58
58
    )
59
59
from bzrlib.branch import Branch
60
60
from bzrlib.cleanup import OperationWithCleanups
72
72
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
73
from bzrlib import symbol_versioning
74
74
from bzrlib.urlutils import unescape_for_display
75
 
from bzrlib.i18n import gettext
 
75
import bzrlib.ui
 
76
 
76
77
 
77
78
class NullCommitReporter(object):
78
79
    """I report on progress of a commit."""
113
114
        note(format, *args)
114
115
 
115
116
    def snapshot_change(self, change, path):
116
 
        if path == '' and change in (gettext('added'), gettext('modified')):
 
117
        if path == '' and change in ('added', 'modified'):
117
118
            return
118
119
        self._note("%s %s", change, path)
119
120
 
127
128
                                   "to started.", DeprecationWarning,
128
129
                                   stacklevel=2)
129
130
            location = ''
130
 
        self._note(gettext('Committing%s'), location)
 
131
        self._note('Committing%s', location)
131
132
 
132
133
    def completed(self, revno, rev_id):
133
 
        self._note(gettext('Committed revision %d.'), revno)
 
134
        self._note('Committed revision %d.', revno)
134
135
        # self._note goes to the console too; so while we want to log the
135
136
        # rev_id, we can't trivially only log it. (See bug 526425). Long
136
137
        # term we should rearrange the reporting structure, but for now
139
140
        mutter('Committed revid %s as revno %d.', rev_id, revno)
140
141
 
141
142
    def deleted(self, path):
142
 
        self._note(gettext('deleted %s'), path)
 
143
        self._note('deleted %s', path)
143
144
 
144
145
    def missing(self, path):
145
 
        self._note(gettext('missing %s'), path)
 
146
        self._note('missing %s', path)
146
147
 
147
148
    def renamed(self, change, old_path, new_path):
148
149
        self._note('%s %s => %s', change, old_path, new_path)
228
229
               message_callback=None,
229
230
               recursive='down',
230
231
               exclude=None,
231
 
               possible_master_transports=None,
232
 
               lossy=False):
 
232
               possible_master_transports=None):
233
233
        """Commit working copy as a new revision.
234
234
 
235
235
        :param message: the commit message (it or message_callback is required)
262
262
        :param exclude: None or a list of relative paths to exclude from the
263
263
            commit. Pending changes to excluded files will be ignored by the
264
264
            commit.
265
 
        :param lossy: When committing to a foreign VCS, ignore any
266
 
            data that can not be natively represented.
267
265
        """
268
266
        operation = OperationWithCleanups(self._commit)
269
267
        self.revprops = revprops or {}
285
283
               message_callback=message_callback,
286
284
               recursive=recursive,
287
285
               exclude=exclude,
288
 
               possible_master_transports=possible_master_transports,
289
 
               lossy=lossy)
 
286
               possible_master_transports=possible_master_transports)
290
287
 
291
288
    def _commit(self, operation, message, timestamp, timezone, committer,
292
289
            specific_files, rev_id, allow_pointless, strict, verbose,
293
290
            working_tree, local, reporter, message_callback, recursive,
294
 
            exclude, possible_master_transports, lossy):
 
291
            exclude, possible_master_transports):
295
292
        mutter('preparing to commit')
296
293
 
297
294
        if working_tree is None:
329
326
                minimum_path_selection(specific_files))
330
327
        else:
331
328
            self.specific_files = None
332
 
 
 
329
            
333
330
        self.allow_pointless = allow_pointless
334
331
        self.message_callback = message_callback
335
332
        self.timestamp = timestamp
349
346
            not self.branch.repository._format.supports_tree_reference and
350
347
            (self.branch.repository._format.fast_deltas or
351
348
             len(self.parents) < 2))
352
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
349
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
353
350
        operation.add_cleanup(self.pb.finished)
354
351
        self.basis_revid = self.work_tree.last_revision()
355
352
        self.basis_tree = self.work_tree.basis_tree()
383
380
        self.pb_stage_count = 0
384
381
        self.pb_stage_total = 5
385
382
        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
 
383
            self.pb_stage_total += 1
389
384
        self.pb.show_pct = False
390
385
        self.pb.show_spinner = False
391
386
        self.pb.show_eta = False
403
398
 
404
399
        # Collect the changes
405
400
        self._set_progress_stage("Collecting changes", counter=True)
406
 
        self._lossy = lossy
407
401
        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)
 
402
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
413
403
 
414
404
        try:
415
405
            self.builder.will_record_deletes()
442
432
        except Exception, e:
443
433
            mutter("aborting commit write group because of exception:")
444
434
            trace.log_exception_quietly()
 
435
            note("aborting commit write group: %r" % (e,))
445
436
            self.builder.abort()
446
437
            raise
447
438
 
453
444
            self._set_progress_stage("Uploading data to master branch")
454
445
            # 'commit' to the master first so a timeout here causes the
455
446
            # 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)
 
447
            self.master_branch.import_last_revision_info(
 
448
                self.branch.repository, new_revno, self.rev_id)
460
449
 
461
450
        # and now do the commit locally.
462
451
        self.branch.set_last_revision_info(new_revno, self.rev_id)
463
452
 
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
453
        # Make the working tree be up to date with the branch. This
475
454
        # includes automatic changes scheduled to be made to the tree, such
476
455
        # as updating its basis and unversioning paths that were missing.
494
473
        # A merge with no effect on files
495
474
        if len(self.parents) > 1:
496
475
            return
 
476
        # TODO: we could simplify this by using self.builder.basis_delta.
 
477
 
 
478
        # The initial commit adds a root directory, but this in itself is not
 
479
        # a worthwhile commit.
 
480
        if (self.basis_revid == revision.NULL_REVISION and
 
481
            ((self.builder.new_inventory is not None and
 
482
             len(self.builder.new_inventory) == 1) or
 
483
            len(self.builder._basis_delta) == 1)):
 
484
            raise PointlessCommit()
497
485
        if self.builder.any_changes():
498
486
            return
499
487
        raise PointlessCommit()
695
683
                # Reset the new path (None) and new versioned flag (False)
696
684
                change = (change[0], (change[1][0], None), change[2],
697
685
                    (change[3][0], False)) + change[4:]
698
 
                new_path = change[1][1]
699
 
                versioned = False
700
686
            elif kind == 'tree-reference':
701
687
                if self.recursive == 'down':
702
688
                    self._commit_nested_tree(change[0], change[1][1])
706
692
                    if new_path is None:
707
693
                        reporter.deleted(old_path)
708
694
                    elif old_path is None:
709
 
                        reporter.snapshot_change(gettext('added'), new_path)
 
695
                        reporter.snapshot_change('added', new_path)
710
696
                    elif old_path != new_path:
711
 
                        reporter.renamed(gettext('renamed'), old_path, new_path)
 
697
                        reporter.renamed('renamed', old_path, new_path)
712
698
                    else:
713
699
                        if (new_path or 
714
700
                            self.work_tree.branch.repository._format.rich_root_data):
715
701
                            # Don't report on changes to '' in non rich root
716
702
                            # repositories.
717
 
                            reporter.snapshot_change(gettext('modified'), new_path)
 
703
                            reporter.snapshot_change('modified', new_path)
718
704
            self._next_progress_entry()
719
705
        # Unversion IDs that were found to be deleted
720
706
        self.deleted_ids = deleted_ids
726
712
        if self.specific_files or self.exclude:
727
713
            specific_files = self.specific_files or []
728
714
            for path, old_ie in self.basis_inv.iter_entries():
729
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
715
                if old_ie.file_id in self.builder.new_inventory:
730
716
                    # already added - skip.
731
717
                    continue
732
718
                if (is_inside_any(specific_files, path)
943
929
            self.reporter.renamed(change, old_path, path)
944
930
            self._next_progress_entry()
945
931
        else:
946
 
            if change == gettext('unchanged'):
 
932
            if change == 'unchanged':
947
933
                return
948
934
            self.reporter.snapshot_change(change, path)
949
935
            self._next_progress_entry()
965
951
 
966
952
    def _emit_progress(self):
967
953
        if self.pb_entries_count is not None:
968
 
            text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
 
954
            text = "%s [%d] - Stage" % (self.pb_stage_name,
969
955
                self.pb_entries_count)
970
956
        else:
971
 
            text = gettext("%s - Stage") % (self.pb_stage_name, )
 
957
            text = "%s - Stage" % (self.pb_stage_name, )
972
958
        self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
973
959
 
974
960
    def _set_specific_file_ids(self):