comparison mercurial/context.py @ 11106:213ca9ffcddb

changectx: change diff() to accept keyword opts
author Steve Borho <steve@borho.org>
date Fri, 07 May 2010 14:07:30 -0500
parents 6f4543842795
children 22f5ad0b5857
comparison
equal deleted inserted replaced
11105:6f4543842795 11106:213ca9ffcddb
202 yield fn 202 yield fn
203 203
204 def sub(self, path): 204 def sub(self, path):
205 return subrepo.subrepo(self, path) 205 return subrepo.subrepo(self, path)
206 206
207 def diff(self, ctx2=None, match=None, opts=None): 207 def diff(self, ctx2=None, match=None, **opts):
208 """Returns a diff generator for the given contexts and matcher""" 208 """Returns a diff generator for the given contexts and matcher"""
209 if ctx2 is None: 209 if ctx2 is None:
210 ctx2 = self.p1() 210 ctx2 = self.p1()
211 if ctx2 is not None and not isinstance(ctx2, changectx): 211 if ctx2 is not None and not isinstance(ctx2, changectx):
212 ctx2 = self._repo[ctx2] 212 ctx2 = self._repo[ctx2]