| hg-reviewers |
See previous patch for motivation.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (3 lines) | |||
| M | mercurial/logcmdutil.py (5 lines) | |||
| M | mercurial/patch.py (16 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| r = self._repo | r = self._repo | ||||
| return matchmod.match(r.root, r.getcwd(), pats, | return matchmod.match(r.root, r.getcwd(), pats, | ||||
| include, exclude, default, | include, exclude, default, | ||||
| auditor=r.nofsauditor, ctx=self, | auditor=r.nofsauditor, ctx=self, | ||||
| listsubrepos=listsubrepos, badfn=badfn) | listsubrepos=listsubrepos, badfn=badfn) | ||||
| def diff(self, ctx2=None, match=None, changes=None, opts=None, | def diff(self, ctx2=None, match=None, changes=None, opts=None, | ||||
| losedatafn=None, prefix='', relroot='', copy=None, | losedatafn=None, prefix='', relroot='', copy=None, | ||||
| hunksfilterfn=None): | copysourcematch=None, hunksfilterfn=None): | ||||
| """Returns a diff generator for the given contexts and matcher""" | """Returns a diff generator for the given contexts and matcher""" | ||||
| if ctx2 is None: | if ctx2 is None: | ||||
| ctx2 = self.p1() | ctx2 = self.p1() | ||||
| if ctx2 is not None: | if ctx2 is not None: | ||||
| ctx2 = self._repo[ctx2] | ctx2 = self._repo[ctx2] | ||||
| return patch.diff(self._repo, ctx2, self, match=match, changes=changes, | return patch.diff(self._repo, ctx2, self, match=match, changes=changes, | ||||
| opts=opts, losedatafn=losedatafn, prefix=prefix, | opts=opts, losedatafn=losedatafn, prefix=prefix, | ||||
| relroot=relroot, copy=copy, | relroot=relroot, copy=copy, | ||||
| copysourcematch=copysourcematch, | |||||
| hunksfilterfn=hunksfilterfn) | hunksfilterfn=hunksfilterfn) | ||||
| def dirs(self): | def dirs(self): | ||||
| return self._manifest.dirs() | return self._manifest.dirs() | ||||
| def hasdir(self, dir): | def hasdir(self, dir): | ||||
| return self._manifest.hasdir(dir) | return self._manifest.hasdir(dir) | ||||
| prefix='', root='', listsubrepos=False, hunksfilterfn=None): | prefix='', root='', listsubrepos=False, hunksfilterfn=None): | ||||
| '''show diff or diffstat.''' | '''show diff or diffstat.''' | ||||
| ctx1 = repo[node1] | ctx1 = repo[node1] | ||||
| ctx2 = repo[node2] | 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 = '' | ||||
| copysourcematch = None | |||||
| 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)) | ||||
| relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path') | relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path') | ||||
| match = matchmod.intersectmatchers(match, relrootmatch) | match = matchmod.intersectmatchers(match, relrootmatch) | ||||
| copysourcematch = relrootmatch | |||||
| 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 = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix, | chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix, | ||||
| relroot=relroot, hunksfilterfn=hunksfilterfn) | relroot=relroot, copysourcematch=copysourcematch, | ||||
| 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: | ||||
| pass | pass | ||||
| diffopts = diffutil.diffallopts | diffopts = diffutil.diffallopts | ||||
| diffallopts = diffutil.diffallopts | diffallopts = diffutil.diffallopts | ||||
| difffeatureopts = diffutil.difffeatureopts | difffeatureopts = diffutil.difffeatureopts | ||||
| def diff(repo, node1=None, node2=None, match=None, changes=None, | def diff(repo, node1=None, node2=None, match=None, changes=None, | ||||
| opts=None, losedatafn=None, prefix='', relroot='', copy=None, | opts=None, losedatafn=None, prefix='', relroot='', copy=None, | ||||
| hunksfilterfn=None): | copysourcematch=None, hunksfilterfn=None): | ||||
| '''yields diff of changes to files between two nodes, or node and | '''yields diff of changes to files between two nodes, or node and | ||||
| working directory. | working directory. | ||||
| if node1 is None, use first dirstate parent instead. | if node1 is None, use first dirstate parent instead. | ||||
| if node2 is None, compare node1 with working directory. | if node2 is None, compare node1 with working directory. | ||||
| losedatafn(**kwarg) is a callable run when opts.upgrade=True and | losedatafn(**kwarg) is a callable run when opts.upgrade=True and | ||||
| every time some change cannot be represented with the current | every time some change cannot be represented with the current | ||||
| patch format. Return False to upgrade to git patch format, True to | patch format. Return False to upgrade to git patch format, True to | ||||
| accept the loss or raise an exception to abort the diff. It is | accept the loss or raise an exception to abort the diff. It is | ||||
| called with the name of current file being diffed as 'fn'. If set | called with the name of current file being diffed as 'fn'. If set | ||||
| to None, patches will always be upgraded to git format when | to None, patches will always be upgraded to git format when | ||||
| necessary. | necessary. | ||||
| prefix is a filename prefix that is prepended to all filenames on | prefix is a filename prefix that is prepended to all filenames on | ||||
| display (used for subrepos). | display (used for subrepos). | ||||
| relroot, if not empty, must be normalized with a trailing /. Any match | relroot, if not empty, must be normalized with a trailing /. Any match | ||||
| patterns that fall outside it will be ignored. | patterns that fall outside it will be ignored. | ||||
| copy, if not empty, should contain mappings {dst@y: src@x} of copy | copy, if not empty, should contain mappings {dst@y: src@x} of copy | ||||
| information. | information. | ||||
| if copysourcematch is not None, then copy sources will be filtered by this | |||||
| matcher | |||||
| hunksfilterfn, if not None, should be a function taking a filectx and | hunksfilterfn, if not None, should be a function taking a filectx and | ||||
| hunks generator that may yield filtered hunks. | hunks generator that may yield filtered hunks. | ||||
| ''' | ''' | ||||
| if not node1 and not node2: | if not node1 and not node2: | ||||
| node1 = repo.dirstate.p1() | node1 = repo.dirstate.p1() | ||||
| ctx1 = repo[node1] | ctx1 = repo[node1] | ||||
| ctx2 = repo[node2] | ctx2 = repo[node2] | ||||
| for fctx1, fctx2, hdr, hunks in diffhunks( | for fctx1, fctx2, hdr, hunks in diffhunks( | ||||
| repo, ctx1=ctx1, ctx2=ctx2, | repo, ctx1=ctx1, ctx2=ctx2, | ||||
| match=match, changes=changes, opts=opts, | match=match, changes=changes, opts=opts, | ||||
| losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, | losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, | ||||
| ): | copysourcematch=copysourcematch): | ||||
| if hunksfilterfn is not None: | if hunksfilterfn is not None: | ||||
| # If the file has been removed, fctx2 is None; but this should | # If the file has been removed, fctx2 is None; but this should | ||||
| # not occur here since we catch removed files early in | # not occur here since we catch removed files early in | ||||
| # logcmdutil.getlinerangerevs() for 'hg log -L'. | # logcmdutil.getlinerangerevs() for 'hg log -L'. | ||||
| assert fctx2 is not None, \ | assert fctx2 is not None, \ | ||||
| 'fctx2 unexpectly None in diff hunks filtering' | 'fctx2 unexpectly None in diff hunks filtering' | ||||
| hunks = hunksfilterfn(fctx2, hunks) | hunks = hunksfilterfn(fctx2, hunks) | ||||
| text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) | text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) | ||||
| if hdr and (text or len(hdr) > 1): | if hdr and (text or len(hdr) > 1): | ||||
| yield '\n'.join(hdr) + '\n' | yield '\n'.join(hdr) + '\n' | ||||
| if text: | if text: | ||||
| yield text | yield text | ||||
| def diffhunks(repo, ctx1, ctx2, match=None, changes=None, | def diffhunks(repo, ctx1, ctx2, match=None, changes=None, | ||||
| opts=None, losedatafn=None, prefix='', relroot='', copy=None): | opts=None, losedatafn=None, prefix='', relroot='', copy=None, | ||||
| copysourcematch=None): | |||||
| """Yield diff of changes to files in the form of (`header`, `hunks`) tuples | """Yield diff of changes to files in the form of (`header`, `hunks`) tuples | ||||
| where `header` is a list of diff headers and `hunks` is an iterable of | where `header` is a list of diff headers and `hunks` is an iterable of | ||||
| (`hunkrange`, `hunklines`) tuples. | (`hunkrange`, `hunklines`) tuples. | ||||
| See diff() for the meaning of parameters. | See diff() for the meaning of parameters. | ||||
| """ | """ | ||||
| if opts is None: | if opts is None: | ||||
| hexfunc = short | hexfunc = short | ||||
| revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] | revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] | ||||
| if copy is None: | if copy is None: | ||||
| copy = {} | copy = {} | ||||
| if opts.git or opts.upgrade: | if opts.git or opts.upgrade: | ||||
| copy = copies.pathcopies(ctx1, ctx2, match=match) | copy = copies.pathcopies(ctx1, ctx2, match=match) | ||||
| if relroot: | if copysourcematch: | ||||
| # filter out copies where source side isn't inside the relative root | # filter out copies where source side isn't inside the matcher | ||||
| # (copies.pathcopies() already filtered out the destination) | # (copies.pathcopies() already filtered out the destination) | ||||
| copy = {dst: src for dst, src in copy.iteritems() | copy = {dst: src for dst, src in copy.iteritems() | ||||
| if src.startswith(relroot)} | if copysourcematch(src)} | ||||
| modifiedset = set(modified) | modifiedset = set(modified) | ||||
| addedset = set(added) | addedset = set(added) | ||||
| removedset = set(removed) | removedset = set(removed) | ||||
| for f in modified: | for f in modified: | ||||
| if f not in ctx1: | if f not in ctx1: | ||||
| # Fix up added, since merged-in additions appear as | # Fix up added, since merged-in additions appear as | ||||
| # modifications during merges | # modifications during merges | ||||