/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
174
174
        self.reporter = reporter
175
175
        self.config = config
176
176
 
177
 
    @staticmethod
178
 
    def update_revprops(revprops, branch, authors=None, author=None,
179
 
                        local=False, possible_master_transports=None):
180
 
        if revprops is None:
181
 
            revprops = {}
182
 
        if possible_master_transports is None:
183
 
            possible_master_transports = []
184
 
        if not 'branch-nick' in revprops:
185
 
            revprops['branch-nick'] = branch._get_nick(
186
 
                local,
187
 
                possible_master_transports)
188
 
        if authors is not None:
189
 
            if author is not None:
190
 
                raise AssertionError('Specifying both author and authors '
191
 
                        'is not allowed. Specify just authors instead')
192
 
            if 'author' in revprops or 'authors' in revprops:
193
 
                # XXX: maybe we should just accept one of them?
194
 
                raise AssertionError('author property given twice')
195
 
            if authors:
196
 
                for individual in authors:
197
 
                    if '\n' in individual:
198
 
                        raise AssertionError('\\n is not a valid character '
199
 
                                'in an author identity')
200
 
                revprops['authors'] = '\n'.join(authors)
201
 
        if author is not None:
202
 
            symbol_versioning.warn('The parameter author was deprecated'
203
 
                   ' in version 1.13. Use authors instead',
204
 
                   DeprecationWarning)
205
 
            if 'author' in revprops or 'authors' in revprops:
206
 
                # XXX: maybe we should just accept one of them?
207
 
                raise AssertionError('author property given twice')
208
 
            if '\n' in author:
209
 
                raise AssertionError('\\n is not a valid character '
210
 
                        'in an author identity')
211
 
            revprops['authors'] = author
212
 
        return revprops
213
 
 
214
177
    def commit(self,
215
178
               message=None,
216
179
               timestamp=None,
380
343
        self.pb_stage_count = 0
381
344
        self.pb_stage_total = 5
382
345
        if self.bound_branch:
383
 
            # 2 extra stages: "Uploading data to master branch" and "Merging
384
 
            # tags to master branch"
385
 
            self.pb_stage_total += 2
 
346
            self.pb_stage_total += 1
386
347
        self.pb.show_pct = False
387
348
        self.pb.show_spinner = False
388
349
        self.pb.show_eta = False
452
413
        # and now do the commit locally.
453
414
        self.branch.set_last_revision_info(new_revno, self.rev_id)
454
415
 
455
 
        # Merge local tags to remote
456
 
        if self.bound_branch:
457
 
            self._set_progress_stage("Merging tags to master branch")
458
 
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
459
 
            if tag_conflicts:
460
 
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
461
 
                note("Conflicting tags in bound branch:\n" +
462
 
                    "\n".join(warning_lines))
463
 
 
464
416
        # Make the working tree be up to date with the branch. This
465
417
        # includes automatic changes scheduled to be made to the tree, such
466
418
        # as updating its basis and unversioning paths that were missing.