← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/generate_ids.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/generate_ids.py
93
93
def gen_revision_id(username, timestamp=None):
94
94
    """Return new revision-id.
95
95
 
96
 
    :param username: This is the value returned by config.username(), which is
97
 
        typically a real name, followed by an email address. If found, we will
98
 
        use just the email address portion. Otherwise we flatten the real name,
99
 
        and use that.
 
96
    :param username: The username of the committer, in the format returned by
 
97
        config.username().  This is typically a real name, followed by an
 
98
        email address. If found, we will use just the email address portion.
 
99
        Otherwise we flatten the real name, and use that.
100
100
    :return: A new revision id.
101
101
    """
102
102
    try: