equal
deleted
inserted
replaced
82 raise error.Abort(_('diff context lines count must be ' |
82 raise error.Abort(_('diff context lines count must be ' |
83 'an integer, not %r') % self.context) |
83 'an integer, not %r') % self.context) |
84 |
84 |
85 def copy(self, **kwargs): |
85 def copy(self, **kwargs): |
86 opts = dict((k, getattr(self, k)) for k in self.defaults) |
86 opts = dict((k, getattr(self, k)) for k in self.defaults) |
|
87 opts = pycompat.strkwargs(opts) |
87 opts.update(kwargs) |
88 opts.update(kwargs) |
88 return diffopts(**opts) |
89 return diffopts(**opts) |
89 |
90 |
90 defaultopts = diffopts() |
91 defaultopts = diffopts() |
91 |
92 |