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

histedit: suggest "histedit --abort" for inconsistent histedit state...

histedit: suggest "histedit --abort" for inconsistent histedit state Mercurial earlier than 2.7 allows users to do anything other than starting new histedit, even though current histedit is not finished or aborted yet. So, unfinished (and maybe inconsistent now) histedit states may be left and forgotten in repositories. Before this patch, histedit extension shows the message below, when it detects such inconsistent state: abort: REV is not an ancestor of working directory (update to REV or descendant and run "hg histedit --continue" again) But this message is incorrect, unless old Mercurial is re-installed, because Mercurial 2.7 or later disallows users to update the working directory to another revision. This patch changes the hint message to suggest "hg histedit --abort".

Siddharth Agarwal - - Load All Authors

File last commit:

r17773:434e5bd6 default


                r19847:45c30868

stable

Download file

             children.py
        
                    52 lines
            
             | 1.5 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, commands

      from mercurial.commands import templateopts

      from mercurial.i18n import _

      testedwith = 'internal'

      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_:

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

          else:

              ctx = repo[rev]

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

          for cctx in ctx.children():

              displayer.show(cctx)

          displayer.close()

      cmdtable = {

          "children":

              (children,

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

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

               ] + templateopts,

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

      }

      commands.inferrepo += " children"

	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, commands
				from mercurial.commands import templateopts
				from mercurial.i18n import _

				testedwith = 'internal'

				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_:
				ctx = repo.filectx(file_, changeid=rev)
				else:
				ctx = repo[rev]

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

				cmdtable = {
				"children":
				(children,
				[('r', 'rev', '',
				_('show children of the specified revision'), _('REV')),
				] + templateopts,
				_('hg children [-r REV] [FILE]')),
				}

				commands.inferrepo += " children"