mercurial: comparison mercurial/logcmdutil.py

equal deleted inserted replaced

-:7625b4f7db70
+:b0014780c7fc
 tempnode2 = None
 submatch = matchmod.subdirmatcher(subpath, match)
 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
 stat=stat, fp=fp, prefix=prefix)
-def _changesetlabels(ctx):
+def changesetlabels(ctx):
 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
 if ctx.obsolete():
 labels.append('changeset.obsolete')
 if ctx.isunstable():
 labels.append('changeset.unstable')
 for instability in ctx.instabilities():
 labels.append('instability.%s' % instability)
 return ' '.join(labels)
-class changeset_printer(object):
+class changesetprinter(object):
 '''show changeset information when templating not requested.'''
 def __init__(self, ui, repo, matchfn, diffopts, buffered):
 self.ui = ui
 self.repo = repo
 label='log.node')
 return
 columns = self._columns
 self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
-label=_changesetlabels(ctx))
+label=changesetlabels(ctx))
 # branches are shown first before any other names due to backwards
 # compatibility
 branch = ctx.branch()
 # don't show the default branch name
 match=matchfn, stat=False,
 hunksfilterfn=hunksfilterfn)
 if stat or diff:
 self.ui.write("\n")
-class jsonchangeset(changeset_printer):
+class jsonchangeset(changesetprinter):
 '''format changeset information.'''
 def __init__(self, ui, repo, matchfn, diffopts, buffered):
-changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
+changesetprinter.__init__(self, ui, repo, matchfn, diffopts, buffered)
 self.cache = {}
 self._first = True
 def close(self):
 if not self._first:
 match=matchfn, stat=False)
 self.ui.write((',\n  "diff": "%s"') % j(self.ui.popbuffer()))
 self.ui.write("\n }")
-class changeset_templater(changeset_printer):
+class changesettemplater(changesetprinter):
 '''format changeset information.
 Note: there are a variety of convenience functions to build a
-changeset_templater for common cases. See functions such as:
+changesettemplater for common cases. See functions such as:
-makelogtemplater, show_changeset, buildcommittemplate, or other
+makelogtemplater, changesetdisplayer, buildcommittemplate, or other
 functions that use changesest_templater.
 '''
 # Arguments before "buffered" used to be positional. Consider not
 # adding/removing arguments before "buffered" to not break callers.
 def __init__(self, ui, repo, tmplspec, matchfn=None, diffopts=None,
 buffered=False):
 diffopts = diffopts or {}
-changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
+changesetprinter.__init__(self, ui, repo, matchfn, diffopts, buffered)
 tres = formatter.templateresources(ui, repo)
 self.t = formatter.loadtemplater(ui, tmplspec,
 defaults=templatekw.keywords,
 resources=tres,
 cache=templatekw.defaulttempl)
 def close(self):
 if self._parts['docfooter']:
 if not self.footer:
 self.footer = ""
 self.footer += templater.stringify(self.t(self._parts['docfooter']))
-return super(changeset_templater, self).close()
+return super(changesettemplater, self).close()
 def _show(self, ctx, copies, matchfn, hunksfilterfn, props):
 '''show a single changeset or file revision'''
 props = props.copy()
 props['ctx'] = ctx
 return logtemplatespec(None, None)
 return formatter.lookuptemplate(ui, 'changeset', tmpl)
 def makelogtemplater(ui, repo, tmpl, buffered=False):
-"""Create a changeset_templater from a literal template 'tmpl'
+"""Create a changesettemplater from a literal template 'tmpl'
 byte-string."""
 spec = logtemplatespec(tmpl, None)
-return changeset_templater(ui, repo, spec, buffered=buffered)
+return changesettemplater(ui, repo, spec, buffered=buffered)
-def show_changeset(ui, repo, opts, buffered=False):
+def changesetdisplayer(ui, repo, opts, buffered=False):
 """show one changeset using template or regular display.
 Display format will be the first non-empty hit of:
 1. option 'template'
 2. option 'style'
 3. [ui] setting 'logtemplate'
 4. [ui] setting 'style'
 If all of these values are either the unset or the empty string,
-regular display via changeset_printer() is done.
+regular display via changesetprinter() is done.
 """
 # options
 match = None
 if opts.get('patch') or opts.get('stat'):
 match = scmutil.matchall(repo)
 return jsonchangeset(ui, repo, match, opts, buffered)
 spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style'))
 if not spec.ref and not spec.tmpl and not spec.mapfile:
-return changeset_printer(ui, repo, match, opts, buffered)
+return changesetprinter(ui, repo, match, opts, buffered)
-return changeset_templater(ui, repo, spec, match, opts, buffered)
+return changesettemplater(ui, repo, spec, match, opts, buffered)
 def _makelogmatcher(repo, revs, pats, opts):
 """Build matcher and expanded patterns from log options
 If --follow, revs are the revisions to follow from.
 if not spec:
 return templatekw.showgraphnode  # fast path for "{graphnode}"
 spec = templater.unquotestring(spec)
 tres = formatter.templateresources(ui)
-if isinstance(displayer, changeset_templater):
+if isinstance(displayer, changesettemplater):
 tres['cache'] = displayer.cache  # reuse cache of slow templates
 templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
 resources=tres)
 def formatnode(repo, ctx):
 props = {'ctx': ctx, 'repo': repo, 'revcache': {}}
 if opts.get('rev'):
 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
 ui.pager('log')
-displayer = show_changeset(ui, repo, opts, buffered=True)
+displayer = changesetdisplayer(ui, repo, opts, buffered=True)
 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed,
 filematcher)
 def checkunsupportedgraphflags(pats, opts):
 for op in ["newest_first"]:

changeset 35886	b0014780c7fc
parent 35885	7625b4f7db70
child 35887	572f36e9a780