1
=== modified file 'utilities/community-contributions.py'
2
--- utilities/community-contributions.py	2009-12-07 20:21:44 +0000
3
+++ utilities/community-contributions.py	2010-02-05 19:46:18 +0000
4
@@ -46,7 +46,7 @@
5
46
try:
46
try:
6
47
    from editmoin import editshortcut
47
    from editmoin import editshortcut
7
48
except:
48
except:
9
49
    sys.stderr.write("""ERROR: Unable to import from 'editmoin'.  How to solve:
49
    sys.stderr.write("""ERROR: Unable to import from 'editmoin'. How to solve:
10
50
Get editmoin.py from launchpadlib's "contrib/" directory:
50
Get editmoin.py from launchpadlib's "contrib/" directory:
11
51
51
12
52
  http://bazaar.launchpad.net/~lazr-developers/launchpadlib/trunk/annotate/head%3A/contrib/editmoin.py
52
  http://bazaar.launchpad.net/~lazr-developers/launchpadlib/trunk/annotate/head%3A/contrib/editmoin.py
13
@@ -123,6 +123,14 @@
14
123
    u'kiko@beetle',
123
    u'kiko@beetle',
15
124
    )
124
    )
16
125
125
17
126
# Some people have made commits using various names and/or email 
18
127
# addresses, so this map will be used to merge them accordingly.
19
128
merge_names_map = {
20
129
    u'Jamal Fanaian <jfanaian@gmail.com>': 
21
130
        u'Jamal Fanaian <jamal.fanaian@gmail.com>',
22
131
    u'Jamal Fanaian <jamal@jfvm1>': 
23
132
        u'Jamal Fanaian <jamal.fanaian@gmail.com>',
24
133
    }
25
126
134
26
127
class ContainerRevision():
135
class ContainerRevision():
27
128
    """A wrapper for a top-level LogRevision containing child LogRevisions."""
136
    """A wrapper for a top-level LogRevision containing child LogRevisions."""
28
@@ -164,8 +172,9 @@
29
164
        #
172
        #
30
165
        #   -and-
173
        #   -and-
31
166
        #
174
        #
34
167
        # http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/revision/\
175
        # http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel/\
35
168
        # launchpad@pqm.canonical.com-20090821221206-ritpv21q8w61gbpt
176
        # revision/launchpad@pqm.canonical.com-20090821221206-\
36
177
        # ritpv21q8w61gbpt
37
169
        #
178
        #
38
170
        # In our links, even when the link text is a revnum, we still
179
        # In our links, even when the link text is a revnum, we still
39
171
        # use a rev-id for the target.  This is both so that the URL will
180
        # use a rev-id for the target.  This is both so that the URL will
40
@@ -247,6 +256,11 @@
41
247
                known = True
256
                known = True
42
248
                break
257
                break
43
249
        if not known:
258
        if not known:
44
259
            # Use the merge names map to merge contributions from the same
45
260
            # person using alternate names and/or emails.
46
261
            if a in merge_names_map:
47
262
                a = merge_names_map[a]
48
263
49
250
            ### There's a variant of the Singleton pattern that could be
264
            ### There's a variant of the Singleton pattern that could be
50
251
            ### used for this, whereby instantiating an ExCon object would
265
            ### used for this, whereby instantiating an ExCon object would
51
252
            ### just get back an existing object if such has already been
266
            ### just get back an existing object if such has already been
Status:	Merged
Approved by:	Guilherme Salgado on 2010-02-05
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~jamalta/launchpad/contributions-merge
Merge into:	lp:launchpad
Diff against target:	51 lines (+17/-3) 1 file modified utilities/community-contributions.py (+17/-3)
To merge this branch:	bzr merge lp:~jamalta/launchpad/contributions-merge
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Guilherme Salgado (community)	code	2010-02-05	Approve on 2010-02-05
Review via email: mp+18716@code.launchpad.net