| pulkit |
| hg-reviewers |
I'm not worried about performance; this is just simpler.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/logcmdutil.py (9 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Feb 7 2019, 1:32 AM |
| else: | else: | ||||
| limit = None | limit = None | ||||
| return limit | return limit | ||||
| def diffordiffstat(ui, repo, diffopts, node1, node2, match, | def diffordiffstat(ui, repo, diffopts, node1, node2, match, | ||||
| changes=None, stat=False, fp=None, graphwidth=0, | changes=None, stat=False, fp=None, graphwidth=0, | ||||
| prefix='', root='', listsubrepos=False, hunksfilterfn=None): | prefix='', root='', listsubrepos=False, hunksfilterfn=None): | ||||
| '''show diff or diffstat.''' | '''show diff or diffstat.''' | ||||
| ctx1 = repo[node1] | |||||
| ctx2 = repo[node2] | |||||
| if root: | if root: | ||||
| relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) | relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) | ||||
| else: | else: | ||||
| relroot = '' | relroot = '' | ||||
| if relroot != '': | if relroot != '': | ||||
| # XXX relative roots currently don't work if the root is within a | # XXX relative roots currently don't work if the root is within a | ||||
| # subrepo | # subrepo | ||||
| uirelroot = match.uipath(relroot) | uirelroot = match.uipath(relroot) | ||||
| relroot += '/' | relroot += '/' | ||||
| for matchroot in match.files(): | for matchroot in match.files(): | ||||
| if not matchroot.startswith(relroot): | if not matchroot.startswith(relroot): | ||||
| ui.warn(_('warning: %s not inside relative root %s\n') % ( | ui.warn(_('warning: %s not inside relative root %s\n') % ( | ||||
| match.uipath(matchroot), uirelroot)) | match.uipath(matchroot), uirelroot)) | ||||
| if stat: | if stat: | ||||
| diffopts = diffopts.copy(context=0, noprefix=False) | diffopts = diffopts.copy(context=0, noprefix=False) | ||||
| width = 80 | width = 80 | ||||
| if not ui.plain(): | if not ui.plain(): | ||||
| width = ui.termwidth() - graphwidth | width = ui.termwidth() - graphwidth | ||||
| chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts, | chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix, | ||||
| prefix=prefix, relroot=relroot, | relroot=relroot, hunksfilterfn=hunksfilterfn) | ||||
| hunksfilterfn=hunksfilterfn) | |||||
| if fp is not None or ui.canwritewithoutlabels(): | if fp is not None or ui.canwritewithoutlabels(): | ||||
| out = fp or ui | out = fp or ui | ||||
| if stat: | if stat: | ||||
| chunks = [patch.diffstat(util.iterlines(chunks), width=width)] | chunks = [patch.diffstat(util.iterlines(chunks), width=width)] | ||||
| for chunk in util.filechunkiter(util.chunkbuffer(chunks)): | for chunk in util.filechunkiter(util.chunkbuffer(chunks)): | ||||
| out.write(chunk) | out.write(chunk) | ||||
| else: | else: | ||||
| if stat: | if stat: | ||||
| chunks = patch.diffstatui(util.iterlines(chunks), width=width) | chunks = patch.diffstatui(util.iterlines(chunks), width=width) | ||||
| else: | else: | ||||
| chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks, | chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks, | ||||
| opts=diffopts) | opts=diffopts) | ||||
| if ui.canbatchlabeledwrites(): | if ui.canbatchlabeledwrites(): | ||||
| def gen(): | def gen(): | ||||
| for chunk, label in chunks: | for chunk, label in chunks: | ||||
| yield ui.label(chunk, label=label) | yield ui.label(chunk, label=label) | ||||
| for chunk in util.filechunkiter(util.chunkbuffer(gen())): | for chunk in util.filechunkiter(util.chunkbuffer(gen())): | ||||
| ui.write(chunk) | ui.write(chunk) | ||||
| else: | else: | ||||
| for chunk, label in chunks: | for chunk, label in chunks: | ||||
| ui.write(chunk, label=label) | ui.write(chunk, label=label) | ||||
| if listsubrepos: | if listsubrepos: | ||||
| ctx1 = repo[node1] | |||||
| ctx2 = repo[node2] | |||||
| for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | ||||
| tempnode2 = node2 | tempnode2 = node2 | ||||
| try: | try: | ||||
| if node2 is not None: | if node2 is not None: | ||||
| tempnode2 = ctx2.substate[subpath][1] | tempnode2 = ctx2.substate[subpath][1] | ||||
| except KeyError: | except KeyError: | ||||
| # A subrepo that existed in node1 was deleted between node1 and | # A subrepo that existed in node1 was deleted between node1 and | ||||
| # node2 (inclusive). Thus, ctx2's substate won't contain that | # node2 (inclusive). Thus, ctx2's substate won't contain that | ||||