Mercurial > hg
comparison mercurial/context.py @ 21834:e4d35aa9056c
basectx: pass raw context objects to patch.diff
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Tue, 29 Apr 2014 16:43:59 -0500 |
| parents | ee29b0bb1619 |
| children | b342c3e2518a |
comparison
equal
deleted
inserted
replaced
| 21833:c1ceec0c8cb4 | 21834:e4d35aa9056c |
|---|---|
| 254 if ctx2 is None: | 254 if ctx2 is None: |
| 255 ctx2 = self.p1() | 255 ctx2 = self.p1() |
| 256 if ctx2 is not None: | 256 if ctx2 is not None: |
| 257 ctx2 = self._repo[ctx2] | 257 ctx2 = self._repo[ctx2] |
| 258 diffopts = patch.diffopts(self._repo.ui, opts) | 258 diffopts = patch.diffopts(self._repo.ui, opts) |
| 259 return patch.diff(self._repo, ctx2.node(), self.node(), | 259 return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) |
| 260 match=match, opts=diffopts) | |
| 261 | 260 |
| 262 @propertycache | 261 @propertycache |
| 263 def _dirs(self): | 262 def _dirs(self): |
| 264 return scmutil.dirs(self._manifest) | 263 return scmutil.dirs(self._manifest) |
| 265 | 264 |