Merge lp:~jelmer/brz/git-graduate into lp:brz

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/git-graduate
Merge into: lp:brz
Diff against target: 1544 lines (+223/-201)
53 files modified
breezy/builtins.py (+1/-0)
breezy/git/__init__.py (+20/-20)
breezy/git/annotate.py (+3/-3)
breezy/git/branch.py (+5/-6)
breezy/git/cache.py (+7/-7)
breezy/git/commands.py (+21/-21)
breezy/git/commit.py (+4/-4)
breezy/git/config.py (+1/-1)
breezy/git/dir.py (+8/-8)
breezy/git/directory.py (+1/-1)
breezy/git/errors.py (+1/-1)
breezy/git/fetch.py (+10/-10)
breezy/git/filegraph.py (+1/-1)
breezy/git/git_remote_helper.py (+6/-6)
breezy/git/interrepo.py (+6/-6)
breezy/git/mapping.py (+7/-7)
breezy/git/object_store.py (+5/-5)
breezy/git/push.py (+1/-1)
breezy/git/refs.py (+1/-1)
breezy/git/remote.py (+7/-7)
breezy/git/repository.py (+5/-5)
breezy/git/revspec.py (+4/-4)
breezy/git/roundtrip.py (+1/-1)
breezy/git/send.py (+3/-3)
breezy/git/server.py (+2/-2)
breezy/git/tests/__init__.py (+2/-2)
breezy/git/tests/test_blackbox.py (+3/-3)
breezy/git/tests/test_branch.py (+4/-4)
breezy/git/tests/test_cache.py (+5/-5)
breezy/git/tests/test_dir.py (+2/-2)
breezy/git/tests/test_fetch.py (+7/-7)
breezy/git/tests/test_git_remote_helper.py (+1/-1)
breezy/git/tests/test_mapping.py (+1/-1)
breezy/git/tests/test_memorytree.py (+2/-2)
breezy/git/tests/test_object_store.py (+5/-5)
breezy/git/tests/test_pristine_tar.py (+2/-2)
breezy/git/tests/test_push.py (+3/-3)
breezy/git/tests/test_refs.py (+1/-1)
breezy/git/tests/test_remote.py (+4/-4)
breezy/git/tests/test_repository.py (+2/-2)
breezy/git/tests/test_revspec.py (+1/-1)
breezy/git/tests/test_roundtrip.py (+1/-1)
breezy/git/tests/test_server.py (+2/-2)
breezy/git/tests/test_transportgit.py (+1/-1)
breezy/git/tests/test_unpeel_map.py (+1/-1)
breezy/git/tests/test_urls.py (+1/-1)
breezy/git/tests/test_workingtree.py (+3/-3)
breezy/git/transportgit.py (+4/-4)
breezy/git/tree.py (+3/-3)
breezy/git/unpeel_map.py (+1/-1)
breezy/git/workingtree.py (+4/-4)
breezy/tests/__init__.py (+22/-0)
setup.py (+4/-4)
To merge this branch: bzr merge lp:~jelmer/brz/git-graduate
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+348051@code.launchpad.net

Commit message

Move git support to breezy.git.

Description of the change

Graduate the git support to breezy.git.

An open question here is whether to put tests in breezy.git.tests or breezy.tests.git.

I kind of like breezy.git.tests, since it keeps the tests close to what they're testing.

One of the arguments for keeping everything under breezy.tests is that it makes it easier to not install the tests - such as the python-breezy / python-breezy.tests split at the moment. Of course, we could just exclude more directories with tests.

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

Thanks for all the work getting the last git parts sorted.

