/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: Ian Clatworthy
  • Date: 2007-09-04 07:59:25 UTC
  • mto: (2819.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2820.
  • Revision ID: ian.clatworthy@internode.on.net-20070904075925-l3c1jw2rzuut89zb
Upgrade commit tests to reflect new reporting formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
126
126
class _InitialCommitReporter(NullCommitReporter):
127
127
 
128
128
    def snapshot_change(self, change, path):
129
 
        self._note_change("%s %s", change, path)
 
129
        if path != '':
 
130
            self.changes += 1
130
131
 
131
132
    def completed(self, revno, rev_id):
132
 
        self._note('Committed revision %d.', revno)
133
 
        if self.show_change_total:
134
 
            if self.changes == 1:
135
 
                self._note('%d change committed.', self.changes)
136
 
            else:
137
 
                self._note('%d changes committed.', self.changes)
 
133
        if not self.show_change_total:
 
134
            details = ''
 
135
        elif self.changes == 1:
 
136
            details = ' (%d change made)' % self.changes
 
137
        else:
 
138
            details = ' (%d changes made)' % self.changes
 
139
        self._note('Committed revision %d%s.', revno, details)
138
140
 
139
141
 
140
142
class ReportCommitToLog(_InitialCommitReporter):
268
270
        self.strict = strict
269
271
        self.verbose = verbose
270
272
 
 
273
        self.work_tree.lock_write()
271
274
        self.basis_tree = self.work_tree.basis_tree()
272
 
        self.initial_commit = self.basis_tree is None
273
 
        if reporter is not None:
274
 
            self.reporter = reporter
275
 
        elif self.reporter is None:
276
 
            self.reporter = self._select_reporter()
277
 
 
278
275
        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
279
 
        self.work_tree.lock_write()
280
276
        self.basis_tree.lock_read()
281
277
        try:
282
278
            # Cannot commit with conflicts present.
289
285
            # Check that the working tree is up to date
290
286
            old_revno, new_revno = self._check_out_of_date_tree()
291
287
 
 
288
            # Complete configuration setup
 
289
            self.initial_commit = new_revno == 1
 
290
            if reporter is not None:
 
291
                self.reporter = reporter
 
292
            elif self.reporter is None:
 
293
                self.reporter = self._select_reporter()
292
294
            if self.config is None:
293
295
                self.config = self.branch.get_config()
294
296