mercurial/cmdutil.py
branchstable
changeset 18006 0c10cf819146
parent 17924 45bd0cd7ca04
child 18031 54f063acc5ea
child 18197 153659e86a5f
equal deleted inserted replaced
17988:848345a8d6ad 18006:0c10cf819146
   625                 # A subrepo that existed in node1 was deleted between node1 and
   625                 # A subrepo that existed in node1 was deleted between node1 and
   626                 # node2 (inclusive). Thus, ctx2's substate won't contain that
   626                 # node2 (inclusive). Thus, ctx2's substate won't contain that
   627                 # subpath. The best we can do is to ignore it.
   627                 # subpath. The best we can do is to ignore it.
   628                 tempnode2 = None
   628                 tempnode2 = None
   629             submatch = matchmod.narrowmatcher(subpath, match)
   629             submatch = matchmod.narrowmatcher(subpath, match)
   630             sub.diff(diffopts, tempnode2, submatch, changes=changes,
   630             sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
   631                      stat=stat, fp=fp, prefix=prefix)
   631                      stat=stat, fp=fp, prefix=prefix)
   632 
   632 
   633 class changeset_printer(object):
   633 class changeset_printer(object):
   634     '''show changeset information when templating not requested.'''
   634     '''show changeset information when templating not requested.'''
   635 
   635