mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:b288b4bb8448
+:74cf2b2f43d4
 class changeset_templater(object):
 '''use templater module to format changeset information.'''
 def __init__(self, ui, repo, mapfile):
-self.t = templater.templater(mapfile, templater.common_filters)
+self.t = templater.templater(mapfile, templater.common_filters,
+cache={'parent': '{rev}:{node|short} ',
+'manifest': '{rev}:{node|short}'})
 self.ui = ui
 self.repo = repo
 def use_template(self, t):
 '''set template string to use'''
-self.t.cache['template'] = t
+self.t.cache['changelog'] = t
 def write(self, thing):
 '''write expanded template.
 uses in-order recursive traverse of iterators.'''
 for t in thing:
 noname = 'no_' + names
 if noname in self.t:
 yield self.t(noname, **args)
 return
 if name not in self.t:
-yield ' '.join(values)
+if isinstance(values[0], str):
+yield ' '.join(values)
+else:
+for v in values:
+yield dict(v, **args)
 return
 startname = 'start_' + names
 if startname in self.t:
 yield self.t(startname, **args)
 vargs = args.copy()
 'rev': rev,
 'tags': showtags,
 }
 try:
-self.write(self.t('template', **props))
+if self.ui.verbose and 'changelog_verbose' in self.t:
+key = 'changelog_verbose'
+else:
+key = 'changelog'
+self.write(self.t(key, **props))
 except KeyError, inst:
 raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile,
 inst.args[0]))
 except SyntaxError, inst:
 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
 description.splitlines()[0])
 self.ui.status("\n")
 def show_changeset(ui, repo, opts):
 '''show one changeset.  uses template or regular display.  caller
-can pass in 'map_file' and 'template' options in opts.'''
+can pass in 'style' and 'template' options in opts.'''
 tmpl = opts.get('template')
 if tmpl:
 tmpl = templater.parsestring(tmpl, quoted=False)
 else:
 tmpl = ui.config('ui', 'logtemplate')
 if tmpl: tmpl = templater.parsestring(tmpl)
-mapfile = opts.get('map_file') or ui.config('ui', 'logmap')
+mapfile = opts.get('style') or ui.config('ui', 'logmap')
 if tmpl or mapfile:
 if mapfile:
 if not os.path.isfile(mapfile):
 mapname = templater.templatepath(mapfile)
 if mapname: mapfile = mapname
 ('u', 'user', None, _('print user who committed change'))],
 _('hg grep [OPTION]... PATTERN [FILE]...')),
 "heads":
 (heads,
 [('b', 'branches', None, _('show branches')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('r', 'rev', '', _('show only heads which are descendants of rev')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg heads [-b] [-r <rev>]')),
 "help": (help_, [], _('hg help [COMMAND]')),
 "identify|id": (identify, [], _('hg identify')),
 "import|patch":
 (import_,
 _('skip check for outstanding uncommitted changes')),
 ('b', 'base', '', _('base path'))],
 _('hg import [-f] [-p NUM] [-b BASE] PATCH...')),
 "incoming|in": (incoming,
 [('M', 'no-merges', None, _('do not show merges')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('n', 'newest-first', None, _('show newest record first')),
 ('p', 'patch', None, _('show patch')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg incoming [-p] [-n] [-M] [SOURCE]')),
 "^init": (init, [], _('hg init [DEST]')),
 "locate":
 (locate,
 [('r', 'rev', '', _('search the repository as it stood at rev')),
 ('b', 'branches', None, _('show branches')),
 ('k', 'keyword', [], _('search for a keyword')),
 ('l', 'limit', '', _('limit number of changes displayed')),
 ('r', 'rev', [], _('show the specified revision or range')),
 ('M', 'no-merges', None, _('do not show merges')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('m', 'only-merges', None, _('show only merges')),
 ('p', 'patch', None, _('show patch')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
 "manifest": (manifest, [], _('hg manifest [REV]')),
 "outgoing|out": (outgoing,
 [('M', 'no-merges', None, _('do not show merges')),
 ('p', 'patch', None, _('show patch')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('n', 'newest-first', None, _('show newest record first')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg outgoing [-p] [-n] [-M] [DEST]')),
 "^parents":
 (parents,
 [('b', 'branches', None, _('show branches')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg parents [-b] [REV]')),
 "paths": (paths, [], _('hg paths [NAME]')),
 "^pull":
 (pull,
 [('u', 'update', None,
 ('a', 'address', '', _('address to use')),
 ('n', 'name', '',
 _('name to show in web pages (default: working dir)')),
 ('', 'pid-file', '', _('name of file to write process ID to')),
 ('', 'stdio', None, _('for remote clients')),
-('t', 'templates', '', _('web templates to use')),
+('', 'templates', '', _('web templates to use')),
 ('', 'style', '', _('template style to use')),
 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
 _('hg serve [OPTION]...')),
 "^status|st":
 (status,
 _('hg tag [-r REV] [OPTION]... NAME')),
 "tags": (tags, [], _('hg tags')),
 "tip":
 (tip,
 [('b', 'branches', None, _('show branches')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('p', 'patch', None, _('show patch')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg [-b] [-p] tip')),
 "unbundle":
 (unbundle,
 [('u', 'update', None,
 _('update the working directory to tip after unbundle'))],
 _('hg unbundle [-u] FILE')),
 "undo": (undo, [], _('hg undo')),
 "^update|up|checkout|co":
 (update,
 [('b', 'branch', '', _('checkout the head of a specific branch')),
-('', 'map-file', '', _('display using template map file')),
+('', 'style', '', _('display using template map file')),
 ('m', 'merge', None, _('allow merging of branches')),
 ('C', 'clean', None, _('overwrite locally modified files')),
 ('f', 'force', None, _('force a merge with outstanding changes')),
-('t', 'template', '', _('display with template'))],
+('', 'template', '', _('display with template'))],
 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
 "verify": (verify, [], _('hg verify')),
 "version": (show_version, [], _('hg version')),
 }

changeset 1913	74cf2b2f43d4
parent 1910	e2fe1953f417
child 1914	a5bf0030df5f