1656     modified, added, removed = changes[:3]

  1656     modified, added, removed = changes[:3]

  1657 

  1657 

  1658     if not modified and not added and not removed:

  1658     if not modified and not added and not removed:

  1659         return []

  1659         return []

  1660 

  1660 

  1662     hexfunc = repo.ui.debugflag and hex or short

  1661     hexfunc = repo.ui.debugflag and hex or short

  1663     revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node]

  1662     revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node]

  1664 

  1663 

  1665     copy = {}

  1664     copy = {}

  1666     if opts.git or opts.upgrade:

  1665     if opts.git or opts.upgrade: