/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: Jelmer Vernooij
  • Date: 2011-05-18 10:24:05 UTC
  • mfrom: (5889 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5903.
  • Revision ID: jelmer@samba.org-20110518102405-isallt5uet1afh4f
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
443
443
        except Exception, e:
444
444
            mutter("aborting commit write group because of exception:")
445
445
            trace.log_exception_quietly()
446
 
            note("aborting commit write group: %r" % (e,))
447
446
            self.builder.abort()
448
447
            raise
449
448
 
495
494
        # A merge with no effect on files
496
495
        if len(self.parents) > 1:
497
496
            return
498
 
        # TODO: we could simplify this by using self.builder.basis_delta.
499
 
 
500
 
        # The initial commit adds a root directory, but this in itself is not
501
 
        # a worthwhile commit.
502
 
        if (self.basis_revid == revision.NULL_REVISION and
503
 
            ((self.builder.new_inventory is not None and
504
 
             len(self.builder.new_inventory) == 1) or
505
 
            len(self.builder._basis_delta) == 1)):
506
 
            raise PointlessCommit()
507
497
        if self.builder.any_changes():
508
498
            return
509
499
        raise PointlessCommit()