equal
deleted
inserted
replaced
97 if stat: |
97 if stat: |
98 diffopts = diffopts.copy(context=0, noprefix=False) |
98 diffopts = diffopts.copy(context=0, noprefix=False) |
99 width = 80 |
99 width = 80 |
100 if not ui.plain(): |
100 if not ui.plain(): |
101 width = ui.termwidth() - graphwidth |
101 width = ui.termwidth() - graphwidth |
|
102 # If an explicit --root was given, don't respect ui.relative-paths |
|
103 if not relroot: |
|
104 pathfn = compose(scmutil.getuipathfn(repo), pathfn) |
102 |
105 |
103 chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn, |
106 chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn, |
104 copysourcematch=copysourcematch, |
107 copysourcematch=copysourcematch, |
105 hunksfilterfn=hunksfilterfn) |
108 hunksfilterfn=hunksfilterfn) |
106 |
109 |