/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

merge bzr.dev including updates to test_commit

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
80
80
        deprecated_function,
81
81
        DEPRECATED_PARAMETER)
82
82
from bzrlib.workingtree import WorkingTree
 
83
from bzrlib.urlutils import unescape_for_display
83
84
import bzrlib.ui
84
85
 
85
86
 
101
102
        self._note(format, *args)
102
103
        self.changes += 1
103
104
 
 
105
    def started(self, revno, revid, location=None):
 
106
        pass
 
107
 
104
108
    def snapshot_change(self, change, path):
105
109
        pass
106
110
 
129
133
        if path != '':
130
134
            self.changes += 1
131
135
 
 
136
    def started(self, revno, rev_id, location=None):
 
137
        if location is not None:
 
138
            location = ' to "' + unescape_for_display(location, 'utf-8') + '"'
 
139
        else:
 
140
            location = ''
 
141
        self._note('Committing revision %d%s.', revno, location)
 
142
 
132
143
    def completed(self, revno, rev_id):
133
144
        if not self.show_change_total:
134
145
            details = ''
325
336
            self._gather_parents()
326
337
            if len(self.parents) > 1 and self.specific_files:
327
338
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
328
 
            
 
339
 
329
340
            # Collect the changes
330
341
            self._set_progress_stage("Collecting changes",
331
342
                    entries_title="Directory")
333
344
                self.config, timestamp, timezone, committer, revprops, rev_id)
334
345
            
335
346
            try:
 
347
                # find the location being committed to
 
348
                if self.bound_branch:
 
349
                    master_location = self.master_branch.base
 
350
                else:
 
351
                    master_location = self.branch.base
 
352
 
 
353
                # report the start of the commit
 
354
                self.reporter.started(new_revno, self.rev_id, master_location)
 
355
 
336
356
                self._update_builder_with_changes()
337
357
                self._check_pointless()
338
358