Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 35888:c8e2d6ed1f9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: drop aliases for logcmdutil functions (API) .. api:: Log-related utility functions has been renamed as follows: - cmdutil.loglimit -> logcmdutil.getlimit - cmdutil.diffordiffstat -> logcmdutil.diffordiffstat - cmdutil._changesetlabels -> logcmdutil.changesetlabels - cmdutil.changeset_printer -> logcmdutil.changesetprinter - cmdutil.jsonchangeset = logcmdutil.jsonchangeset - cmdutil.changeset_templater -> logcmdutil.changesettemplater - cmdutil.logtemplatespec -> logcmdutil.templatespec - cmdutil.makelogtemplater -> logcmdutil.maketemplater - cmdutil.show_changeset -> logcmdutil.changesetdisplayer - cmdutil.getlogrevs -> logcmdutil.getrevs - cmdutil.getloglinerangerevs -> logcmdutil.getlinerangerevs - cmdutil.displaygraph -> logcmdutil.displaygraph - cmdutil.graphlog -> logcmdutil.graphlog - cmdutil.checkunsupportedgraphflags -> logcmdutil.checkunsupportedgraphflags - cmdutil.graphrevs -> logcmdutil.graphrevs - cmdutil._makenofollowlogfilematcher -> logcmdutil._makenofollowfilematcher
author Yuya Nishihara <yuya@tcha.org>
date Sun, 21 Jan 2018 13:03:03 +0900
parents 079b27b5a869
children 8b6dd3922f70
comparison
equal deleted inserted replaced
35887:572f36e9a780 35888:c8e2d6ed1f9e
2340 losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, 2340 losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,
2341 ): 2341 ):
2342 if hunksfilterfn is not None: 2342 if hunksfilterfn is not None:
2343 # If the file has been removed, fctx2 is None; but this should 2343 # If the file has been removed, fctx2 is None; but this should
2344 # not occur here since we catch removed files early in 2344 # not occur here since we catch removed files early in
2345 # cmdutil.getloglinerangerevs() for 'hg log -L'. 2345 # logcmdutil.getlinerangerevs() for 'hg log -L'.
2346 assert fctx2 is not None, \ 2346 assert fctx2 is not None, \
2347 'fctx2 unexpectly None in diff hunks filtering' 2347 'fctx2 unexpectly None in diff hunks filtering'
2348 hunks = hunksfilterfn(fctx2, hunks) 2348 hunks = hunksfilterfn(fctx2, hunks)
2349 text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) 2349 text = ''.join(sum((list(hlines) for hrange, hlines in hunks), []))
2350 if hdr and (text or len(hdr) > 1): 2350 if hdr and (text or len(hdr) > 1):