/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/builtins.py

  • Committer: Martin Pool
  • Date: 2007-08-16 01:04:10 UTC
  • mfrom: (2709 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2712.
  • Revision ID: mbp@sourcefrog.net-20070816010410-92814aa40xf7lja4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2146
2146
    committed.  If a directory is specified then the directory and everything 
2147
2147
    within it is committed.
2148
2148
 
 
2149
    If author of the change is not the same person as the committer, you can
 
2150
    specify the author's name using the --author option. The name should be
 
2151
    in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
 
2152
 
2149
2153
    A selected-file commit may fail in some cases where the committed
2150
2154
    tree would be invalid. Consider::
2151
2155
 
2192
2196
                    "files in the working tree."),
2193
2197
             ListOption('fixes', type=str,
2194
2198
                    help="Mark a bug as being fixed by this revision."),
 
2199
             Option('author', type=str,
 
2200
                    help="Set the author's name, if it's different "
 
2201
                         "from the committer."),
2195
2202
             Option('local',
2196
2203
                    help="Perform a local commit in a bound "
2197
2204
                         "branch.  Local commits are not pushed to "
2224
2231
        return '\n'.join(properties)
2225
2232
 
2226
2233
    def run(self, message=None, file=None, verbose=True, selected_list=None,
2227
 
            unchanged=False, strict=False, local=False, fixes=None):
 
2234
            unchanged=False, strict=False, local=False, fixes=None,
 
2235
            author=None):
2228
2236
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2229
2237
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2230
2238
                StrictCommitFailed)
2281
2289
            tree.commit(message_callback=get_message,
2282
2290
                        specific_files=selected_list,
2283
2291
                        allow_pointless=unchanged, strict=strict, local=local,
2284
 
                        reporter=reporter, revprops=properties)
 
2292
                        reporter=reporter, revprops=properties,
 
2293
                        author=author)
2285
2294
        except PointlessCommit:
2286
2295
            # FIXME: This should really happen before the file is read in;
2287
2296
            # perhaps prepare the commit; get the message; then actually commit