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

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

  1235         r = [hexfunc(node) for node in [node1, node2] if node]

  1235         r = [hexfunc(node) for node in [node1, node2] if node]

  1236 

  1236 

  1237     if opts.git:

  1237     if opts.git:

  1238         copy, diverge = copies.copies(repo, ctx1, ctx2, repo[nullid])

  1238         copy, diverge = copies.copies(repo, ctx1, ctx2, repo[nullid])

  1239         for k, v in copy.items():

  1240         for k, v in copy.items():

  1240             copy[v] = k

  1241             copy[v] = k

  1241 

  1242 

  1242     gone = {}

  1243     gone = {}

  1243     gitmode = {'l': '120000', 'x': '100755', '': '100644'}

  1244     gitmode = {'l': '120000', 'x': '100755', '': '100644'}