comparison hgext/mq.py @ 35888:c8e2d6ed1f9e

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 522f868680ca
children d41e41d11574
comparison
equal deleted inserted replaced
35887:572f36e9a780 35888:c8e2d6ed1f9e
84 error, 84 error,
85 extensions, 85 extensions,
86 hg, 86 hg,
87 localrepo, 87 localrepo,
88 lock as lockmod, 88 lock as lockmod,
89 logcmdutil,
89 patch as patchmod, 90 patch as patchmod,
90 phases, 91 phases,
91 pycompat, 92 pycompat,
92 registrar, 93 registrar,
93 revsetlang, 94 revsetlang,
741 fp=None, changes=None, opts=None): 742 fp=None, changes=None, opts=None):
742 if opts is None: 743 if opts is None:
743 opts = {} 744 opts = {}
744 stat = opts.get('stat') 745 stat = opts.get('stat')
745 m = scmutil.match(repo[node1], files, opts) 746 m = scmutil.match(repo[node1], files, opts)
746 cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, 747 logcmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m,
747 changes, stat, fp) 748 changes, stat, fp)
748 749
749 def mergeone(self, repo, mergeq, head, patch, rev, diffopts): 750 def mergeone(self, repo, mergeq, head, patch, rev, diffopts):
750 # first try just applying the patch 751 # first try just applying the patch
751 (err, n) = self.apply(repo, [patch], update_status=False, 752 (err, n) = self.apply(repo, [patch], update_status=False,
752 strict=True, merge=rev) 753 strict=True, merge=rev)