/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 20:36:16 UTC
  • mfrom: (322.1.1 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030203616-op14zvvmflw6ds1n
Merge in Jelmer's trunk update + conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
677
677
    def _rev_to_pending_info(rev):
678
678
        """Get the information from a pending merge."""
679
679
        from bzrlib.osutils import format_date
680
 
 
681
680
        rev_dict = {}
682
681
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
683
682
        rev_dict['summary'] = rev.get_summary()