upstream/mercurial-mirror Files · hgext/children.py

templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733)...

templater: parse \"...\" as string for 2.9.2-3.4 compatibility (issue4733) As of Mercurial 3.4, there were several syntax rules to process nested template strings. Unfortunately, they were inconsistent and conflicted each other. a. buildmap() rule - template string is _parsed_ as string, and parsed as template - <\"> is not allowed in nested template: {xs % "{f(\"{x}\")}"} -> parse error - template escaping <\{> is handled consistently: {xs % "\{x}"} -> escaped b. _evalifliteral() rule - template string is _interpreted_ as string, and parsed as template in crafted environment to avoid double processing of escape sequences - <\"> is allowed in nested template: {if(x, "{f(\"{x}\")}")} - <\{> and escape sequences in string literal in nested template are not handled well c. pad() rule - template string is first interpreted as string, and parsed as template, which means escape sequences are processed twice - <\"> is allowed in nested template: {pad("{xs % \"{x}\"}', 10)} Because of the issue of template escaping, issue4714, (in stable) unified the rule (b) to (a). Then, (in default) unified the rule (c) to (b) = (a). But they disabled the following syntax that was somewhat considered valid. {if(rev, "{if(rev, \"{rev}\")}")} {pad("{files % \"{file}\"}", 10)} So, this patch introduces \"...\" literal to work around the escaped-quoted nested template strings. Because this parsing rule exists only for the backward compatibility, it is designed to copy the behavior of old _evalifliteral() as possible. Future patches will introduce a better parsing rule similar to a command substitution of POSIX shells or a string interpolation of Ruby, where extra escapes won't be necessary at all. {pad("{files % "{file}"}", 10)} ~~~~~~~~~~~~~~~~~~ parsed as a template, not as a string Because <\> character wasn't allowed in a template fragment, this patch won't introduce more breakages. But the syntax of nested templates are interpreted differently by people, there might be unknown issues. So if we want, we could instead remove db7463aa080f, and from the stable branch as the bug fixed by these patches existed for longer periods. 554d6fcc3c8, "strip single backslash before quotation mark in quoted template", should be superseded by this patch. I'll remove it later.

Augie Fackler - - Load All Authors

File last commit:

r25186:80c5b266 default


                r25676:ec9c258e

stable

Download file

             children.py
        
                    51 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / children.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Mercurial extension to provide the 'hg children' command

      #

      # Copyright 2007 by Intevation GmbH <intevation@intevation.de>

      #

      # Author(s):

      # Thomas Arendsen Hein <thomas@intevation.de>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      '''command to display child changesets (DEPRECATED)

      This extension is deprecated. You should use :hg:`log -r

      "children(REV)"` instead.

      '''

      from mercurial import cmdutil

      from mercurial.commands import templateopts

      from mercurial.i18n import _

      cmdtable = {}

      command = cmdutil.command(cmdtable)

      testedwith = 'internal'

      @command('children',

          [('r', 'rev', '',

           _('show children of the specified revision'), _('REV')),

          ] + templateopts,

          _('hg children [-r REV] [FILE]'),

          inferrepo=True)

      def children(ui, repo, file_=None, **opts):

          """show the children of the given or working directory revision

          Print the children of the working directory's revisions. If a

          revision is given via -r/--rev, the children of that revision will

          be printed. If a file argument is given, revision in which the

          file was last changed (after the working directory revision or the

          argument to --rev if given) is printed.

          """

          rev = opts.get('rev')

          if file_:

              fctx = repo.filectx(file_, changeid=rev)

              childctxs = [fcctx.changectx() for fcctx in fctx.children()]

          else:

              ctx = repo[rev]

              childctxs = ctx.children()

          displayer = cmdutil.show_changeset(ui, repo, opts)

          for cctx in childctxs:

              displayer.show(cctx)

          displayer.close()

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# Mercurial extension to provide the 'hg children' command
				#
				# Copyright 2007 by Intevation GmbH <intevation@intevation.de>
				#
				# Author(s):
				# Thomas Arendsen Hein <thomas@intevation.de>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''command to display child changesets (DEPRECATED)

				This extension is deprecated. You should use :hg:`log -r
				"children(REV)"` instead.
				'''

				from mercurial import cmdutil
				from mercurial.commands import templateopts
				from mercurial.i18n import _

				cmdtable = {}
				command = cmdutil.command(cmdtable)
				testedwith = 'internal'

				@command('children',
				[('r', 'rev', '',
				_('show children of the specified revision'), _('REV')),
				] + templateopts,
				_('hg children [-r REV] [FILE]'),
				inferrepo=True)
				def children(ui, repo, file_=None, **opts):
				"""show the children of the given or working directory revision

				Print the children of the working directory's revisions. If a
				revision is given via -r/--rev, the children of that revision will
				be printed. If a file argument is given, revision in which the
				file was last changed (after the working directory revision or the
				argument to --rev if given) is printed.
				"""
				rev = opts.get('rev')
				if file_:
				fctx = repo.filectx(file_, changeid=rev)
				childctxs = [fcctx.changectx() for fcctx in fctx.children()]
				else:
				ctx = repo[rev]
				childctxs = ctx.children()

				displayer = cmdutil.show_changeset(ui, repo, opts)
				for cctx in childctxs:
				displayer.show(cctx)
				displayer.close()