/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: Martin Pool
  • Date: 2006-03-22 12:05:37 UTC
  • mfrom: (1620 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060322120537-8ec4c8b33db81378
[merge] trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
231
231
        self.bound_branch = None
232
232
        self.local = local
233
233
        self.master_branch = None
 
234
        self.master_locked = False
234
235
        self.rev_id = rev_id
235
236
        self.specific_files = specific_files
236
237
        self.allow_pointless = allow_pointless
393
394
        # so grab the lock
394
395
        self.bound_branch = self.branch
395
396
        self.master_branch.lock_write()
 
397
        self.master_locked = True
396
398
####        
397
399
####        # Check to see if we have any pending merges. If we do
398
400
####        # those need to be pushed into the master branch
411
413
        """
412
414
        if not self.bound_branch:
413
415
            return
414
 
        self.master_branch.unlock()
 
416
        if self.master_locked:
 
417
            self.master_branch.unlock()
415
418
 
416
419
    def _escape_commit_message(self):
417
420
        """Replace xml-incompatible control characters."""