Merge lp:~jelmer/brz/plugin-git-references into lp:brz/3.0

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/plugin-git-references
Merge into: lp:brz/3.0
Diff against target: 55 lines (+9/-9)
3 files modified
breezy/git/.testr.conf (+1/-1)
breezy/git/bzr-receive-pack (+4/-4)
breezy/git/bzr-upload-pack (+4/-4)
To merge this branch: bzr merge lp:~jelmer/brz/plugin-git-references
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+371217@code.launchpad.net

Commit message

Remove references to breezy.plugins.git.

Description of the change

Remove references to breezy.plugins.git.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/.testr.conf'
2--- breezy/git/.testr.conf 2018-03-30 14:33:57 +0000
3+++ breezy/git/.testr.conf 2019-08-12 20:25:03 +0000
4@@ -1,4 +1,4 @@
5 [DEFAULT]
6-test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../../brz} selftest ^breezy.plugins.git. Git --subunit2 $IDOPTION $LISTOPT
7+test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../brz} selftest ^breezy.git. Git --subunit2 $IDOPTION $LISTOPT
8 test_id_option=--load-list $IDFILE
9 test_list_option=--list
10
11=== modified file 'breezy/git/bzr-receive-pack'
12--- breezy/git/bzr-receive-pack 2018-03-26 22:28:24 +0000
13+++ breezy/git/bzr-receive-pack 2019-08-12 20:25:03 +0000
14@@ -1,14 +1,14 @@
15 #!/usr/bin/env python
16
17 import breezy
18-from breezy.plugin import load_plugins
19-load_plugins()
20-from breezy.plugins.git.server import BzrBackend
21+import breezy.bzr
22+import breezy.git
23+from breezy.git.server import BzrBackend
24 from dulwich.server import ReceivePackHandler, serve_command
25 import sys, os
26
27 if len(sys.argv) < 2:
28- print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
29+ print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
30 sys.exit(1)
31
32 backend = BzrBackend(breezy.transport.get_transport("/"))
33
34=== modified file 'breezy/git/bzr-upload-pack'
35--- breezy/git/bzr-upload-pack 2018-03-26 22:28:24 +0000
36+++ breezy/git/bzr-upload-pack 2019-08-12 20:25:03 +0000
37@@ -1,14 +1,14 @@
38 #!/usr/bin/env python
39
40 import breezy
41-from breezy.plugin import load_plugins
42-load_plugins ()
43-from breezy.plugins.git.server import BzrBackend
44+import breezy.bzr
45+import breezy.git
46+from breezy.git.server import BzrBackend
47 from dulwich.server import UploadPackHandler, serve_command
48 import sys, os
49
50 if len(sys.argv) < 2:
51- print "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
52+ print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
53 sys.exit(1)
54
55 backend = BzrBackend(breezy.transport.get_transport("/"))

Subscribers

People subscribed via source and target branches