equal
deleted
inserted
replaced
172 'diffopts': None, |
172 'diffopts': None, |
173 'followrename': True, |
173 'followrename': True, |
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: |
186 result += b'r0' |
190 result += b'r0' |
187 if not self.followmerge: |
191 if not self.followmerge: |