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
=== modified file 'breezy/git/.testr.conf'
--- breezy/git/.testr.conf 2018-03-30 14:33:57 +0000
+++ breezy/git/.testr.conf 2019-08-12 20:25:03 +0000
@@ -1,4 +1,4 @@
1[DEFAULT]1[DEFAULT]
2test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../../brz} selftest ^breezy.plugins.git. Git --subunit2 $IDOPTION $LISTOPT2test_command=BRZ_PLUGINS_AT=git@`pwd` BRZ_PLUGIN_PATH=-site:-user ${BRZ:-../../brz} selftest ^breezy.git. Git --subunit2 $IDOPTION $LISTOPT
3test_id_option=--load-list $IDFILE3test_id_option=--load-list $IDFILE
4test_list_option=--list4test_list_option=--list
55
=== modified file 'breezy/git/bzr-receive-pack'
--- breezy/git/bzr-receive-pack 2018-03-26 22:28:24 +0000
+++ breezy/git/bzr-receive-pack 2019-08-12 20:25:03 +0000
@@ -1,14 +1,14 @@
1#!/usr/bin/env python1#!/usr/bin/env python
22
3import breezy3import breezy
4from breezy.plugin import load_plugins4import breezy.bzr
5load_plugins()5import breezy.git
6from breezy.plugins.git.server import BzrBackend6from breezy.git.server import BzrBackend
7from dulwich.server import ReceivePackHandler, serve_command7from dulwich.server import ReceivePackHandler, serve_command
8import sys, os8import sys, os
99
10if len(sys.argv) < 2:10if len(sys.argv) < 2:
11 print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])11 print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
12 sys.exit(1)12 sys.exit(1)
1313
14backend = BzrBackend(breezy.transport.get_transport("/"))14backend = BzrBackend(breezy.transport.get_transport("/"))
1515
=== modified file 'breezy/git/bzr-upload-pack'
--- breezy/git/bzr-upload-pack 2018-03-26 22:28:24 +0000
+++ breezy/git/bzr-upload-pack 2019-08-12 20:25:03 +0000
@@ -1,14 +1,14 @@
1#!/usr/bin/env python1#!/usr/bin/env python
22
3import breezy3import breezy
4from breezy.plugin import load_plugins4import breezy.bzr
5load_plugins ()5import breezy.git
6from breezy.plugins.git.server import BzrBackend6from breezy.git.server import BzrBackend
7from dulwich.server import UploadPackHandler, serve_command7from dulwich.server import UploadPackHandler, serve_command
8import sys, os8import sys, os
99
10if len(sys.argv) < 2:10if len(sys.argv) < 2:
11 print "usage: %s <git-dir>" % os.path.basename(sys.argv[0])11 print("usage: %s <git-dir>" % os.path.basename(sys.argv[0]))
12 sys.exit(1)12 sys.exit(1)
1313
14backend = BzrBackend(breezy.transport.get_transport("/"))14backend = BzrBackend(breezy.transport.get_transport("/"))

Subscribers

People subscribed via source and target branches