equal
deleted
inserted
replaced
440 m = match.exact(repo.root, repo.getcwd(), files) |
440 m = match.exact(repo.root, repo.getcwd(), files) |
441 else: |
441 else: |
442 m = match.always(repo.root, repo.getcwd()) |
442 m = match.always(repo.root, repo.getcwd()) |
443 |
443 |
444 diffopts = patch.diffopts(repo.ui, untrusted=True) |
444 diffopts = patch.diffopts(repo.ui, untrusted=True) |
445 if basectx is None: |
445 node1 = basectx.node() |
446 parents = ctx.parents() |
|
447 if parents: |
|
448 node1 = parents[0].node() |
|
449 else: |
|
450 node1 = nullid |
|
451 else: |
|
452 node1 = basectx.node() |
|
453 node2 = ctx.node() |
446 node2 = ctx.node() |
454 |
447 |
455 block = [] |
448 block = [] |
456 for chunk in patch.diff(repo, node1, node2, m, opts=diffopts): |
449 for chunk in patch.diff(repo, node1, node2, m, opts=diffopts): |
457 if chunk.startswith('diff') and block: |
450 if chunk.startswith('diff') and block: |