Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 35928: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 0c0689a7565e
children 533f04d4cb6d
comparison
equal deleted inserted replaced
35927:572f36e9a780 35928:c8e2d6ed1f9e
26 config, 26 config,
27 encoding, 27 encoding,
28 error, 28 error,
29 exchange, 29 exchange,
30 filemerge, 30 filemerge,
31 logcmdutil,
31 match as matchmod, 32 match as matchmod,
32 node, 33 node,
33 pathutil, 34 pathutil,
34 phases, 35 phases,
35 pycompat, 36 pycompat,
905 node1 = node.bin(self._state[1]) 906 node1 = node.bin(self._state[1])
906 # We currently expect node2 to come from substate and be 907 # We currently expect node2 to come from substate and be
907 # in hex format 908 # in hex format
908 if node2 is not None: 909 if node2 is not None:
909 node2 = node.bin(node2) 910 node2 = node.bin(node2)
910 cmdutil.diffordiffstat(ui, self._repo, diffopts, 911 logcmdutil.diffordiffstat(ui, self._repo, diffopts,
911 node1, node2, match, 912 node1, node2, match,
912 prefix=posixpath.join(prefix, self._path), 913 prefix=posixpath.join(prefix, self._path),
913 listsubrepos=True, **opts) 914 listsubrepos=True, **opts)
914 except error.RepoLookupError as inst: 915 except error.RepoLookupError as inst:
915 self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') 916 self.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
916 % (inst, subrelpath(self))) 917 % (inst, subrelpath(self)))
917 918
918 @annotatesubrepoerror 919 @annotatesubrepoerror