Launchpad itself

Support for Launchpad Git merge proposals

Bug #1445017 reported by Kit Randel
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Launchpad itself
Fix Released
High
Colin Watson

Bug Description

Add support for git merge proposals in Launchpad.

Related branches

lp:~blr/launchpad/db-patch-2209-61-3
Colin Watson (community): Approve
Diff: 14 lines (+10/-0)
1 file modified
database/schema/patch-2209-61-3.sql (+10/-0)
lp:~blr/launchpad/git-reviewer
Colin Watson (community): Approve
Diff: 266 lines (+140/-10)
5 files modified
lib/lp/code/interfaces/gitrepository.py (+24/-0)
lib/lp/code/model/gitnamespace.py (+4/-3)
lib/lp/code/model/gitrepository.py (+31/-2)
lib/lp/code/model/tests/test_gitrepository.py (+75/-0)
lib/lp/testing/factory.py (+6/-5)
lp:~cjwatson/launchpad/db-git-mp
William Grant: Approve (db)
Diff: 35 lines (+31/-0)
1 file modified
database/schema/patch-2209-61-5.sql (+31/-0)
lp:~cjwatson/launchpad/git-ref-link
William Grant: Approve (code)
Diff: 256 lines (+82/-13)
8 files modified
lib/lp/app/browser/configure.zcml (+7/-0)
lib/lp/app/browser/tales.py (+9/-0)
lib/lp/app/doc/tales.txt (+14/-1)
lib/lp/code/browser/configure.zcml (+1/-1)
lib/lp/code/interfaces/gitref.py (+4/-0)
lib/lp/code/model/gitref.py (+29/-7)
lib/lp/code/model/gitrepository.py (+11/-4)
lib/lp/code/model/tests/test_gitrepository.py (+7/-0)
lp:~cjwatson/launchpad/bmp-merge-attributes
William Grant: Approve (code)
Diff: 628 lines (+112/-104)
16 files modified
lib/lp/_schema_circular_imports.py (+2/-2)
lib/lp/code/browser/branch.py (+2/-2)
lib/lp/code/browser/branchmergeproposal.py (+12/-12)
lib/lp/code/browser/configure.zcml (+1/-1)
lib/lp/code/doc/branchmergeproposal.txt (+1/-1)
lib/lp/code/interfaces/branch.py (+14/-9)
lib/lp/code/interfaces/branchmergeproposal.py (+8/-8)
lib/lp/code/model/branch.py (+16/-16)
lib/lp/code/model/branchmergeproposal.py (+38/-34)
lib/lp/code/model/tests/test_branchmergeproposal.py (+2/-2)
lib/lp/code/subscribers/karma.py (+1/-1)
lib/lp/code/templates/branchmergeproposal-link-summary.pt (+2/-2)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+3/-3)
lib/lp/code/tests/helpers.py (+1/-1)
lib/lp/security.py (+6/-7)
lib/lp/testing/factory.py (+3/-3)
lp:~cjwatson/launchpad/git-mp-basic-model
William Grant: Approve (code)
Diff: 718 lines (+382/-30)
7 files modified
lib/lp/code/configure.zcml (+5/-0)
lib/lp/code/interfaces/branchmergeproposal.py (+76/-6)
lib/lp/code/interfaces/gitref.py (+47/-0)
lib/lp/code/model/branchmergeproposal.py (+135/-18)
lib/lp/code/model/gitref.py (+81/-0)
lib/lp/code/stories/webservice/xx-branchmergeproposal.txt (+14/-0)
lib/lp/security.py (+24/-6)
lp:~cjwatson/launchpad/git-mp-create
William Grant: Approve (code)
Diff: 711 lines (+413/-24)
14 files modified
lib/lp/_schema_circular_imports.py (+5/-0)
lib/lp/code/browser/configure.zcml (+3/-0)
lib/lp/code/browser/gitref.py (+24/-1)
lib/lp/code/interfaces/gitnamespace.py (+11/-0)
lib/lp/code/interfaces/gitref.py (+75/-2)
lib/lp/code/interfaces/gitrepository.py (+3/-0)
lib/lp/code/model/gitnamespace.py (+68/-1)
lib/lp/code/model/gitref.py (+116/-2)
lib/lp/code/model/gitrepository.py (+4/-0)
lib/lp/code/subscribers/karma.py (+14/-5)
lib/lp/code/templates/branchmergeproposal-index.pt (+12/-10)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+5/-1)
lib/lp/security.py (+9/-0)
lib/lp/testing/factory.py (+64/-2)
lp:~cjwatson/launchpad/git-mp-collection
William Grant: Approve (code)
Diff: 913 lines (+606/-36)
5 files modified
lib/lp/code/interfaces/gitcollection.py (+45/-0)
lib/lp/code/model/branchmergeproposal.py (+17/-5)
lib/lp/code/model/gitcollection.py (+267/-26)
lib/lp/code/model/gitrepository.py (+4/-4)
lib/lp/code/model/tests/test_gitcollection.py (+273/-1)
lp:~cjwatson/launchpad/git-mp-ref-proposals
William Grant: Approve (code)
Diff: 133 lines (+49/-2)
4 files modified
lib/lp/_schema_circular_imports.py (+2/-0)
lib/lp/code/interfaces/gitref.py (+21/-1)
lib/lp/code/model/gitref.py (+17/-0)
lib/lp/code/model/tests/test_gitref.py (+9/-1)
lp:~cjwatson/launchpad/git-mp-basic-browser
William Grant: Approve (code)
Diff: 1026 lines (+562/-85)
13 files modified
lib/lp/code/browser/branchmergeproposal.py (+95/-27)
lib/lp/code/browser/configure.zcml (+3/-0)
lib/lp/code/browser/gitref.py (+61/-0)
lib/lp/code/browser/tests/test_branchmergeproposal.py (+208/-54)
lib/lp/code/errors.py (+9/-2)
lib/lp/code/interfaces/gitrepository.py (+34/-0)
lib/lp/code/model/gitref.py (+3/-0)
lib/lp/code/model/gitrepository.py (+22/-0)
lib/lp/code/model/tests/test_gitrepository.py (+74/-0)
lib/lp/code/templates/branchmergeproposal-resubmit.pt (+1/-1)
lib/lp/code/templates/gitref-index.pt (+7/-0)
lib/lp/code/templates/gitref-pending-merges.pt (+43/-0)
lib/lp/testing/factory.py (+2/-1)
lp:~cjwatson/launchpad/git-mp-register
William Grant: Approve (code)
Diff: 1162 lines (+739/-139)
7 files modified
lib/lp/app/widgets/suggestion.py (+84/-8)
lib/lp/app/widgets/tests/test_suggestion.py (+97/-8)
lib/lp/code/browser/configure.zcml (+9/-0)
lib/lp/code/browser/gitref.py (+218/-0)
lib/lp/code/browser/tests/test_branchmergeproposal.py (+245/-123)
lib/lp/code/templates/gitref-pending-merges.pt (+5/-0)
lib/lp/code/templates/gitref-register-merge.pt (+81/-0)
lp:~cjwatson/launchpad/git-mp-diffs
William Grant: Approve (code)
Diff: 746 lines (+314/-78)
8 files modified
database/schema/security.cfg (+3/-1)
lib/lp/app/browser/stringformatter.py (+4/-2)
lib/lp/app/browser/tests/test_stringformatter.py (+36/-2)
lib/lp/code/githosting.py (+32/-0)
lib/lp/code/model/branchmergeproposaljob.py (+36/-33)
lib/lp/code/model/diff.py (+88/-37)
lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+20/-1)
lib/lp/code/model/tests/test_diff.py (+95/-2)
Kit Randel (blr)
tags: added: branches lp-code
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

