← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-22 12:17:00 UTC
  • mfrom: (1616.1.10 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060322121700-79ce0be81013aba1
(mbp) pycurl fixes, other fixes, weave commands, verbose commit changes from robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
128
128
class ReportCommitToLog(NullCommitReporter):
129
129
 
130
130
    def snapshot_change(self, change, path):
 
131
        if change == 'unchanged':
 
132
            return
131
133
        note("%s %s", change, path)
132
134
 
133
135
    def completed(self, revno, rev_id):
134
 
        note('committed r%d {%s}', revno, rev_id)
 
136
        note('Committed revision %d.', revno)
135
137
    
136
138
    def deleted(self, file_id):
137
139
        note('deleted %s', file_id)
179
181
               verbose=False,
180
182
               revprops=None,
181
183
               working_tree=None,
182
 
               local=False):
 
184
               local=False,
 
185
               reporter=None,
 
186
               config=None):
183
187
        """Commit working copy as a new revision.
184
188
 
185
189
        branch -- the deprecated branch to commit to. New callers should pass in 
235
239
        if revprops is not None:
236
240
            self.revprops.update(revprops)
237
241
 
 
242
        if reporter is None and self.reporter is None:
 
243
            self.reporter = NullCommitReporter()
 
244
        elif reporter is not None:
 
245
            self.reporter = reporter
 
246
 
238
247
        self.work_tree.lock_write()
239
248
        try:
240
249
            # setup the bound branch variables as needed.
332
341
            self.work_tree.set_last_revision(self.rev_id, precursor)
333
342
            # now the work tree is up to date with the branch
334
343
            
335
 
            self.reporter.completed(self.branch.revno()+1, self.rev_id)
 
344
            self.reporter.completed(self.branch.revno(), self.rev_id)
336
345
            if self.config.post_commit() is not None:
337
346
                hooks = self.config.post_commit().split(' ')
338
347
                # this would be nicer with twisted.python.reflect.namedAny
495
504
        # mark-merge.  
496
505
        for path, ie in self.new_inv.iter_entries():
497
506
            previous_entries = ie.find_previous_heads(
498
 
                self.parent_invs, 
 
507
                self.parent_invs,
499
508
                self.weave_store,
500
509
                self.branch.repository.get_transaction())
501
510
            if ie.revision is None: