# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1273247951 18000
# Node ID 6f4543842795fadc066fa19f26b8c8a2f51acd47
# Parent  9fa028431957c93c0add964d0f8a47f9a81eb8ee
changectx: use repo.ui diffopts, allow argument override

diff -r 9fa028431957 -r 6f4543842795 mercurial/context.py
--- a/mercurial/context.py	Fri May 07 17:03:48 2010 +0200
+++ b/mercurial/context.py	Fri May 07 10:59:11 2010 -0500
@@ -204,13 +204,15 @@
     def sub(self, path):
         return subrepo.subrepo(self, path)
 
-    def diff(self, ctx2=None, match=None):
+    def diff(self, ctx2=None, match=None, opts=None):
         """Returns a diff generator for the given contexts and matcher"""
         if ctx2 is None:
             ctx2 = self.p1()
         if ctx2 is not None and not isinstance(ctx2, changectx):
             ctx2 = self._repo[ctx2]
-        return patch.diff(self._repo, ctx2.node(), self.node(), match=match)
+        diffopts = patch.diffopts(self._repo.ui, opts)
+        return patch.diff(self._repo, ctx2.node(), self.node(),
+                          match=match, opts=diffopts)
 
 class filectx(object):
     """A filecontext object makes access to data related to a particular