← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
297
297
            self._populate_new_inv()
298
298
            self._report_deletes()
299
299
 
300
 
            if not (self.allow_pointless
301
 
                    or len(self.parents) > 1
302
 
                    or (self.builder.new_inventory != self.basis_inv and 
303
 
                        (len(self.basis_inv) != 0 or 
304
 
                         len(self.builder.new_inventory) > 1))):
305
 
                raise PointlessCommit()
 
300
            self._check_pointless()
306
301
 
307
302
            self._emit_progress_update()
308
303
            # TODO: Now the new inventory is known, check for conflicts and
350
345
            self._cleanup()
351
346
        return self.rev_id
352
347
 
 
348
    def _check_pointless(self):
 
349
        if self.allow_pointless:
 
350
            return
 
351
        # A merge with no effect on files
 
352
        if len(self.parents) > 1:
 
353
            return
 
354
        # work around the fact that a newly-initted tree does differ from its
 
355
        # basis
 
356
        if len(self.basis_inv) == 0 and len(self.builder.new_inventory) == 1:
 
357
            raise PointlessCommit()
 
358
        if len(self.builder.new_inventory) != len(self.basis_inv):
 
359
            return
 
360
        if (len(self.builder.new_inventory) != 1 and
 
361
            self.builder.new_inventory != self.basis_inv):
 
362
            return
 
363
        raise PointlessCommit()
 
364
 
353
365
    def _check_bound_branch(self):
354
366
        """Check to see if the local branch is bound.
355
367