/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: 2006-03-22 13:21:14 UTC
  • mfrom: (1621 +trunk)
  • mto: (1666.1.5 integration)
  • mto: This revision was merged to the branch mainline in revision 1622.
  • Revision ID: robertc@robertcollins.net-20060322132114-cc057ded01411a94
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
128
128
class ReportCommitToLog(NullCommitReporter):
129
129
 
130
130
    def snapshot_change(self, change, path):
 
131
        if change == 'unchanged':
 
132
            return
131
133
        note("%s %s", change, path)
132
134
 
133
135
    def completed(self, revno, rev_id):
229
231
        self.bound_branch = None
230
232
        self.local = local
231
233
        self.master_branch = None
 
234
        self.master_locked = False
232
235
        self.rev_id = rev_id
233
236
        self.specific_files = specific_files
234
237
        self.allow_pointless = allow_pointless
391
394
        # so grab the lock
392
395
        self.bound_branch = self.branch
393
396
        self.master_branch.lock_write()
 
397
        self.master_locked = True
394
398
####        
395
399
####        # Check to see if we have any pending merges. If we do
396
400
####        # those need to be pushed into the master branch
409
413
        """
410
414
        if not self.bound_branch:
411
415
            return
412
 
        self.master_branch.unlock()
 
416
        if self.master_locked:
 
417
            self.master_branch.unlock()
413
418
 
414
419
    def _escape_commit_message(self):
415
420
        """Replace xml-incompatible control characters."""
499
504
        # mark-merge.  
500
505
        for path, ie in self.new_inv.iter_entries():
501
506
            previous_entries = ie.find_previous_heads(
502
 
                self.parent_invs, 
 
507
                self.parent_invs,
503
508
                self.weave_store,
504
509
                self.branch.repository.get_transaction())
505
510
            if ie.revision is None: