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

templatekw: compare target context and its parent exactly (issue4690)...

templatekw: compare target context and its parent exactly (issue4690) Before this patch, template keywords `{file_mods}`, `{file_adds}` and `{file_dels}` use values gotten by `repo.status(ctx.p1().node(), ctx.node())`. But this doesn't work as expected if `ctx` is `memctx` or `workingcommitctx`. Typical case of templating with these contexts is customization of the text shown in the commit message editor by `[committemplate]` configuration. In this case, `ctx.node()` returns None and it causes comparison between `ctx.p1()` and `workingctx`. `workingctx` lists up all changed files in the working directory even at selective committing. BTW, `{files}` uses `ctx.files()` and it works as expected. To compare target context and its parent exactly, this patch passes `ctx.p1()` and `ctx` without `node()`-nize. This avoids unexpected comparison with `workingctx`. This patch uses a little redundant template configurations in `test-commit.t`, but they are needed to avoid regression around problems fixed by and 1e6fb8db666e: accessing on `ctx` may break `ctx._status` field.

Augie Fackler - - Load All Authors

File last commit:

r25186:80c5b266 default


                r25392:ed18f4ac

3.4.1 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()