equal
deleted
inserted
replaced
2768 m = templater.templatepath("map-cmdline.default") |
2768 m = templater.templatepath("map-cmdline.default") |
2769 if m: |
2769 if m: |
2770 # template found, check if it is working |
2770 # template found, check if it is working |
2771 err = None |
2771 err = None |
2772 try: |
2772 try: |
2773 templater.templater(m) |
2773 templater.templater.frommapfile(m) |
2774 except Exception as inst: |
2774 except Exception as inst: |
2775 err = inst |
2775 err = inst |
2776 p = None |
2776 p = None |
2777 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err) |
2777 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err) |
2778 else: |
2778 else: |
3679 ui.note("* expanded:\n", templater.prettyformat(newtree), '\n') |
3679 ui.note("* expanded:\n", templater.prettyformat(newtree), '\n') |
3680 |
3680 |
3681 mapfile = None |
3681 mapfile = None |
3682 if revs is None: |
3682 if revs is None: |
3683 k = 'debugtemplate' |
3683 k = 'debugtemplate' |
3684 t = templater.templater(mapfile) |
3684 t = templater.templater() |
3685 t.cache[k] = tmpl |
3685 t.cache[k] = tmpl |
3686 ui.write(templater.stringify(t(k, **props))) |
3686 ui.write(templater.stringify(t(k, **props))) |
3687 else: |
3687 else: |
3688 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl, |
3688 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl, |
3689 mapfile, buffered=False) |
3689 mapfile, buffered=False) |