Merge lp:~jelmer/brz/typing-fixes 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/typing-fixes
Merge into: lp:brz
Diff against target: 56 lines (+13/-0)
4 files modified
breezy/branch.py (+4/-0)
breezy/controldir.py (+2/-0)
breezy/merge.py (+3/-0)
breezy/propose.py (+4/-0)
To merge this branch: bzr merge lp:~jelmer/brz/typing-fixes
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+407806@code.launchpad.net

Commit message

Add some more typing hints.

Description of the change

Add some more typing hints.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/branch.py'
2--- breezy/branch.py 2021-07-07 08:52:41 +0000
3+++ breezy/branch.py 2021-08-29 20:05:44 +0000
4@@ -69,6 +69,10 @@
5 _clear_cached_state.
6 """
7
8+ controldir: controldir.ControlDir
9+
10+ name: Optional[str]
11+
12 @property
13 def control_transport(self):
14 return self._transport
15
16=== modified file 'breezy/controldir.py'
17--- breezy/controldir.py 2020-05-06 02:13:25 +0000
18+++ breezy/controldir.py 2021-08-29 20:05:44 +0000
19@@ -97,6 +97,8 @@
20 def user_url(self):
21 return self.user_transport.base
22
23+ _format: "ControlComponentFormat"
24+
25
26 class ControlDir(ControlComponent):
27 """A control directory.
28
29=== modified file 'breezy/merge.py'
30--- breezy/merge.py 2021-05-30 16:44:00 +0000
31+++ breezy/merge.py 2021-08-29 20:05:44 +0000
32@@ -264,6 +264,9 @@
33
34 hooks = MergeHooks()
35
36+ # TODO(jelmer): There should probably be a merger base type
37+ merge_type: object
38+
39 def __init__(self, this_branch, other_tree=None, base_tree=None,
40 this_tree=None, change_reporter=None,
41 recurse='down', revision_graph=None):
42
43=== modified file 'breezy/propose.py'
44--- breezy/propose.py 2021-04-03 12:58:34 +0000
45+++ breezy/propose.py 2021-08-29 20:05:44 +0000
46@@ -199,6 +199,10 @@
47 """
48 raise NotImplementedError(self.post_comment)
49
50+ def reopen(self):
51+ """Reopen the merge proposal if it is closed."""
52+ raise NotImplementedError(self.reopen)
53+
54
55 class MergeProposalBuilder(object):
56 """Merge proposal creator.

Subscribers

People subscribed via source and target branches