/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: Aaron Bentley
  • Date: 2006-03-17 20:39:44 UTC
  • mto: This revision was merged to the branch mainline in revision 1619.
  • Revision ID: abentley@panoramicfeedback.com-20060317203944-1d9d5fee7c4e92d5
Fixed master locking in commit

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
227
227
        self.bound_branch = None
228
228
        self.local = local
229
229
        self.master_branch = None
 
230
        self.master_locked = False
230
231
        self.rev_id = rev_id
231
232
        self.specific_files = specific_files
232
233
        self.allow_pointless = allow_pointless
384
385
        # so grab the lock
385
386
        self.bound_branch = self.branch
386
387
        self.master_branch.lock_write()
 
388
        self.master_locked = True
387
389
####        
388
390
####        # Check to see if we have any pending merges. If we do
389
391
####        # those need to be pushed into the master branch
402
404
        """
403
405
        if not self.bound_branch:
404
406
            return
405
 
        self.master_branch.unlock()
 
407
        if self.master_locked:
 
408
            self.master_branch.unlock()
406
409
 
407
410
    def _escape_commit_message(self):
408
411
        """Replace xml-incompatible control characters."""