launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/git-personmerge-whitelist into lp:launchpad.

Commit message:
Temporarily whitelist gitrepository.owner and gitshortcut.owner from personmerge.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1032731 in Launchpad itself: "Support for Launchpad-hosted Git repositories"
  https://bugs.launchpad.net/launchpad/+bug/1032731

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/git-personmerge-whitelist/+merge/248881

Temporarily whitelist gitrepository.owner and gitshortcut.owner from personmerge.

This needs to be rolled out to production before https://code.launchpad.net/~cjwatson/launchpad/db-git/+merge/247752 is rolled out, although the exact set of columns to whitelist depends on review of that branch.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/git-personmerge-whitelist into lp:launchpad.

=== modified file 'lib/lp/registry/personmerge.py'
--- lib/lp/registry/personmerge.py	2014-06-18 18:29:13 +0000
+++ lib/lp/registry/personmerge.py	2015-02-06 11:08:57 +0000
@@ -691,6 +691,10 @@
         ('bugsummaryjournal', 'viewed_by'),
         ('latestpersonsourcepackagereleasecache', 'creator'),
         ('latestpersonsourcepackagereleasecache', 'maintainer'),
+        # These need handling before we deploy the git code, but can be
+        # ignored for the purpose of deploying the database tables.
+        ('gitrepository', 'owner'),
+        ('gitshortcut', 'owner'),
         ]
 
     references = list(postgresql.listReferences(cur, 'person', 'id'))