Show More
@@ -7,6 +7,9 b'' | |||||
7 |
|
7 | |||
8 |
|
8 | |||
9 | import os |
|
9 | import os | |
|
10 | from typing import ( | |||
|
11 | Set, | |||
|
12 | ) | |||
10 |
|
13 | |||
11 | from mercurial.i18n import _ |
|
14 | from mercurial.i18n import _ | |
12 | from mercurial import ( |
|
15 | from mercurial import ( | |
@@ -254,7 +257,7 b' def fastannotate(ui, repo, *pats, **opts' | |||||
254 |
|
257 | |||
255 |
|
258 | |||
256 | _newopts = set() |
|
259 | _newopts = set() | |
257 | _knownopts = { |
|
260 | _knownopts: Set[bytes] = { | |
258 | opt[1].replace(b'-', b'_') |
|
261 | opt[1].replace(b'-', b'_') | |
259 | for opt in (fastannotatecommandargs['options'] + commands.globalopts) |
|
262 | for opt in (fastannotatecommandargs['options'] + commands.globalopts) | |
260 | } |
|
263 | } |
@@ -174,12 +174,16 b' class annotateopts:' | |||||
174 | 'followmerge': True, |
|
174 | 'followmerge': True, | |
175 | } |
|
175 | } | |
176 |
|
176 | |||
|
177 | diffopts: mdiff.diffopts | |||
|
178 | followrename: bool | |||
|
179 | followmerge: bool | |||
|
180 | ||||
177 | def __init__(self, **opts): |
|
181 | def __init__(self, **opts): | |
178 | for k, v in self.defaults.items(): |
|
182 | for k, v in self.defaults.items(): | |
179 | setattr(self, k, opts.get(k, v)) |
|
183 | setattr(self, k, opts.get(k, v)) | |
180 |
|
184 | |||
181 | @util.propertycache |
|
185 | @util.propertycache | |
182 | def shortstr(self): |
|
186 | def shortstr(self) -> bytes: | |
183 | """represent opts in a short string, suitable for a directory name""" |
|
187 | """represent opts in a short string, suitable for a directory name""" | |
184 | result = b'' |
|
188 | result = b'' | |
185 | if not self.followrename: |
|
189 | if not self.followrename: |
General Comments 0
You need to be logged in to leave comments.
Login now