Fixed in db-stable r12982 <http://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-stable/revision/12982>.

Changed in launchpad:
assignee: nobody → Bayard 'kit' Randel (blr)
tags: added: qa-needstesting
Changed in launchpad:
status: New → Fix Committed
Kit Randel (blr)
tags: added: qa-ok
removed: qa-needstesting
William Grant (wgrant)
Changed in launchpad:
status: Fix Committed → In Progress
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17432 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17432) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17443 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17443) is part of this bug's fix.

Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r12992 in db-stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-stable/revision/12992) is part of this bug's fix.

Revision history for this message
Colin Watson (cjwatson) wrote :

2015-04-22 01:10:38,996 INFO 2209-61-5 applied just now in 1.6 seconds

And the two recent code changes seem to be behaving fine too.

tags: added: qa-ok
removed: qa-needstesting
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17447 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17447) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Colin Watson (cjwatson)
Changed in launchpad:
assignee: Bayard 'kit' Randel (blr) → Colin Watson (cjwatson)
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17450 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17450) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17452 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17452) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17455 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17455) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17456 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17456) is part of this bug's fix.

Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17463 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17463) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

r17470 in stable (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17470) is part of this bug's fix.

tags: added: qa-needstesting
removed: qa-ok
Changed in launchpad:
status: In Progress → Fix Committed
Revision history for this message
Launchpad QA Bot (lpqabot) wrote :

Fixed in stable r17471 <http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/17471>.

Colin Watson (cjwatson)
tags: added: qa-ok
removed: qa-needstesting
Colin Watson (cjwatson)
Changed in launchpad:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.