303 return [], [], [], [], [], [], [] |
303 return [], [], [], [], [], [], [] |
304 |
304 |
305 def diff(self, diffopts, node2, match, prefix, **opts): |
305 def diff(self, diffopts, node2, match, prefix, **opts): |
306 try: |
306 try: |
307 node1 = node.bin(self._state[1]) |
307 node1 = node.bin(self._state[1]) |
|
308 # We currently expect node2 to come from substate and be |
|
309 # in hex format |
|
310 node2 = node.bin(node2) |
308 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, |
311 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, |
309 node1, node2, match, |
312 node1, node2, match, |
310 prefix=os.path.join(prefix, self._path), |
313 prefix=os.path.join(prefix, self._path), |
311 listsubrepos=True, **opts) |
314 listsubrepos=True, **opts) |
312 except error.RepoLookupError, inst: |
315 except error.RepoLookupError, inst: |