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