Support git branches & merges.
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bileto |
Fix Released
|
Critical
|
Robert Bruce Park |
Bug Description
Bzr is dead and the train needs to support git sooner or later.
Fortunately, all the bzr knowledge is encapsulated in a single class (the Branch class), so it should be relatively straightforward to write a similar class that uses git instead of bzr, and then just add a little bit of magic to determine which to use when.
There's a few unknowns I need to investigate:
1. Has LP's git support reached parity with bzr yet? If not parity, the train needs at least the ability to pass a git MP to lp.load() and access various properties on it, such as merge.target_
2. We use 'bzr launchpad-login' as well, git probably won't have anything like that but still we'll need to teach git the bot credentials so we can push to launchpad at all.
3. Probably other things.
Related branches
- Robert Bruce Park (community): Approve
-
Diff: 770 lines (+302/-57)15 files modifiedMakefile (+1/-4)
bileto/actions.py (+2/-2)
bileto/app.py (+2/-1)
bileto/models.py (+0/-1)
bileto/worker/manager.py (+3/-1)
bileto/worker/merge.py (+70/-31)
bileto/worker/package.py (+3/-1)
bileto/worker/vcs.py (+5/-2)
files/git_attributes (+1/-0)
files/gitconfig (+9/-0)
scripts/expire.sh (+1/-1)
scripts/update.sh (+18/-1)
scripts/vcs.sh (+113/-12)
tests/test_worker_manager.py (+5/-0)
tests/test_worker_merge.py (+69/-0)
Changed in cupstream2distro: | |
assignee: | nobody → Robert Bruce Park (robru) |
importance: | Undecided → Medium |
Changed in cupstream2distro: | |
status: | New → Won't Fix |
status: | Won't Fix → Confirmed |
affects: | cupstream2distro → bileto |
Changed in bileto: | |
status: | Confirmed → In Progress |
Changed in bileto: | |
importance: | Medium → Critical |
Changed in bileto: | |
status: | In Progress → Fix Released |