← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: James Westby
  • Date: 2009-02-26 19:21:53 UTC
  • mto: This revision was merged to the branch mainline in revision 4077.
  • Revision ID: jw+debian@jameswestby.net-20090226192153-wcqvwsjb5cn37lb9
Allow specifying multiple authors for a revision.

The revision property "author" is now a "\n"-separated list of authors.

--author can be specified multiple times to populate that list at commit
time.

get_apparent_author() is deprecated in favour of get_apparent_authors(),
which will return a list.

Some things (e.g. annotate) still just use the first item from that list,
but there is now support for other code to use all of the authors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2633
2633
    If author of the change is not the same person as the committer, you can
2634
2634
    specify the author's name using the --author option. The name should be
2635
2635
    in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
 
2636
    If there is more than one author of the change you can specify the option
 
2637
    multiple times, once for each author.
2636
2638
 
2637
2639
    A selected-file commit may fail in some cases where the committed
2638
2640
    tree would be invalid. Consider::
2682
2684
                    "files in the working tree."),
2683
2685
             ListOption('fixes', type=str,
2684
2686
                    help="Mark a bug as being fixed by this revision."),
2685
 
             Option('author', type=unicode,
 
2687
             ListOption('author', type=unicode,
2686
2688
                    help="Set the author's name, if it's different "
2687
2689
                         "from the committer."),
2688
2690
             Option('local',
2785
2787
                        specific_files=selected_list,
2786
2788
                        allow_pointless=unchanged, strict=strict, local=local,
2787
2789
                        reporter=None, verbose=verbose, revprops=properties,
2788
 
                        author=author,
 
2790
                        authors=author,
2789
2791
                        exclude=safe_relpath_files(tree, exclude))
2790
2792
        except PointlessCommit:
2791
2793
            # FIXME: This should really happen before the file is read in;