14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
18
19
# The newly committed revision is going to have a shape corresponding
19
20
# to that of the working tree. Files that are not in the
72
73
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
74
from bzrlib import symbol_versioning
74
75
from bzrlib.urlutils import unescape_for_display
76
from bzrlib.i18n import gettext
77
78
class NullCommitReporter(object):
78
79
"""I report on progress of a commit."""
113
114
note(format, *args)
115
116
def snapshot_change(self, change, path):
116
if path == '' and change in ('added', 'modified'):
117
if path == '' and change in (gettext('added'), gettext('modified')):
118
119
self._note("%s %s", change, path)
127
128
"to started.", DeprecationWarning,
130
self._note('Committing%s', location)
131
self._note(gettext('Committing%s'), location)
132
133
def completed(self, revno, rev_id):
133
self._note('Committed revision %d.', revno)
134
self._note(gettext('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)
141
142
def deleted(self, path):
142
self._note('deleted %s', path)
143
self._note(gettext('deleted %s'), path)
144
145
def missing(self, path):
145
self._note('missing %s', path)
146
self._note(gettext('missing %s'), path)
147
148
def renamed(self, change, old_path, new_path):
148
149
self._note('%s %s => %s', change, old_path, new_path)
166
167
def __init__(self,
169
170
"""Create a Commit object.
171
172
:param reporter: the default reporter to use or None to decide later
173
174
self.reporter = reporter
175
self.config_stack = config_stack
177
178
def update_revprops(revprops, branch, authors=None, author=None,
268
269
operation = OperationWithCleanups(self._commit)
269
270
self.revprops = revprops or {}
270
271
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
271
self.config = config or self.config
272
self.config_stack = config or self.config_stack
272
273
return operation.run(
274
275
timestamp=timestamp,
363
364
self._check_bound_branch(operation, possible_master_transports)
365
366
# Check that the working tree is up to date
366
old_revno, new_revno = self._check_out_of_date_tree()
367
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
368
369
# Complete configuration setup
369
370
if reporter is not None:
370
371
self.reporter = reporter
371
372
elif self.reporter is None:
372
373
self.reporter = self._select_reporter()
373
if self.config is None:
374
self.config = self.branch.get_config()
374
if self.config_stack is None:
375
self.config_stack = self.work_tree.get_config_stack()
376
377
self._set_specific_file_ids()
405
406
self._set_progress_stage("Collecting changes", counter=True)
406
407
self._lossy = lossy
407
408
self.builder = self.branch.get_commit_builder(self.parents,
408
self.config, timestamp, timezone, committer, self.revprops,
409
self.config_stack, timestamp, timezone, committer, self.revprops,
409
410
rev_id, lossy=lossy)
410
411
if not self.builder.supports_record_entry_contents and self.exclude:
411
412
self.builder.abort()
412
413
raise errors.ExcludesUnsupported(self.branch.repository)
415
if self.builder.updates_branch and self.bound_branch:
417
raise AssertionError(
418
"bound branches not supported for commit builders "
419
"that update the branch")
415
422
self.builder.will_record_deletes()
416
423
# find the location being committed to
445
452
self.builder.abort()
448
self._process_pre_hooks(old_revno, new_revno)
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)
459
self.branch.fetch(self.master_branch, self.rev_id)
461
# and now do the commit locally.
462
self.branch.set_last_revision_info(new_revno, self.rev_id)
464
# Merge local tags to remote
465
if self.bound_branch:
466
self._set_progress_stage("Merging tags to master branch")
467
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
469
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
470
note("Conflicting tags in bound branch:\n" +
471
"\n".join(warning_lines))
455
self._update_branches(old_revno, old_revid, new_revno)
473
457
# Make the working tree be up to date with the branch. This
474
458
# includes automatic changes scheduled to be made to the tree, such
481
465
self._process_post_hooks(old_revno, new_revno)
482
466
return self.rev_id
468
def _update_branches(self, old_revno, old_revid, new_revno):
469
"""Update the master and local branch to the new revision.
471
This will try to make sure that the master branch is updated
472
before the local branch.
474
:param old_revno: Revision number of master branch before the
476
:param old_revid: Tip of master branch before the commit
477
:param new_revno: Revision number of the new commit
479
if not self.builder.updates_branch:
480
self._process_pre_hooks(old_revno, new_revno)
482
# Upload revision data to the master.
483
# this will propagate merged revisions too if needed.
484
if self.bound_branch:
485
self._set_progress_stage("Uploading data to master branch")
486
# 'commit' to the master first so a timeout here causes the
487
# local branch to be out of date
488
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
489
self.branch, new_revno, self.rev_id, lossy=self._lossy)
491
self.branch.fetch(self.master_branch, self.rev_id)
493
# and now do the commit locally.
494
self.branch.set_last_revision_info(new_revno, self.rev_id)
497
self._process_pre_hooks(old_revno, new_revno)
499
# The commit builder will already have updated the branch,
501
self.branch.set_last_revision_info(old_revno, old_revid)
504
# Merge local tags to remote
505
if self.bound_branch:
506
self._set_progress_stage("Merging tags to master branch")
507
tag_updates, tag_conflicts = self.branch.tags.merge_to(
508
self.master_branch.tags)
510
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
511
note( gettext("Conflicting tags in bound branch:\n{0}".format(
512
"\n".join(warning_lines))) )
484
514
def _select_reporter(self):
485
515
"""Select the CommitReporter to use."""
543
573
def _check_out_of_date_tree(self):
544
574
"""Check that the working tree is up to date.
546
:return: old_revision_number,new_revision_number tuple
576
:return: old_revision_number, old_revision_id, new_revision_number
549
580
first_tree_parent = self.work_tree.get_parent_ids()[0]
563
594
# ghost parents never appear in revision history.
565
return old_revno,new_revno
596
return old_revno, master_last, new_revno
567
598
def _process_pre_hooks(self, old_revno, new_revno):
568
599
"""Process any registered pre commit hooks."""
574
605
# Process the post commit hooks, if any
575
606
self._set_progress_stage("Running post_commit hooks")
576
607
# old style commit hooks - should be deprecated ? (obsoleted in
578
if self.config.post_commit() is not None:
579
hooks = self.config.post_commit().split(' ')
608
# 0.15^H^H^H^H 2.5.0)
609
post_commit = self.config_stack.get('post_commit')
610
if post_commit is not None:
611
hooks = post_commit.split(' ')
580
612
# this would be nicer with twisted.python.reflect.namedAny
581
613
for hook in hooks:
582
614
result = eval(hook + '(branch, rev_id)',
635
667
# entries and the order is preserved when doing this.
636
668
if self.use_record_iter_changes:
638
self.basis_inv = self.basis_tree.inventory
670
self.basis_inv = self.basis_tree.root_inventory
639
671
self.parent_invs = [self.basis_inv]
640
672
for revision in self.parents[1:]:
641
673
if self.branch.repository.has_revision(revision):
694
726
# Reset the new path (None) and new versioned flag (False)
695
727
change = (change[0], (change[1][0], None), change[2],
696
728
(change[3][0], False)) + change[4:]
729
new_path = change[1][1]
697
731
elif kind == 'tree-reference':
698
732
if self.recursive == 'down':
699
733
self._commit_nested_tree(change[0], change[1][1])
703
737
if new_path is None:
704
738
reporter.deleted(old_path)
705
739
elif old_path is None:
706
reporter.snapshot_change('added', new_path)
740
reporter.snapshot_change(gettext('added'), new_path)
707
741
elif old_path != new_path:
708
reporter.renamed('renamed', old_path, new_path)
742
reporter.renamed(gettext('renamed'), old_path, new_path)
711
745
self.work_tree.branch.repository._format.rich_root_data):
712
746
# Don't report on changes to '' in non rich root
714
reporter.snapshot_change('modified', new_path)
748
reporter.snapshot_change(gettext('modified'), new_path)
715
749
self._next_progress_entry()
716
750
# Unversion IDs that were found to be deleted
717
751
self.deleted_ids = deleted_ids
800
834
deleted_paths = {}
801
835
# XXX: Note that entries may have the wrong kind because the entry does
802
836
# not reflect the status on disk.
803
work_inv = self.work_tree.inventory
804
837
# NB: entries will include entries within the excluded ids/paths
805
838
# because iter_entries_by_dir has no 'exclude' facility today.
806
entries = work_inv.iter_entries_by_dir(
839
entries = self.work_tree.iter_entries_by_dir(
807
840
specific_file_ids=self.specific_file_ids, yield_parents=True)
808
841
for path, existing_ie in entries:
809
842
file_id = existing_ie.file_id
940
973
self.reporter.renamed(change, old_path, path)
941
974
self._next_progress_entry()
943
if change == 'unchanged':
976
if change == gettext('unchanged'):
945
978
self.reporter.snapshot_change(change, path)
946
979
self._next_progress_entry()
963
996
def _emit_progress(self):
964
997
if self.pb_entries_count is not None:
965
text = "%s [%d] - Stage" % (self.pb_stage_name,
998
text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
966
999
self.pb_entries_count)
968
text = "%s - Stage" % (self.pb_stage_name, )
1001
text = gettext("%s - Stage") % (self.pb_stage_name, )
969
1002
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
971
1004
def _set_specific_file_ids(self):
added
removed
bzrlib/commit.py
