lp:~cjwatson/launchpad/codehosting-breezy
- Get this branch:
- bzr branch lp:~cjwatson/launchpad/codehosting-breezy
Branch merges
- Launchpad code reviewers: Pending requested
-
Diff: 4220 lines (+708/-667)99 files modifiedMakefile (+2/-2)
brzplugins/lpserve/__init__.py (+20/-20)
brzplugins/lpserve/test_lpserve.py (+26/-26)
constraints.txt (+5/-0)
lib/launchpad_loggerhead/app.py (+3/-3)
lib/launchpad_loggerhead/wsgi.py (+5/-5)
lib/lp/app/browser/stringformatter.py (+1/-1)
lib/lp/code/browser/bazaar.py (+3/-3)
lib/lp/code/browser/sourcepackagerecipe.py (+1/-1)
lib/lp/code/bzr.py (+23/-23)
lib/lp/code/configure.zcml (+4/-4)
lib/lp/code/errors.py (+1/-1)
lib/lp/code/interfaces/branch.py (+4/-4)
lib/lp/code/interfaces/tests/test_branch.py (+10/-10)
lib/lp/code/mail/codereviewcomment.py (+10/-13)
lib/lp/code/mail/patches.py (+15/-16)
lib/lp/code/model/branch.py (+3/-3)
lib/lp/code/model/branchjob.py (+11/-11)
lib/lp/code/model/branchlookup.py (+1/-1)
lib/lp/code/model/diff.py (+5/-5)
lib/lp/code/model/directbranchcommit.py (+5/-4)
lib/lp/code/model/gitrepository.py (+1/-1)
lib/lp/code/model/revision.py (+2/-2)
lib/lp/code/model/sourcepackagerecipedata.py (+1/-1)
lib/lp/code/model/tests/test_branch.py (+6/-6)
lib/lp/code/model/tests/test_branchjob.py (+26/-25)
lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+2/-2)
lib/lp/code/model/tests/test_diff.py (+3/-3)
lib/lp/code/model/tests/test_gitref.py (+1/-1)
lib/lp/code/model/tests/test_gitrepository.py (+1/-1)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+1/-1)
lib/lp/code/scripts/tests/test_scan_branches.py (+1/-1)
lib/lp/code/scripts/tests/test_sendbranchmail.py (+5/-5)
lib/lp/code/scripts/tests/test_upgrade_branches.py (+1/-1)
lib/lp/code/stories/branches/xx-bazaar-home.txt (+15/-15)
lib/lp/code/stories/webservice/xx-branch.txt (+1/-1)
lib/lp/code/templates/bazaar-index.pt (+2/-2)
lib/lp/code/tests/helpers.py (+1/-1)
lib/lp/code/tests/test_bzr.py (+11/-10)
lib/lp/code/xmlrpc/branch.py (+1/-1)
lib/lp/code/xmlrpc/codehosting.py (+1/-1)
lib/lp/code/xmlrpc/tests/test_branch.py (+1/-1)
lib/lp/code/xmlrpc/tests/test_codehosting.py (+3/-3)
lib/lp/codehosting/__init__.py (+54/-22)
lib/lp/codehosting/bzrutils.py (+15/-15)
lib/lp/codehosting/codeimport/tests/test_worker.py (+2/-2)
lib/lp/codehosting/inmemory.py (+1/-1)
lib/lp/codehosting/puller/scheduler.py (+1/-1)
lib/lp/codehosting/puller/tests/__init__.py (+3/-3)
lib/lp/codehosting/puller/tests/test_acceptance.py (+7/-7)
lib/lp/codehosting/puller/tests/test_errors.py (+2/-2)
lib/lp/codehosting/puller/tests/test_scheduler.py (+6/-8)
lib/lp/codehosting/puller/tests/test_worker.py (+21/-21)
lib/lp/codehosting/puller/tests/test_worker_formats.py (+16/-16)
lib/lp/codehosting/puller/worker.py (+21/-16)
lib/lp/codehosting/rewrite.py (+1/-1)
lib/lp/codehosting/scanner/buglinks.py (+1/-1)
lib/lp/codehosting/scanner/bzrsync.py (+7/-7)
lib/lp/codehosting/scanner/mergedetection.py (+1/-1)
lib/lp/codehosting/scanner/tests/test_buglinks.py (+4/-4)
lib/lp/codehosting/scanner/tests/test_bzrsync.py (+8/-7)
lib/lp/codehosting/scanner/tests/test_email.py (+1/-1)
lib/lp/codehosting/scanner/tests/test_mergedetection.py (+3/-3)
lib/lp/codehosting/scripts/tests/test_upgrade_all_branches.py (+1/-1)
lib/lp/codehosting/sftp.py (+4/-4)
lib/lp/codehosting/sshserver/session.py (+20/-17)
lib/lp/codehosting/sshserver/tests/test_session.py (+16/-9)
lib/lp/codehosting/tests/helpers.py (+9/-7)
lib/lp/codehosting/tests/servers.py (+1/-1)
lib/lp/codehosting/tests/test_acceptance.py (+35/-35)
lib/lp/codehosting/tests/test_breezy.py (+5/-5)
lib/lp/codehosting/tests/test_bzrutils.py (+18/-15)
lib/lp/codehosting/tests/test_format_comparison.py (+1/-1)
lib/lp/codehosting/tests/test_lpserve.py (+6/-6)
lib/lp/codehosting/tests/test_sftp.py (+6/-6)
lib/lp/codehosting/tests/test_upgrade.py (+16/-18)
lib/lp/codehosting/upgrade.py (+9/-11)
lib/lp/codehosting/vfs/branchfs.py (+11/-13)
lib/lp/codehosting/vfs/tests/test_branchfs.py (+20/-22)
lib/lp/codehosting/vfs/tests/test_filesystem.py (+8/-8)
lib/lp/codehosting/vfs/tests/test_transport.py (+4/-4)
lib/lp/codehosting/vfs/tests/test_transport_extensions.py (+1/-1)
lib/lp/codehosting/vfs/transport.py (+29/-29)
lib/lp/scripts/runlaunchpad.py (+4/-4)
lib/lp/testing/__init__.py (+13/-11)
lib/lp/testing/factory.py (+3/-3)
lib/lp/translations/browser/productseries.py (+1/-1)
lib/lp/translations/pottery/detect_intltool.py (+1/-1)
lib/lp/translations/pottery/tests/test_detect_intltool.py (+2/-2)
lib/lp/translations/scripts/tests/test_translations_to_branch.py (+2/-2)
lib/lp/translations/scripts/translations_to_branch.py (+2/-2)
lib/lp/translations/tests/test_rosetta_branches_script.py (+3/-3)
lib/lp_sitecustomize.py (+13/-6)
scripts/mirror-branch.py (+2/-20)
scripts/update-stacked-on.py (+5/-4)
setup.py (+2/-0)
utilities/create-lp-wadl-and-apidoc.py (+3/-3)
utilities/sourcedeps.cache (+9/-9)
utilities/sourcedeps.conf (+3/-3)
Branch information
Recent revisions
- 19054. By Colin Watson
-
Port codehosting to Breezy.
Most of this is relatively mechanical: bzrlib imports become breezy imports,
some things move around a little more (mainly to breezy.bzr), bzrdir becomes
controldir in many cases, I tightened up some bytes/text handling, and there
were a couple of other minor API changes.Due to problems with subvertpy, codeimport remains on Bazaar for now. This
entails some fiddly code to allow Bazaar and Breezy to coexist in the same
codebase.DirectBranchCom
mit.commit needs a new call to
self.transform_preview. fixup_new_ roots. I think this may technically have
been needed by Bazaar too, since bzrlib.transform. _alter_ files calls it, but
it no longer seems to be possible to get away without it.We have to explicitly initialize Breezy in lib/lp/
codehosting/ __init_ _.py,
as otherwise it initializes itself with a terminal-oriented UI, causing some
unexpected output to appear in logs.We have to disable some plugins that are now built into Breezy and likely to
cause trouble if invoked, although unfortunately we have no very elegant way
to do that. cvs, darcs, email, and mtn are disabled using
BRZ_DISABLE_PLUGINS. git requires more work: we can't allow Breezy to even
import this until codeimport is also ported, since it requires a newer
version of dulwich which is incompatible with bzr-git (and that isn't
particularly straightforward to fix), so I ended up stubbing it in
sys.modules so that importing it has no effect. Fortunately Breezy
currently only imports breezy.git and relies on it to register its own
formats, so this crude strategy works.The hack in scripts/
mirror- branch. py to force bzr to use urllib is no longer
required: Breezy removed pycurl support. - 19053. By Launchpad PQM Bot
-
[testfix]
[r=cjwatson] [no-qa] Fix doctests to cope with added
Content-Security- Policy header. - 19052. By Launchpad PQM Bot
-
[r=bloodearnest
][no-qa] Set "Content- Security- Policy: frame-ancestors
'self';
" as well as "X-Frame-Options: SAMEORIGIN", for improved browser
compatibility. - 19051. By Launchpad PQM Bot
-
[r=bloodearnest
][no-qa] Remove parts of lp.code. mail.patches that are
unmodified from bzrlib. - 19049. By Launchpad PQM Bot
-
[r=wgrant][bug=1824399][incr] Make the Git XML-RPC API honour user
macaroons. - 19046. By Launchpad PQM Bot
-
[r=cjwatson][bug=1842919] Remove null characters in copyright field
of sourcepackagerelease - 19045. By Launchpad PQM Bot
-
[r=cjwatson][bug=1839229] Add a BROKEN state for mirrors and allow
them to be resubmitted
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:launchpad