Stacked on location breaks if the stacked upon branch is renamed
Bug #377519 reported by
Tim Penhey
This bug affects 15 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Launchpad itself |
Fix Released
|
Critical
|
Tim Penhey |
Bug Description
The stacked on location is stored in two places:
- the database
- the filesystem of the branch
The database refers to the branches through the database id, however the actual filesystem has a string.
We should create a branch job that is created when a branch is renamed if it has any branches stacked on it.
Related branches
lp:~thumper/launchpad/anon-http-branch-id-access
- Graham Binns (community): Approve (code)
-
Diff: 254 lines (+139/-8)5 files modifiedlib/lp/code/interfaces/codehosting.py (+4/-0)
lib/lp/code/model/branchlookup.py (+35/-7)
lib/lp/code/model/tests/test_branchlookup.py (+44/-0)
lib/lp/codehosting/rewrite.py (+5/-1)
lib/lp/codehosting/tests/test_rewrite.py (+51/-0)
lp:~thumper/launchpad/bzr-transport-branch-id-access
- Graham Binns (community): Approve (code)
-
Diff: 213 lines (+120/-9)3 files modifiedlib/lp/code/xmlrpc/codehosting.py (+30/-3)
lib/lp/code/xmlrpc/tests/test_codehosting.py (+58/-0)
lib/lp/codehosting/inmemory.py (+32/-6)
lp:~thumper/launchpad/recognize-branch-id-stacked-location
- Graham Binns (community): Approve (code)
-
Diff: 73 lines (+28/-3)2 files modifiedlib/lp/code/model/branch.py (+16/-3)
lib/lp/code/model/tests/test_branch.py (+12/-0)
lp:~thumper/launchpad/stack-on-branch-id-alias
- Brad Crittenden (community): Approve (code)
-
Diff: 340 lines (+44/-32)9 files modifiedlib/lp/code/interfaces/codehosting.py (+6/-0)
lib/lp/code/model/tests/test_branch.py (+2/-3)
lib/lp/code/model/tests/test_branchlookup.py (+8/-5)
lib/lp/code/xmlrpc/codehosting.py (+3/-2)
lib/lp/code/xmlrpc/tests/test_codehosting.py (+12/-12)
lib/lp/codehosting/inmemory.py (+3/-1)
lib/lp/codehosting/tests/test_rewrite.py (+5/-6)
lib/lp/codehosting/vfs/tests/test_branchfs.py (+2/-1)
lib/lp/codehosting/vfs/tests/test_filesystem.py (+3/-2)
lp:~thumper/launchpad/update-existing-stacked-branches
- Brad Crittenden (community): Approve (code)
-
Diff: 91 lines (+21/-6)2 files modifiedscripts/get-stacked-on-branches.py (+5/-3)
scripts/update-stacked-on.py (+16/-3)
tags: | added: branch-stacking |
Changed in launchpad: | |
milestone: | 11.04 → 11.05 |
Changed in launchpad: | |
status: | Fix Committed → In Progress |
Changed in launchpad: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
For the record, if a branch gets into this state, anyone with write access can fix it as follows:
1. Using sftp, get the .bzr/branch/ branch. conf, amend it, and put it.
2. Using bzrlib in a python interpreter, open the branch, write-lock it, unlock it. This triggers LP to sync the changed branch.conf to the http/mirrored side of its dual branch storage.