← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Lukáš Lalinský
  • Date: 2007-08-07 20:45:21 UTC
  • mto: (2755.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2709.
  • Revision ID: lalinsky@gmail.com-20070807204521-q9iwgzhwei1sf96h
Fixes for comments from the mailing list.

 - Raise AssertionError from MutableTree.commit if both author kwarg and revprop are set.
 - Fixed code formatting in LongLogFormatter.log_revision.
 - Fixed punctuation in the developer docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
202
202
        if not 'branch-nick' in revprops:
203
203
            revprops['branch-nick'] = self.branch.nick
204
204
        author = kwargs.pop('author', None)
205
 
        if not 'author' in revprops and author:
 
205
        if author is not None:
 
206
            assert 'author' not in revprops
206
207
            revprops['author'] = author
207
208
        # args for wt.commit start at message from the Commit.commit method,
208
209
        args = (message, ) + args