Merge lp:~jamalta/launchpad/contributions-merge into lp:launchpad

[Jamal Fanaian]

Created name map for community-contributions to merge people using different names/email addresses.

[Jamal Fanaian (jamalta)]

= Summary =

Created a name map in community-contributions.py that will take care of merging users who have contributed using different names and emails.

== Pre-implementation notes ==

Spoke with salgado to make sure this was a good idea and implementation.

== Tests ==

== Demo and Q/A ==

 % utilities/community-contributions.py --dry-run .

== Launchpad lint ==

The lint notices are unrelated to any changes I made.

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  utilities/community-contributions.py

== Pylint notices ==

utilities/community-contributions.py
    49: [C0301] Line too long (79/78)
    175: [C0301] Line too long (79/78)
    49: [W0702] No exception type(s) specified
    47: [W0403] Relative import 'editmoin'

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve (code)

=== modified file 'utilities/community-contributions.py'
--- utilities/community-contributions.py	2009-12-07 20:21:44 +0000
+++ utilities/community-contributions.py	2010-02-05 19:46:18 +0000
@@ -46,7 +46,7 @@
 try:
     from editmoin import editshortcut
 except:
-    sys.stderr.write("""ERROR: Unable to import from 'editmoin'.  How to solve:
+    sys.stderr.write("""ERROR: Unable to import from 'editmoin'. How to solve:
 Get editmoin.py from launchpadlib's "contrib/" directory:
 
   http://bazaar.launchpad.net/~lazr-developers/launchpadlib/trunk/annotate/head%3A/contrib/editmoin.py
@@ -123,6 +123,14 @@
     u'kiko@beetle',
     )
 
+# Some people have made commits using various names and/or email 
+# addresses, so this map will be used to merge them accordingly.
+merge_names_map = {
+    u'Jamal Fanaian <[e-mail]>': 
+        u'Jamal Fanaian <[e-mail]>',
+    u'Jamal Fanaian <jamal@jfvm1>': 
+        u'Jamal Fanaian <[e-mail]>',
+    }
 
 class ContainerRevision():
     """A wrapper for a top-level LogRevision containing child LogRevisions."""
@@ -164,8 +172,9 @@
         #
         #   -and-
         #
-        # http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/revision/\
-        # [e-mail]-20090821221206-ritpv21q8w61gbpt
+        # http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/\
+        # revision/[e-mail]-20090821221206-\
+        # ritpv21q8w61gbpt
         #
         # In our links, even when the link text is a revnum, we still
         # use a rev-id for the target.  This is both so that the URL will
@@ -247,6 +256,11 @@
                 known = True
                 break
         if not known:
+            # Use the merge names map to merge contributions from the same
+            # person using alternate names and/or emails.
+            if a in merge_names_map:
+                a = merge_names_map[a]
+
             ### There's a variant of the Singleton pattern that could be
             ### used for this, whereby instantiating an ExCon object would
             ### just get back an existing object if such has already been