Show More
@@ -240,8 +240,8 b' ui::' | |||||
240 | Allow to prompt the user. True or False. Default is True. |
|
240 | Allow to prompt the user. True or False. Default is True. | |
241 | logtemplate;; |
|
241 | logtemplate;; | |
242 | Template string for commands that print changesets. |
|
242 | Template string for commands that print changesets. | |
243 | logmap;; |
|
243 | style;; | |
244 | Template map file for commands that print changesets. |
|
244 | Name of style to use for command output. | |
245 | merge;; |
|
245 | merge;; | |
246 | The conflict resolution program to use during a manual merge. |
|
246 | The conflict resolution program to use during a manual merge. | |
247 | Default is "hgmerge". |
|
247 | Default is "hgmerge". |
@@ -349,7 +349,7 b' class changeset_templater(object):' | |||||
349 |
|
349 | |||
350 | def use_template(self, t): |
|
350 | def use_template(self, t): | |
351 | '''set template string to use''' |
|
351 | '''set template string to use''' | |
352 |
self.t.cache['change |
|
352 | self.t.cache['changeset'] = t | |
353 |
|
353 | |||
354 | def write(self, thing): |
|
354 | def write(self, thing): | |
355 | '''write expanded template. |
|
355 | '''write expanded template. | |
@@ -489,10 +489,10 b' class changeset_templater(object):' | |||||
489 | } |
|
489 | } | |
490 |
|
490 | |||
491 | try: |
|
491 | try: | |
492 |
if self.ui.verbose and 'change |
|
492 | if self.ui.verbose and 'changeset_verbose' in self.t: | |
493 |
key = 'change |
|
493 | key = 'changeset_verbose' | |
494 | else: |
|
494 | else: | |
495 |
key = 'change |
|
495 | key = 'changeset' | |
496 | self.write(self.t(key, **props)) |
|
496 | self.write(self.t(key, **props)) | |
497 | except KeyError, inst: |
|
497 | except KeyError, inst: | |
498 | raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile, |
|
498 | raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile, | |
@@ -578,11 +578,12 b' def show_changeset(ui, repo, opts):' | |||||
578 | else: |
|
578 | else: | |
579 | tmpl = ui.config('ui', 'logtemplate') |
|
579 | tmpl = ui.config('ui', 'logtemplate') | |
580 | if tmpl: tmpl = templater.parsestring(tmpl) |
|
580 | if tmpl: tmpl = templater.parsestring(tmpl) | |
581 |
mapfile = opts.get('style') or ui.config('ui', ' |
|
581 | mapfile = opts.get('style') or ui.config('ui', 'style') | |
582 | if tmpl or mapfile: |
|
582 | if tmpl or mapfile: | |
583 | if mapfile: |
|
583 | if mapfile: | |
584 | if not os.path.isfile(mapfile): |
|
584 | if not os.path.isfile(mapfile): | |
585 | mapname = templater.templatepath(mapfile) |
|
585 | mapname = templater.templatepath('map-cmdline.' + mapfile) | |
|
586 | if not mapname: mapname = templater.templatepath(mapfile) | |||
586 | if mapname: mapfile = mapname |
|
587 | if mapname: mapfile = mapname | |
587 | try: |
|
588 | try: | |
588 | t = changeset_templater(ui, repo, mapfile) |
|
589 | t = changeset_templater(ui, repo, mapfile) |
@@ -76,9 +76,9 b' class templater(object):' | |||||
76 | return |
|
76 | return | |
77 | i = 0 |
|
77 | i = 0 | |
78 | for l in file(mapfile): |
|
78 | for l in file(mapfile): | |
79 |
l = l. |
|
79 | l = l.strip() | |
80 | i += 1 |
|
80 | i += 1 | |
81 |
if l |
|
81 | if not l or l[0] in '#;': continue | |
82 | m = re.match(r'([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$', l) |
|
82 | m = re.match(r'([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$', l) | |
83 | if m: |
|
83 | if m: | |
84 | key, val = m.groups() |
|
84 | key, val = m.groups() |
@@ -1,4 +1,4 b'' | |||||
1 |
change |
|
1 | changeset = '{rev}{tags}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n' | |
2 | start_tags = '[' |
|
2 | start_tags = '[' | |
3 | tag = '{tag},' |
|
3 | tag = '{tag},' | |
4 | last_tag = '{tag}]' |
|
4 | last_tag = '{tag}]' |
@@ -1,10 +1,12 b'' | |||||
1 |
change |
|
1 | changeset = 'changeset: {rev}:{node|short}\n{tags}{short_parents}user: {author}\ndate: {date|date}\nsummary:\n{desc|firstline}\n\n' | |
|
2 | changeset_verbose = 'changeset: {rev}:{node}\n{tags}{parents}{manifest}user: {author}\ndate: {date|date}\nfiles: {files}\n{file_adds}{file_dels}description:\n{desc|strip}\n\n\n' | |||
2 | start_file_adds = 'files+: ' |
|
3 | start_file_adds = 'files+: ' | |
3 | file_add = ' {file_add}' |
|
4 | file_add = ' {file_add}' | |
4 | end_file_adds = '\n' |
|
5 | end_file_adds = '\n' | |
5 | start_file_dels = 'files-: ' |
|
6 | start_file_dels = 'files-: ' | |
6 | file_del = ' {file_del}' |
|
7 | file_del = ' {file_del}' | |
7 | end_file_dels = '\n' |
|
8 | end_file_dels = '\n' | |
|
9 | short_parent = 'parent: {rev}:{node|short}\n' | |||
8 | parent = 'parent: {rev}:{node}\n' |
|
10 | parent = 'parent: {rev}:{node}\n' | |
9 | manifest = 'manifest: {rev}:{node}\n' |
|
11 | manifest = 'manifest: {rev}:{node}\n' | |
10 | tag = 'tag: {tag}\n' |
|
12 | tag = 'tag: {tag}\n' |
General Comments 0
You need to be logged in to leave comments.
Login now