905 node1 = node.bin(self._state[1]) |
906 node1 = node.bin(self._state[1]) |
906 # We currently expect node2 to come from substate and be |
907 # We currently expect node2 to come from substate and be |
907 # in hex format |
908 # in hex format |
908 if node2 is not None: |
909 if node2 is not None: |
909 node2 = node.bin(node2) |
910 node2 = node.bin(node2) |
910 cmdutil.diffordiffstat(ui, self._repo, diffopts, |
911 logcmdutil.diffordiffstat(ui, self._repo, diffopts, |
911 node1, node2, match, |
912 node1, node2, match, |
912 prefix=posixpath.join(prefix, self._path), |
913 prefix=posixpath.join(prefix, self._path), |
913 listsubrepos=True, **opts) |
914 listsubrepos=True, **opts) |
914 except error.RepoLookupError as inst: |
915 except error.RepoLookupError as inst: |
915 self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') |
916 self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') |
916 % (inst, subrelpath(self))) |
917 % (inst, subrelpath(self))) |
917 |
918 |
918 @annotatesubrepoerror |
919 @annotatesubrepoerror |