On test location, I have somewhat mixed feelings. The current single top level tests package does rather make a giant pile, but I'm also finding dayjob's javascript project where each folder has a __tests__ subfolder containing X.test.js files inside that somewhat tiresome to work with.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/389/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/390/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/builtins.py'
2--- breezy/builtins.py 2018-08-01 02:19:55 +0000
3+++ breezy/builtins.py 2018-08-08 02:35:32 +0000
4@@ -23,6 +23,7 @@
5 import sys
6
7 import breezy.bzr
8+import breezy.git
9
10 from . import lazy_import
11 lazy_import.lazy_import(globals(), """
12
13=== renamed directory 'breezy/plugins/git' => 'breezy/git'
14=== modified file 'breezy/git/__init__.py'
15--- breezy/plugins/git/__init__.py 2018-07-02 21:44:06 +0000
16+++ breezy/git/__init__.py 2018-08-08 02:35:32 +0000
17@@ -31,26 +31,26 @@
18
19 from breezy.i18n import gettext
20
21-from ... import (
22+from .. import (
23 __version__ as breezy_version,
24 errors as bzr_errors,
25 trace,
26 version_info,
27 )
28
29-from ...controldir import (
30+from ..controldir import (
31 ControlDirFormat,
32 Prober,
33 format_registry,
34 network_format_registry as controldir_network_format_registry,
35 )
36
37-from ...transport import (
38+from ..transport import (
39 register_lazy_transport,
40 register_transport_proto,
41 transport_server_registry,
42 )
43-from ...commands import (
44+from ..commands import (
45 plugin_cmds,
46 )
47
48@@ -93,7 +93,7 @@
49 experimental=False,
50 )
51
52-from ...revisionspec import (RevisionSpec_dwim, revspec_registry)
53+from ..revisionspec import (RevisionSpec_dwim, revspec_registry)
54 revspec_registry.register_lazy("git:", __name__ + ".revspec",
55 "RevisionSpec_git")
56 RevisionSpec_dwim.append_possible_lazy_revspec(
57@@ -111,7 +111,7 @@
58 external_url.startswith("https:")):
59 # Already handled by RemoteGitProber
60 raise bzr_errors.NotBranchError(path=transport.base)
61- from ... import urlutils
62+ from .. import urlutils
63 if urlutils.split(transport.base)[1] == ".git":
64 raise bzr_errors.NotBranchError(path=transport.base)
65 if not transport.has_any(['objects', '.git/objects', '.git']):
66@@ -144,10 +144,10 @@
67 class RemoteGitProber(Prober):
68
69 def probe_http_transport(self, transport):
70- from ... import urlutils
71+ from .. import urlutils
72 base_url, _ = urlutils.split_segment_parameters(transport.external_url())
73 url = urlutils.join(base_url, "info/refs") + "?service=git-upload-pack"
74- from ...transport.http import Request
75+ from ..transport.http import Request
76 headers = {"Content-Type": "application/x-git-upload-pack-request"}
77 req = Request('GET', url, accepted_errors=[200, 403, 404, 405],
78 headers=headers)
79@@ -254,7 +254,7 @@
80 else:
81 stanza.add("git-commit", git_commit)
82
83-from ...hooks import install_lazy_named_hook
84+from ..hooks import install_lazy_named_hook
85 install_lazy_named_hook("breezy.version_info_formats.format_rio",
86 "RioVersionInfoBuilder.hooks", "revision", update_stanza,
87 "git commits")
88@@ -274,7 +274,7 @@
89 'serve_git_upload_pack',
90 help='Git Smart server upload pack command. (inetd mode only)')
91
92-from ...repository import (
93+from ..repository import (
94 format_registry as repository_format_registry,
95 network_format_registry as repository_network_format_registry,
96 )
97@@ -286,14 +286,14 @@
98 register_extra_lazy_repository_format(__name__ + '.repository',
99 'GitRepositoryFormat')
100
101-from ...branch import (
102+from ..branch import (
103 network_format_registry as branch_network_format_registry,
104 )
105 branch_network_format_registry.register_lazy(b'git',
106 __name__ + '.branch', 'LocalGitBranchFormat')
107
108
109-from ...branch import (
110+from ..branch import (
111 format_registry as branch_format_registry,
112 )
113 branch_format_registry.register_extra_lazy(
114@@ -306,7 +306,7 @@
115 )
116
117
118-from ...workingtree import (
119+from ..workingtree import (
120 format_registry as workingtree_format_registry,
121 )
122 workingtree_format_registry.register_extra_lazy(
123@@ -319,19 +319,19 @@
124
125
126 try:
127- from ...registry import register_lazy
128+ from ..registry import register_lazy
129 except ImportError:
130- from ...diff import format_registry as diff_format_registry
131+ from ..diff import format_registry as diff_format_registry
132 diff_format_registry.register_lazy('git', __name__ + '.send',
133 'GitDiffTree', 'Git am-style diff format')
134
135- from ...send import (
136+ from ..send import (
137 format_registry as send_format_registry,
138 )
139 send_format_registry.register_lazy('git', __name__ + '.send',
140 'send_git', 'Git am-style diff format')
141
142- from ...directory_service import directories
143+ from ..directory_service import directories
144 directories.register_lazy('github:', __name__ + '.directory',
145 'GitHubDirectory',
146 'GitHub directory.')
147@@ -339,13 +339,13 @@
148 'GitHubDirectory',
149 'GitHub directory.')
150
151- from ...help_topics import (
152+ from ..help_topics import (
153 topic_registry,
154 )
155 topic_registry.register_lazy('git', __name__ + '.help', 'help_git',
156 'Using Bazaar with Git')
157
158- from ...foreign import (
159+ from ..foreign import (
160 foreign_vcs_registry,
161 )
162 foreign_vcs_registry.register_lazy("git",
163@@ -428,7 +428,7 @@
164 loggerhead_git_hook, "git support")
165
166
167-from ...config import (
168+from ..config import (
169 option_registry,
170 Option,
171 bool_from_store,
172
173=== modified file 'breezy/git/annotate.py'
174--- breezy/plugins/git/annotate.py 2018-07-23 22:25:11 +0000
175+++ breezy/git/annotate.py 2018-08-08 02:35:32 +0000
176@@ -25,9 +25,9 @@
177 tree_lookup_path,
178 )
179
180-from ...errors import UnavailableRepresentation
181-from ...graph import Graph
182-from ...revision import (
183+from ..errors import UnavailableRepresentation
184+from ..graph import Graph
185+from ..revision import (
186 NULL_REVISION,
187 )
188
189
190=== modified file 'breezy/git/branch.py'
191--- breezy/plugins/git/branch.py 2018-07-22 17:06:14 +0000
192+++ breezy/git/branch.py 2018-08-08 02:35:32 +0000
193@@ -28,7 +28,7 @@
194 )
195 from dulwich.repo import check_ref_format
196
197-from ... import (
198+from .. import (
199 branch,
200 config,
201 controldir,
202@@ -41,14 +41,15 @@
203 transport,
204 urlutils,
205 )
206-from ...revision import (
207+from ..foreign import ForeignBranch
208+from ..revision import (
209 NULL_REVISION,
210 )
211-from ...sixish import (
212+from ..sixish import (
213 text_type,
214 viewitems,
215 )
216-from ...trace import (
217+from ..trace import (
218 is_quiet,
219 mutter,
220 warning,
221@@ -78,8 +79,6 @@
222 )
223 from .urls import git_url_to_bzr_url
224
225-from ...foreign import ForeignBranch
226-from ...sixish import viewitems
227
228
229 class GitPullResult(branch.PullResult):
230
231=== modified file 'breezy/git/cache.py'
232--- breezy/plugins/git/cache.py 2018-07-03 02:05:44 +0000
233+++ breezy/git/cache.py 2018-08-08 02:35:32 +0000
234@@ -29,23 +29,23 @@
235 ShaFile,
236 )
237
238-from ... import (
239+from .. import (
240 errors as bzr_errors,
241 osutils,
242 registry,
243 trace,
244 )
245-from ...bzr import (
246+from ..bzr import (
247 btree_index as _mod_btree_index,
248 index as _mod_index,
249 versionedfile,
250 )
251-from ...sixish import (
252+from ..sixish import (
253 viewitems,
254 viewkeys,
255 viewvalues,
256 )
257-from ...transport import (
258+from ..transport import (
259 get_transport,
260 )
261
262@@ -54,7 +54,7 @@
263 try:
264 from xdg.BaseDirectory import xdg_cache_home
265 except ImportError:
266- from ...config import config_dir
267+ from ..config import config_dir
268 ret = os.path.join(config_dir(), "git")
269 else:
270 ret = os.path.join(xdg_cache_home, "breezy", "git")
271@@ -224,7 +224,7 @@
272 :param repository: Repository to open the cache for
273 :return: A `BzrGitCache`
274 """
275- from ...transport.local import LocalTransport
276+ from ..transport.local import LocalTransport
277 repo_transport = getattr(repository, "_transport", None)
278 if (repo_transport is not None and
279 isinstance(repo_transport, LocalTransport)):
280@@ -829,7 +829,7 @@
281 except bzr_errors.FileExists:
282 pass
283 return cls(transport.clone('git'))
284- from ...transport import get_transport
285+ from ..transport import get_transport
286 return cls(get_transport(get_cache_dir()))
287
288 def __repr__(self):
289
290=== modified file 'breezy/git/commands.py'
291--- breezy/plugins/git/commands.py 2018-07-22 17:06:14 +0000
292+++ breezy/git/commands.py 2018-08-08 02:35:32 +0000
293@@ -24,14 +24,14 @@
294 from __future__ import absolute_import
295
296 import breezy.bzr.bzrdir
297-from ...commands import (
298+from ..commands import (
299 Command,
300 display_command,
301 )
302-from ...option import (
303+from ..option import (
304 Option,
305 )
306-from ...sixish import (
307+from ..sixish import (
308 text_type,
309 viewitems,
310 )
311@@ -49,15 +49,15 @@
312 ]
313
314 def _get_colocated_branch(self, target_controldir, name):
315- from ...errors import NotBranchError
316+ from ..errors import NotBranchError
317 try:
318 return target_controldir.open_branch(name=name)
319 except NotBranchError:
320 return target_controldir.create_branch(name=name)
321
322 def _get_nested_branch(self, dest_transport, dest_format, name):
323- from ...controldir import ControlDir
324- from ...errors import NotBranchError
325+ from ..controldir import ControlDir
326+ from ..errors import NotBranchError
327 head_transport = dest_transport.clone(name)
328 try:
329 head_controldir = ControlDir.open_from_transport(head_transport)
330@@ -72,26 +72,26 @@
331 def run(self, src_location, dest_location=None, colocated=False):
332 import os
333 import urllib
334- from ... import (
335+ from .. import (
336 controldir,
337 trace,
338 ui,
339 urlutils,
340 )
341- from ...controldir import (
342+ from ..controldir import (
343 ControlDir,
344 )
345- from ...errors import (
346+ from ..errors import (
347 BzrCommandError,
348 NoRepositoryPresent,
349 NotBranchError,
350 )
351 from . import gettext
352- from ...repository import (
353+ from ..repository import (
354 InterRepository,
355 Repository,
356 )
357- from ...transport import get_transport
358+ from ..transport import get_transport
359 from .branch import (
360 LocalGitBranch,
361 )
362@@ -179,10 +179,10 @@
363
364 @display_command
365 def run(self, sha1=None, directory=".", pretty=False):
366- from ...errors import (
367+ from ..errors import (
368 BzrCommandError,
369 )
370- from ...controldir import (
371+ from ..controldir import (
372 ControlDir,
373 )
374 from .object_store import (
375@@ -219,7 +219,7 @@
376
377 @display_command
378 def run(self, location="."):
379- from ...controldir import (
380+ from ..controldir import (
381 ControlDir,
382 )
383 from .refs import (
384@@ -259,7 +259,7 @@
385 :param signoff: Add Signed-Off-By flag.
386 """
387 from . import gettext
388- from ...errors import BzrCommandError
389+ from ..errors import BzrCommandError
390 from dulwich.patch import git_am_patch_split
391 import subprocess
392 (c, diff, version) = git_am_patch_split(f)
393@@ -278,8 +278,8 @@
394 wt.commit(authors=[c.author], message=message)
395
396 def run(self, patches_list=None, signoff=False, force=False):
397- from ...errors import UncommittedChanges
398- from ...workingtree import WorkingTree
399+ from ..errors import UncommittedChanges
400+ from ..workingtree import WorkingTree
401 if patches_list is None:
402 patches_list = []
403
404@@ -301,13 +301,13 @@
405 takes_args = ['target', 'package']
406
407 def run(self, target, package, directory='.'):
408- from ...branch import Branch
409- from ...errors import (
410+ from ..branch import Branch
411+ from ..errors import (
412 BzrCommandError,
413 NoSuchRevision,
414 )
415- from ...trace import warning
416- from ...repository import Repository
417+ from ..trace import warning
418+ from ..repository import Repository
419 from .object_store import get_object_store
420 from .pristine_tar import (
421 revision_pristine_tar_data,
422
423=== modified file 'breezy/git/commit.py'
424--- breezy/plugins/git/commit.py 2018-07-01 21:13:21 +0000
425+++ breezy/git/commit.py 2018-08-08 02:35:32 +0000
426@@ -25,21 +25,21 @@
427 import os
428 import stat
429
430-from ... import (
431+from .. import (
432 config as _mod_config,
433 gpg,
434 osutils,
435 revision as _mod_revision,
436 )
437-from ...errors import (
438+from ..errors import (
439 BzrError,
440 RootMissing,
441 UnsupportedOperation,
442 )
443-from ...repository import (
444+from ..repository import (
445 CommitBuilder,
446 )
447-from ...sixish import (
448+from ..sixish import (
449 viewitems,
450 )
451
452
453=== modified file 'breezy/git/config.py'
454--- breezy/plugins/git/config.py 2018-03-26 22:28:24 +0000
455+++ breezy/git/config.py 2018-08-08 02:35:32 +0000
456@@ -18,7 +18,7 @@
457
458 from __future__ import absolute_import
459
460-from ... import (
461+from .. import (
462 config,
463 )
464
465
466=== modified file 'breezy/git/dir.py'
467--- breezy/plugins/git/dir.py 2018-07-23 22:47:40 +0000
468+++ breezy/git/dir.py 2018-08-08 02:35:32 +0000
469@@ -19,7 +19,7 @@
470
471 from __future__ import absolute_import
472
473-from ... import (
474+from .. import (
475 branch as _mod_branch,
476 errors as bzr_errors,
477 trace,
478@@ -28,16 +28,16 @@
479 revision as _mod_revision,
480 urlutils,
481 )
482-from ...sixish import (
483+from ..sixish import (
484 PY3,
485 viewitems,
486 )
487-from ...transport import (
488+from ..transport import (
489 do_catching_redirections,
490 get_transport_from_path,
491 )
492
493-from ...controldir import (
494+from ..controldir import (
495 BranchReferenceLoop,
496 ControlDir,
497 ControlDirFormat,
498@@ -155,9 +155,9 @@
499 recurse='down', possible_transports=None,
500 accelerator_tree=None, hardlink=False, stacked=False,
501 source_branch=None, create_tree_if_local=True):
502- from ...repository import InterRepository
503- from ...transport.local import LocalTransport
504- from ...transport import get_transport
505+ from ..repository import InterRepository
506+ from ..transport.local import LocalTransport
507+ from ..transport import get_transport
508 target_transport = get_transport(url, possible_transports)
509 target_transport.ensure_base()
510 cloning_format = self.cloning_metadir()
511@@ -199,7 +199,7 @@
512 force_new_repo=False, preserve_stacking=False, stacked_on=None,
513 create_prefix=False, use_existing_dir=True, no_tree=False):
514 """See ControlDir.clone_on_transport."""
515- from ...repository import InterRepository
516+ from ..repository import InterRepository
517 from .mapping import default_mapping
518 if stacked_on is not None:
519 raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)
520
521=== modified file 'breezy/git/directory.py'
522--- breezy/plugins/git/directory.py 2018-03-26 22:28:24 +0000
523+++ breezy/git/directory.py 2018-08-08 02:35:32 +0000
524@@ -19,7 +19,7 @@
525
526 from __future__ import absolute_import
527
528-from ... import transport
529+from .. import transport
530
531 transport.register_urlparse_netloc_protocol('github')
532
533
534=== modified file 'breezy/git/errors.py'
535--- breezy/plugins/git/errors.py 2018-03-26 22:28:24 +0000
536+++ breezy/git/errors.py 2018-08-08 02:35:32 +0000
537@@ -22,7 +22,7 @@
538
539 from dulwich import errors as git_errors
540
541-from ... import errors as bzr_errors
542+from .. import errors as bzr_errors
543
544
545 class BzrGitError(bzr_errors.BzrError):
546
547=== modified file 'breezy/git/fetch.py'
548--- breezy/plugins/git/fetch.py 2018-07-13 00:16:39 +0000
549+++ breezy/git/fetch.py 2018-08-08 02:35:32 +0000
550@@ -33,37 +33,37 @@
551 import posixpath
552 import stat
553
554-from ... import (
555+from .. import (
556 debug,
557 errors,
558 osutils,
559 trace,
560 ui,
561 )
562-from ...errors import (
563+from ..errors import (
564 BzrError,
565 )
566-from ...bzr.inventory import (
567+from ..bzr.inventory import (
568 InventoryDirectory,
569 InventoryFile,
570 InventoryLink,
571 TreeReference,
572 )
573-from ...repository import (
574+from ..repository import (
575 InterRepository,
576 )
577-from ...revision import (
578+from ..revision import (
579 NULL_REVISION,
580 )
581-from ...sixish import text_type
582-from ...bzr.inventorytree import InventoryRevisionTree
583-from ...testament import (
584+from ..bzr.inventorytree import InventoryRevisionTree
585+from ..sixish import text_type
586+from ..testament import (
587 StrictTestament3,
588 )
589-from ...tsort import (
590+from ..tsort import (
591 topo_sort,
592 )
593-from ...bzr.versionedfile import (
594+from ..bzr.versionedfile import (
595 ChunkedContentFactory,
596 )
597
598
599=== modified file 'breezy/git/filegraph.py'
600--- breezy/plugins/git/filegraph.py 2018-07-23 22:47:40 +0000
601+++ breezy/git/filegraph.py 2018-08-08 02:35:32 +0000
602@@ -28,7 +28,7 @@
603 tree_lookup_path,
604 )
605
606-from ...revision import (
607+from ..revision import (
608 NULL_REVISION,
609 )
610
611
612=== modified file 'breezy/git/git_remote_helper.py'
613--- breezy/plugins/git/git_remote_helper.py 2018-07-24 20:32:24 +0000
614+++ breezy/git/git_remote_helper.py 2018-08-08 02:35:32 +0000
615@@ -26,11 +26,11 @@
616
617 import os
618
619-from ...controldir import ControlDir
620-from ...errors import NotBranchError, NoRepositoryPresent
621-from ...repository import InterRepository
622-from ...sixish import viewitems
623-from ...transport import get_transport_from_path
624+from ..controldir import ControlDir
625+from ..errors import NotBranchError, NoRepositoryPresent
626+from ..repository import InterRepository
627+from ..sixish import viewitems
628+from ..transport import get_transport_from_path
629
630 from . import (
631 LocalGitProber,
632@@ -51,7 +51,7 @@
633 GitRepository,
634 )
635
636-from ..fastimport import exporter as fastexporter
637+from ..plugins.fastimport import exporter as fastexporter
638
639 try:
640 import fastimport
641
642=== modified file 'breezy/git/interrepo.py'
643--- breezy/plugins/git/interrepo.py 2018-07-23 23:25:42 +0000
644+++ breezy/git/interrepo.py 2018-08-08 02:35:32 +0000
645@@ -34,7 +34,7 @@
646 from dulwich.refs import SYMREF
647 from dulwich.walk import Walker
648
649-from ...errors import (
650+from ..errors import (
651 DivergedBranches,
652 FetchLimitUnsupported,
653 InvalidRevisionId,
654@@ -42,21 +42,21 @@
655 NoRoundtrippingSupport,
656 NoSuchRevision,
657 )
658-from ...repository import (
659+from ..repository import (
660 InterRepository,
661 )
662-from ...revision import (
663+from ..revision import (
664 NULL_REVISION,
665 )
666-from ...sixish import (
667+from ..sixish import (
668 viewitems,
669+ viewvalues,
670 )
671-from ... import (
672+from .. import (
673 config,
674 trace,
675 ui,
676 )
677-from ...sixish import viewvalues
678
679 from .errors import (
680 NoPushSupport,
681
682=== modified file 'breezy/git/mapping.py'
683--- breezy/plugins/git/mapping.py 2018-07-23 22:25:11 +0000
684+++ breezy/git/mapping.py 2018-08-08 02:35:32 +0000
685@@ -23,25 +23,25 @@
686 import base64
687 import stat
688
689-from ... import (
690+from .. import (
691 bencode,
692 errors,
693 foreign,
694 trace,
695 urlutils,
696 )
697-from ...bzr.inventory import (
698+from ..bzr.inventory import (
699 ROOT_ID,
700 )
701-from ...foreign import (
702+from ..foreign import (
703 ForeignVcs,
704 VcsMappingRegistry,
705 ForeignRevision,
706 )
707-from ...revision import (
708+from ..revision import (
709 NULL_REVISION,
710 )
711-from ...sixish import (
712+from ..sixish import (
713 PY3,
714 text_type,
715 viewitems,
716@@ -517,10 +517,10 @@
717
718
719 mapping_registry = GitMappingRegistry()
720-mapping_registry.register_lazy(b'git-v1', "breezy.plugins.git.mapping",
721+mapping_registry.register_lazy(b'git-v1', __name__,
722 "BzrGitMappingv1")
723 mapping_registry.register_lazy(b'git-experimental',
724- "breezy.plugins.git.mapping", "BzrGitMappingExperimental")
725+ __name__, "BzrGitMappingExperimental")
726 # Uncomment the next line to enable the experimental bzr-git mappings.
727 # This will make sure all bzr metadata is pushed into git, allowing for
728 # full roundtripping later.
729
730=== modified file 'breezy/git/object_store.py'
731--- breezy/plugins/git/object_store.py 2018-07-01 21:13:21 +0000
732+++ breezy/git/object_store.py 2018-08-08 02:35:32 +0000
733@@ -35,7 +35,7 @@
734 Pack,
735 )
736
737-from ... import (
738+from .. import (
739 errors,
740 lru_cache,
741 trace,
742@@ -43,12 +43,12 @@
743 ui,
744 urlutils,
745 )
746-from ...lock import LogicalLockResult
747-from ...revision import (
748+from ..lock import LogicalLockResult
749+from ..revision import (
750 NULL_REVISION,
751 )
752-from ...sixish import viewitems
753-from ...testament import(
754+from ..sixish import viewitems
755+from ..testament import(
756 StrictTestament3,
757 )
758
759
760=== modified file 'breezy/git/push.py'
761--- breezy/plugins/git/push.py 2018-07-03 00:15:59 +0000
762+++ breezy/git/push.py 2018-08-08 02:35:32 +0000
763@@ -18,7 +18,7 @@
764
765 from __future__ import absolute_import
766
767-from ...push import (
768+from ..push import (
769 PushResult,
770 )
771 from .errors import (
772
773=== modified file 'breezy/git/refs.py'
774--- breezy/plugins/git/refs.py 2018-07-13 00:25:33 +0000
775+++ breezy/git/refs.py 2018-08-08 02:35:32 +0000
776@@ -27,7 +27,7 @@
777 RefsContainer,
778 )
779
780-from ... import (
781+from .. import (
782 errors,
783 osutils,
784 revision as _mod_revision,
785
786=== modified file 'breezy/git/remote.py'
787--- breezy/plugins/git/remote.py 2018-07-01 21:13:21 +0000
788+++ breezy/git/remote.py 2018-08-08 02:35:32 +0000
789@@ -21,7 +21,7 @@
790 from io import BytesIO
791 import re
792
793-from ... import (
794+from .. import (
795 config,
796 debug,
797 errors,
798@@ -30,10 +30,10 @@
799 ui,
800 urlutils,
801 )
802-from ...push import (
803+from ..push import (
804 PushResult,
805 )
806-from ...errors import (
807+from ..errors import (
808 AlreadyBranchError,
809 BzrError,
810 DivergedBranches,
811@@ -47,9 +47,9 @@
812 NoWorkingTree,
813 UninitializableFormat,
814 )
815-from ...revisiontree import RevisionTree
816-from ...sixish import text_type
817-from ...transport import (
818+from ..revisiontree import RevisionTree
819+from ..sixish import text_type
820+from ..transport import (
821 Transport,
822 register_urlparse_netloc_protocol,
823 )
824@@ -267,7 +267,7 @@
825 class DulwichSSHVendor(dulwich.client.SSHVendor):
826
827 def __init__(self):
828- from ...transport import ssh
829+ from ..transport import ssh
830 self.bzr_ssh_vendor = ssh._get_ssh_vendor()
831
832 def run_command(self, host, command, username=None, port=None):
833
834=== modified file 'breezy/git/repository.py'
835--- breezy/plugins/git/repository.py 2018-07-25 18:15:53 +0000
836+++ breezy/git/repository.py 2018-08-08 02:35:32 +0000
837@@ -19,7 +19,7 @@
838
839 from __future__ import absolute_import
840
841-from ... import (
842+from .. import (
843 check,
844 errors,
845 graph as _mod_graph,
846@@ -31,11 +31,11 @@
847 ui,
848 version_info as breezy_version,
849 )
850-from ...decorators import only_raises
851-from ...foreign import (
852+from ..decorators import only_raises
853+from ..foreign import (
854 ForeignRepository,
855 )
856-from ...sixish import (
857+from ..sixish import (
858 viewitems,
859 viewvalues,
860 )
861@@ -697,7 +697,7 @@
862
863
864 def get_extra_interrepo_test_combinations():
865- from ...bzr.groupcompress_repo import RepositoryFormat2a
866+ from ..bzr.groupcompress_repo import RepositoryFormat2a
867 from . import interrepo
868 return [
869 (interrepo.InterLocalGitNonGitRepository, GitRepositoryFormat(), RepositoryFormat2a()),
870
871=== modified file 'breezy/git/revspec.py'
872--- breezy/plugins/git/revspec.py 2018-05-13 22:54:28 +0000
873+++ breezy/git/revspec.py 2018-08-08 02:35:32 +0000
874@@ -21,15 +21,15 @@
875 # Please note that imports are delayed as much as possible here since
876 # if DWIM revspecs are supported this module is imported by __init__.py.
877
878-from ... import version_info as breezy_version
879-from ...errors import (
880+from .. import version_info as breezy_version
881+from ..errors import (
882 InvalidRevisionId,
883 InvalidRevisionSpec,
884 )
885-from ...revision import (
886+from ..revision import (
887 NULL_REVISION,
888 )
889-from ...revisionspec import (
890+from ..revisionspec import (
891 RevisionInfo,
892 RevisionSpec,
893 )
894
895=== modified file 'breezy/git/roundtrip.py'
896--- breezy/plugins/git/roundtrip.py 2018-07-02 20:37:44 +0000
897+++ breezy/git/roundtrip.py 2018-08-08 02:35:32 +0000
898@@ -47,7 +47,7 @@
899
900 from __future__ import absolute_import
901
902-from ... import osutils
903+from .. import osutils
904
905 from io import BytesIO
906
907
908=== modified file 'breezy/git/send.py'
909--- breezy/plugins/git/send.py 2018-07-13 20:57:53 +0000
910+++ breezy/git/send.py 2018-08-08 02:35:32 +0000
911@@ -23,8 +23,8 @@
912 from __future__ import absolute_import
913
914 import time
915-from ... import __version__ as bzr_version
916-from ... import (
917+from .. import __version__ as bzr_version
918+from .. import (
919 branch as _mod_branch,
920 diff as _mod_diff,
921 errors,
922@@ -32,7 +32,7 @@
923 revision as _mod_revision,
924 )
925
926-from ...merge_directive import BaseMergeDirective
927+from ..merge_directive import BaseMergeDirective
928
929 from . import (
930 version_info as bzr_git_version_info,
931
932=== modified file 'breezy/git/server.py'
933--- breezy/plugins/git/server.py 2018-07-01 21:13:21 +0000
934+++ breezy/git/server.py 2018-08-08 02:35:32 +0000
935@@ -22,12 +22,12 @@
936
937 import sys
938
939-from ... import (
940+from .. import (
941 errors,
942 trace,
943 )
944
945-from ...controldir import (
946+from ..controldir import (
947 ControlDir,
948 )
949
950
951=== modified file 'breezy/git/tests/__init__.py'
952--- breezy/plugins/git/tests/__init__.py 2018-07-03 01:42:53 +0000
953+++ breezy/git/tests/__init__.py 2018-08-08 02:35:32 +0000
954@@ -23,11 +23,11 @@
955
956 import time
957
958-from .... import (
959+from ... import (
960 errors as bzr_errors,
961 tests,
962 )
963-from ....tests.features import (
964+from ...tests.features import (
965 Feature,
966 ModuleAvailableFeature,
967 )
968
969=== modified file 'breezy/git/tests/test_blackbox.py'
970--- breezy/plugins/git/tests/test_blackbox.py 2018-07-23 22:25:11 +0000
971+++ breezy/git/tests/test_blackbox.py 2018-08-08 02:35:32 +0000
972@@ -25,14 +25,14 @@
973
974 import os
975
976-from .... import (
977+from ... import (
978 version_info as breezy_version,
979 )
980-from ....controldir import (
981+from ...controldir import (
982 ControlDir,
983 )
984
985-from ....tests.blackbox import ExternalBase
986+from ...tests.blackbox import ExternalBase
987
988 from .. import (
989 tests,
990
991=== modified file 'breezy/git/tests/test_branch.py'
992--- breezy/plugins/git/tests/test_branch.py 2018-07-23 22:47:40 +0000
993+++ breezy/git/tests/test_branch.py 2018-08-08 02:35:32 +0000
994@@ -32,20 +32,20 @@
995 import os
996 import urllib
997
998-from .... import (
999+from ... import (
1000 errors,
1001 revision,
1002 urlutils,
1003 )
1004-from ....branch import (
1005+from ...branch import (
1006 Branch,
1007 InterBranch,
1008 UnstackableBranchFormat,
1009 )
1010-from ....controldir import (
1011+from ...controldir import (
1012 ControlDir,
1013 )
1014-from ....repository import (
1015+from ...repository import (
1016 Repository,
1017 )
1018
1019
1020=== modified file 'breezy/git/tests/test_cache.py'
1021--- breezy/plugins/git/tests/test_cache.py 2018-07-03 02:05:44 +0000
1022+++ breezy/git/tests/test_cache.py 2018-08-08 02:35:32 +0000
1023@@ -27,24 +27,24 @@
1024 import os
1025 import stat
1026
1027-from .... import osutils
1028+from ... import osutils
1029
1030-from ....bzr.inventory import (
1031+from ...bzr.inventory import (
1032 InventoryFile,
1033 InventoryDirectory,
1034 ROOT_ID,
1035 )
1036
1037-from ....revision import (
1038+from ...revision import (
1039 Revision,
1040 )
1041
1042-from ....tests import (
1043+from ...tests import (
1044 TestCase,
1045 TestCaseInTempDir,
1046 UnavailableFeature,
1047 )
1048-from ....transport import (
1049+from ...transport import (
1050 get_transport,
1051 )
1052
1053
1054=== modified file 'breezy/git/tests/test_dir.py'
1055--- breezy/plugins/git/tests/test_dir.py 2018-07-03 01:42:53 +0000
1056+++ breezy/git/tests/test_dir.py 2018-08-08 02:35:32 +0000
1057@@ -22,12 +22,12 @@
1058 from dulwich.repo import Repo as GitRepo
1059 import os
1060
1061-from .... import (
1062+from ... import (
1063 controldir,
1064 errors,
1065 urlutils,
1066 )
1067-from ....tests import TestSkipped
1068+from ...tests import TestSkipped
1069
1070 from .. import (
1071 dir,
1072
1073=== modified file 'breezy/git/tests/test_fetch.py'
1074--- breezy/plugins/git/tests/test_fetch.py 2018-07-13 00:42:16 +0000
1075+++ breezy/git/tests/test_fetch.py 2018-08-08 02:35:32 +0000
1076@@ -32,26 +32,26 @@
1077 import stat
1078 import time
1079
1080-from .... import (
1081+from ... import (
1082 osutils,
1083 )
1084-from ....bzr import (
1085+from ...bzr import (
1086 knit,
1087 versionedfile,
1088 )
1089-from ....branch import (
1090+from ...branch import (
1091 Branch,
1092 )
1093-from ....controldir import (
1094+from ...controldir import (
1095 ControlDir,
1096 )
1097-from ....bzr.inventory import (
1098+from ...bzr.inventory import (
1099 Inventory,
1100 )
1101-from ....repository import (
1102+from ...repository import (
1103 Repository,
1104 )
1105-from ....tests import (
1106+from ...tests import (
1107 TestCaseWithTransport,
1108 )
1109
1110
1111=== modified file 'breezy/git/tests/test_git_remote_helper.py'
1112--- breezy/plugins/git/tests/test_git_remote_helper.py 2018-07-25 19:57:22 +0000
1113+++ breezy/git/tests/test_git_remote_helper.py 2018-08-08 02:35:32 +0000
1114@@ -26,7 +26,7 @@
1115
1116 from dulwich.repo import Repo
1117
1118-from ....tests import (
1119+from ...tests import (
1120 TestCaseWithTransport,
1121 TestSkipped,
1122 )
1123
1124=== modified file 'breezy/git/tests/test_mapping.py'
1125--- breezy/plugins/git/tests/test_mapping.py 2018-07-03 00:15:59 +0000
1126+++ breezy/git/tests/test_mapping.py 2018-08-08 02:35:32 +0000
1127@@ -19,7 +19,7 @@
1128
1129 from __future__ import absolute_import
1130
1131-from ....revision import (
1132+from ...revision import (
1133 Revision,
1134 )
1135
1136
1137=== modified file 'breezy/git/tests/test_memorytree.py'
1138--- breezy/plugins/git/tests/test_memorytree.py 2018-07-23 22:25:11 +0000
1139+++ breezy/git/tests/test_memorytree.py 2018-08-08 02:35:32 +0000
1140@@ -17,8 +17,8 @@
1141
1142 """Tests for the GitMemoryTree class."""
1143
1144-from .... import errors
1145-from ....treebuilder import TreeBuilder
1146+from ... import errors
1147+from ...treebuilder import TreeBuilder
1148 from . import TestCaseWithTransport
1149
1150
1151
1152=== modified file 'breezy/git/tests/test_object_store.py'
1153--- breezy/plugins/git/tests/test_object_store.py 2018-07-03 23:54:50 +0000
1154+++ breezy/git/tests/test_object_store.py 2018-08-08 02:35:32 +0000
1155@@ -23,21 +23,21 @@
1156 Tree,
1157 )
1158
1159-from ....branchbuilder import (
1160+from ...branchbuilder import (
1161 BranchBuilder,
1162 )
1163-from ....bzr.inventory import (
1164+from ...bzr.inventory import (
1165 InventoryDirectory,
1166 InventoryFile,
1167 )
1168-from ....errors import (
1169+from ...errors import (
1170 NoSuchRevision,
1171 )
1172-from ....graph import (
1173+from ...graph import (
1174 DictParentsProvider,
1175 Graph,
1176 )
1177-from ....tests import (
1178+from ...tests import (
1179 TestCase,
1180 TestCaseWithTransport,
1181 )
1182
1183=== modified file 'breezy/git/tests/test_pristine_tar.py'
1184--- breezy/plugins/git/tests/test_pristine_tar.py 2018-07-03 01:42:53 +0000
1185+++ breezy/git/tests/test_pristine_tar.py 2018-08-08 02:35:32 +0000
1186@@ -27,8 +27,8 @@
1187 store_git_pristine_tar_data,
1188 )
1189
1190-from ....revision import Revision
1191-from ....tests import TestCase
1192+from ...revision import Revision
1193+from ...tests import TestCase
1194
1195 from dulwich.objects import (
1196 Blob,
1197
1198=== modified file 'breezy/git/tests/test_push.py'
1199--- breezy/plugins/git/tests/test_push.py 2018-07-03 01:42:53 +0000
1200+++ breezy/git/tests/test_push.py 2018-08-08 02:35:32 +0000
1201@@ -19,13 +19,13 @@
1202
1203 from __future__ import absolute_import
1204
1205-from ....controldir import (
1206+from ...controldir import (
1207 format_registry,
1208 )
1209-from ....repository import (
1210+from ...repository import (
1211 InterRepository,
1212 )
1213-from ....tests import (
1214+from ...tests import (
1215 TestCaseWithTransport,
1216 )
1217
1218
1219=== modified file 'breezy/git/tests/test_refs.py'
1220--- breezy/plugins/git/tests/test_refs.py 2018-05-14 20:02:30 +0000
1221+++ breezy/git/tests/test_refs.py 2018-08-08 02:35:32 +0000
1222@@ -20,7 +20,7 @@
1223
1224 from __future__ import absolute_import
1225
1226-from .... import tests
1227+from ... import tests
1228
1229 from ..object_store import BazaarObjectStore
1230 from ..refs import (
1231
1232=== modified file 'breezy/git/tests/test_remote.py'
1233--- breezy/plugins/git/tests/test_remote.py 2018-07-03 01:42:53 +0000
1234+++ breezy/git/tests/test_remote.py 2018-08-08 02:35:32 +0000
1235@@ -23,19 +23,19 @@
1236 import os
1237 import time
1238
1239-from ....controldir import ControlDir
1240-from ....errors import (
1241+from ...controldir import ControlDir
1242+from ...errors import (
1243 BzrError,
1244 DivergedBranches,
1245 NotBranchError,
1246 NoSuchTag,
1247 )
1248
1249-from ....tests import (
1250+from ...tests import (
1251 TestCase,
1252 TestCaseWithTransport,
1253 )
1254-from ....tests.features import ExecutableFeature
1255+from ...tests.features import ExecutableFeature
1256
1257 from ..mapping import default_mapping
1258 from ..remote import (
1259
1260=== modified file 'breezy/git/tests/test_repository.py'
1261--- breezy/plugins/git/tests/test_repository.py 2018-07-03 01:42:53 +0000
1262+++ breezy/git/tests/test_repository.py 2018-08-08 02:35:32 +0000
1263@@ -25,12 +25,12 @@
1264 )
1265 import os
1266
1267-from .... import (
1268+from ... import (
1269 config,
1270 errors,
1271 revision,
1272 )
1273-from ....repository import (
1274+from ...repository import (
1275 InterRepository,
1276 Repository,
1277 )
1278
1279=== modified file 'breezy/git/tests/test_revspec.py'
1280--- breezy/plugins/git/tests/test_revspec.py 2018-05-13 22:54:28 +0000
1281+++ breezy/git/tests/test_revspec.py 2018-08-08 02:35:32 +0000
1282@@ -18,7 +18,7 @@
1283
1284 from __future__ import absolute_import
1285
1286-from ....tests import TestCase
1287+from ...tests import TestCase
1288
1289 from ..revspec import (
1290 valid_git_sha1,
1291
1292=== modified file 'breezy/git/tests/test_roundtrip.py'
1293--- breezy/plugins/git/tests/test_roundtrip.py 2018-07-01 21:13:21 +0000
1294+++ breezy/git/tests/test_roundtrip.py 2018-08-08 02:35:32 +0000
1295@@ -20,7 +20,7 @@
1296
1297 from __future__ import absolute_import
1298
1299-from ....tests import TestCase
1300+from ...tests import TestCase
1301
1302 from ..roundtrip import (
1303 CommitSupplement,
1304
1305=== modified file 'breezy/git/tests/test_server.py'
1306--- breezy/plugins/git/tests/test_server.py 2018-07-01 21:13:21 +0000
1307+++ breezy/git/tests/test_server.py 2018-08-08 02:35:32 +0000
1308@@ -22,8 +22,8 @@
1309 from dulwich.repo import Repo
1310 import threading
1311
1312-from ....transport import transport_server_registry
1313-from ....tests import (
1314+from ...transport import transport_server_registry
1315+from ...tests import (
1316 TestCase,
1317 TestCaseWithTransport,
1318 )
1319
1320=== modified file 'breezy/git/tests/test_transportgit.py'
1321--- breezy/plugins/git/tests/test_transportgit.py 2018-05-13 22:54:28 +0000
1322+++ breezy/git/tests/test_transportgit.py 2018-08-08 02:35:32 +0000
1323@@ -22,7 +22,7 @@
1324 from dulwich.tests.test_object_store import PackBasedObjectStoreTests
1325 from dulwich.tests.utils import make_object
1326
1327-from ....tests import TestCaseWithTransport
1328+from ...tests import TestCaseWithTransport
1329
1330 from ..transportgit import TransportObjectStore
1331
1332
1333=== modified file 'breezy/git/tests/test_unpeel_map.py'
1334--- breezy/plugins/git/tests/test_unpeel_map.py 2018-05-14 20:02:30 +0000
1335+++ breezy/git/tests/test_unpeel_map.py 2018-08-08 02:35:32 +0000
1336@@ -20,7 +20,7 @@
1337
1338 from io import BytesIO
1339
1340-from ....tests import (
1341+from ...tests import (
1342 TestCaseWithTransport,
1343 )
1344
1345
1346=== modified file 'breezy/git/tests/test_urls.py'
1347--- breezy/plugins/git/tests/test_urls.py 2018-04-02 14:42:37 +0000
1348+++ breezy/git/tests/test_urls.py 2018-08-08 02:35:32 +0000
1349@@ -18,7 +18,7 @@
1350
1351 from __future__ import absolute_import
1352
1353-from ....tests import TestCase
1354+from ...tests import TestCase
1355 from ..urls import (
1356 git_url_to_bzr_url,
1357 )
1358
1359=== modified file 'breezy/git/tests/test_workingtree.py'
1360--- breezy/plugins/git/tests/test_workingtree.py 2018-07-02 20:37:44 +0000
1361+++ breezy/git/tests/test_workingtree.py 2018-08-08 02:35:32 +0000
1362@@ -28,10 +28,10 @@
1363 ZERO_SHA,
1364 )
1365
1366-from .... import (
1367+from ... import (
1368 conflicts as _mod_conflicts,
1369 )
1370-from ....delta import TreeDelta
1371+from ...delta import TreeDelta
1372 from ..mapping import (
1373 default_mapping,
1374 GitFileIdMap,
1375@@ -43,7 +43,7 @@
1376 from ..workingtree import (
1377 FLAG_STAGEMASK,
1378 )
1379-from ....tests import (
1380+from ...tests import (
1381 TestCase,
1382 TestCaseWithTransport,
1383 )
1384
1385=== modified file 'breezy/git/transportgit.py'
1386--- breezy/plugins/git/transportgit.py 2018-07-23 22:47:40 +0000
1387+++ breezy/git/transportgit.py 2018-08-08 02:35:32 +0000
1388@@ -64,16 +64,16 @@
1389 write_packed_refs,
1390 )
1391
1392-from ... import (
1393+from .. import (
1394 osutils,
1395 transport as _mod_transport,
1396 urlutils,
1397 )
1398-from ...sixish import (
1399+from ..sixish import (
1400 PY3,
1401 text_type,
1402 )
1403-from ...errors import (
1404+from ..errors import (
1405 AlreadyControlDirError,
1406 FileExists,
1407 LockBroken,
1408@@ -85,7 +85,7 @@
1409 TransportNotPossible,
1410 )
1411
1412-from ...lock import LogicalLockResult
1413+from ..lock import LogicalLockResult
1414
1415
1416 class TransportRefsContainer(RefsContainer):
1417
1418=== modified file 'breezy/git/tree.py'
1419--- breezy/plugins/git/tree.py 2018-07-23 22:25:11 +0000
1420+++ breezy/git/tree.py 2018-08-08 02:35:32 +0000
1421@@ -43,7 +43,7 @@
1422 import stat
1423 import posixpath
1424
1425-from ... import (
1426+from .. import (
1427 controldir as _mod_controldir,
1428 delta,
1429 errors,
1430@@ -55,11 +55,11 @@
1431 tree as _mod_tree,
1432 workingtree,
1433 )
1434-from ...revision import (
1435+from ..revision import (
1436 CURRENT_REVISION,
1437 NULL_REVISION,
1438 )
1439-from ...sixish import (
1440+from ..sixish import (
1441 text_type,
1442 viewitems,
1443 )
1444
1445=== modified file 'breezy/git/unpeel_map.py'
1446--- breezy/plugins/git/unpeel_map.py 2018-05-13 22:54:28 +0000
1447+++ breezy/git/unpeel_map.py 2018-08-08 02:35:32 +0000
1448@@ -21,7 +21,7 @@
1449 from collections import defaultdict
1450 from io import BytesIO
1451
1452-from ... import (
1453+from .. import (
1454 errors,
1455 trace,
1456 )
1457
1458=== modified file 'breezy/git/workingtree.py'
1459--- breezy/plugins/git/workingtree.py 2018-07-23 22:47:40 +0000
1460+++ breezy/git/workingtree.py 2018-08-08 02:35:32 +0000
1461@@ -59,7 +59,7 @@
1462 import stat
1463 import sys
1464
1465-from ... import (
1466+from .. import (
1467 conflicts as _mod_conflicts,
1468 errors,
1469 controldir as _mod_controldir,
1470@@ -74,13 +74,13 @@
1471 tree,
1472 workingtree,
1473 )
1474-from ...decorators import (
1475+from ..decorators import (
1476 only_raises,
1477 )
1478-from ...bzr import (
1479+from ..bzr import (
1480 inventory,
1481 )
1482-from ...mutabletree import (
1483+from ..mutabletree import (
1484 BadReferenceTarget,
1485 MutableTree,
1486 )
1487
1488=== modified file 'breezy/tests/__init__.py'
1489--- breezy/tests/__init__.py 2018-08-07 00:40:18 +0000
1490+++ breezy/tests/__init__.py 2018-08-08 02:35:32 +0000
1491@@ -3877,6 +3877,28 @@
1492 def _test_suite_testmod_names():
1493 """Return the standard list of test module names to test."""
1494 return [
1495+ 'breezy.git.tests.test_blackbox',
1496+ 'breezy.git.tests.test_builder',
1497+ 'breezy.git.tests.test_branch',
1498+ 'breezy.git.tests.test_cache',
1499+ 'breezy.git.tests.test_dir',
1500+ 'breezy.git.tests.test_fetch',
1501+ 'breezy.git.tests.test_git_remote_helper',
1502+ 'breezy.git.tests.test_mapping',
1503+ 'breezy.git.tests.test_memorytree',
1504+ 'breezy.git.tests.test_object_store',
1505+ 'breezy.git.tests.test_pristine_tar',
1506+ 'breezy.git.tests.test_push',
1507+ 'breezy.git.tests.test_remote',
1508+ 'breezy.git.tests.test_repository',
1509+ 'breezy.git.tests.test_refs',
1510+ 'breezy.git.tests.test_revspec',
1511+ 'breezy.git.tests.test_roundtrip',
1512+ 'breezy.git.tests.test_server',
1513+ 'breezy.git.tests.test_transportgit',
1514+ 'breezy.git.tests.test_unpeel_map',
1515+ 'breezy.git.tests.test_urls',
1516+ 'breezy.git.tests.test_workingtree',
1517 'breezy.tests.blackbox',
1518 'breezy.tests.commands',
1519 'breezy.tests.per_branch',
1520
1521=== modified file 'setup.py'
1522--- setup.py 2018-06-17 11:15:04 +0000
1523+++ setup.py 2018-08-08 02:35:32 +0000
1524@@ -735,16 +735,16 @@
1525 if not 'bdist_egg' in sys.argv:
1526 # generate and install brz.1 only with plain install, not the
1527 # easy_install one
1528- DATA_FILES = [('man/man1', ['brz.1', 'breezy/plugins/git/git-remote-bzr.1'])]
1529+ DATA_FILES = [('man/man1', ['brz.1', 'breezy/git/git-remote-bzr.1'])]
1530
1531 DATA_FILES = DATA_FILES + I18N_FILES
1532 # std setup
1533 ARGS = {'scripts': ['brz',
1534 # TODO(jelmer): Only install the git scripts if
1535 # Dulwich was found.
1536- 'breezy/plugins/git/git-remote-bzr',
1537- 'breezy/plugins/git/bzr-receive-pack',
1538- 'breezy/plugins/git/bzr-upload-pack'],
1539+ 'breezy/git/git-remote-bzr',
1540+ 'breezy/git/bzr-receive-pack',
1541+ 'breezy/git/bzr-upload-pack'],
1542 'data_files': DATA_FILES,
1543 'cmdclass': command_classes,
1544 'ext_modules': ext_modules,

Subscribers

People subscribed via source and target branches