equal
deleted
inserted
replaced
74 diffopts = diffopts.copy(context=0, noprefix=False) |
74 diffopts = diffopts.copy(context=0, noprefix=False) |
75 width = 80 |
75 width = 80 |
76 if not ui.plain(): |
76 if not ui.plain(): |
77 width = ui.termwidth() |
77 width = ui.termwidth() |
78 |
78 |
79 chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts, |
79 chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts, |
80 prefix=prefix, relroot=relroot, |
80 prefix=prefix, relroot=relroot, |
81 hunksfilterfn=hunksfilterfn) |
81 hunksfilterfn=hunksfilterfn) |
82 |
82 |
83 if fp is not None or ui.canwritewithoutlabels(): |
83 if fp is not None or ui.canwritewithoutlabels(): |
84 out = fp or ui |
84 out = fp or ui |
85 if stat: |
85 if stat: |
86 chunks = [patch.diffstat(util.iterlines(chunks), width=width)] |
86 chunks = [patch.diffstat(util.iterlines(chunks), width=width)] |