upstream/mercurial-mirror Files · contrib/tcsh_completion_build.sh

rebase: turn rebase revs into set before filtering obsolete...

rebase: turn rebase revs into set before filtering obsolete When the inhibit extension from mutable-history is enabled, it attempts to iterate over the rebaseset to prevent the nodes being rebased from being marked obsolete. This happens at the same time as rebase's _filterobsoleterevs function trying to iterate over the rebaseset to figure out which ones are obsolete. The two of these iterating over the same revset generatorset cause a 'generator already executing' exception. This is probably a flaw in the revset implementation, since iterating over the same set twice should be supported. This regression was introduced in 5d16ebe7b14, since it changed _filterobsoleterevs to be called before the rebaseset was turned into a set(). For now let’s just make the rebaseset an actual set again before calling that function. This was caught by the inhibit tests. The relevant call stack from test-inhibit.t: File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 285, in _preparenewrebase obsrevs = _filterobsoleterevs(self.repo, rebaseset) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 197, in _filterobsoleterevswrap r = orig(repo, rebasesetrevs, *args, **kwargs) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in _filterobsoleterevs return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/hgext/rebase.py", line 1380, in <genexpr> return set(r for r in revs if repo[r].obsolete()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3079, in _iterordered val2 = next(iter2) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3417, in gen yield nextrev() File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 71, in iterate cl = repo.changelog File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 319, in changelog revs = filterrevs(unfi, self.filtername) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/directaccess.py", line 65, in _computehidden hidden = repoview.filterrevs(repo, 'visible') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 261, in filterrevs repo.filteredrevcache[filtername] = func(repo.unfiltered()) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 175, in computehidden hideable = hideablerevs(repo) File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/repoview.py", line 33, in hideablerevs return obsolete.getrevs(repo, 'obsolete') File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/obsolete.py", line 1097, in getrevs repo.obsstore.caches[name] = cachefuncs[name](repo) File "/data/hgbuild/facebook-hg-rpms/mutable-history/hgext/inhibit.py", line 255, in _computeobsoleteset if getrev(n) not in blacklist: File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3264, in __contains__ return x in self._r1 or x in self._r2 File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3348, in __contains__ for l in self._consumegen(): File "/tmp/hgtests.jgjrN5/install/lib/python/mercurial/revset.py", line 3424, in _consumegen for item in self._gen: ValueError: generator already executing

Gilles Moris - - Load All Authors

File last commit:

r13515:26163257 1.8 stable


                r29610:754f6367

stable

Download file

             tcsh_completion_build.sh
        
                    74 lines
            
             | 1.9 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / tcsh_completion_build.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      #

      # tcsh_completion_build.sh - script to generate tcsh completion

      #

      #

      # Copyright (C) 2005 TK Soh.

      #

      # This is free software; you can redistribute it and/or modify it under

      # the terms of the GNU General Public License as published by the Free

      # Software Foundation; either version 2 of the License, or (at your

      # option) any later version.

      #

      #

      # Description

      # -----------

      # This script generates a tcsh source file to support completion

      # of Mercurial commands and options.

      #

      # Instruction:

      # -----------

      # Run this script to generate the tcsh source file, and source

      # the file to add command completion support for Mercurial.

      #

      #    tcsh% tcsh_completion.sh FILE

      #    tcsh% source FILE

      #

      # If FILE is not specified, tcsh_completion will be generated.

      #

      # Bugs:

      # ----

      # 1. command specific options are not supported

      # 2. hg commands must be specified immediately after 'hg'.

      #

      tcsh_file=${1-tcsh_completion}

      hg_commands=`hg --debug help | \

              sed -e '1,/^list of commands:/d' \

                  -e '/^enabled extensions:/,$d' \

                  -e '/^additional help topics:/,$d' \

                  -e '/^ [^ ]/!d; s/[,:]//g;' | \

              xargs -n5 | \

              sed -e '$!s/$/ \\\\/g; 2,$s/^ */    /g'`

      hg_global_options=`hg -v help | \

              sed -e '1,/global/d;/^ *-/!d; s/ [^- ].*//' | \

              sed -e 's/ *$//; $!s/$/ \\\\/g; 2,$s/^ */    /g'`

      hg_version=`hg version | sed -e '1q'`

      script_name=`basename $0`

      cat > $tcsh_file <<END

      #

      # tcsh completion for Mercurial

      #

      # This file has been auto-generated by $script_name for

      # $hg_version

      #

      # Copyright (C) 2005 TK Soh.

      #

      # This is free software; you can redistribute it and/or modify it under

      # the terms of the GNU General Public License as published by the Free

      # Software Foundation; either version 2 of the License, or (at your

      # option) any later version.

      #

      complete hg \\

        'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \\

        'C/-/($hg_global_options)/' \\

        'p/1/($hg_commands)/'

      END

	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

				#!/bin/sh

				#
				# tcsh_completion_build.sh - script to generate tcsh completion
				#
				#
				# Copyright (C) 2005 TK Soh.
				#
				# This is free software; you can redistribute it and/or modify it under
				# the terms of the GNU General Public License as published by the Free
				# Software Foundation; either version 2 of the License, or (at your
				# option) any later version.
				#
				#
				# Description
				# -----------
				# This script generates a tcsh source file to support completion
				# of Mercurial commands and options.
				#
				# Instruction:
				# -----------
				# Run this script to generate the tcsh source file, and source
				# the file to add command completion support for Mercurial.
				#
				# tcsh% tcsh_completion.sh FILE
				# tcsh% source FILE
				#
				# If FILE is not specified, tcsh_completion will be generated.
				#
				# Bugs:
				# ----
				# 1. command specific options are not supported
				# 2. hg commands must be specified immediately after 'hg'.
				#

				tcsh_file=${1-tcsh_completion}

				hg_commands=`hg --debug help \| \
				sed -e '1,/^list of commands:/d' \
				-e '/^enabled extensions:/,$d' \
				-e '/^additional help topics:/,$d' \
				-e '/^ [^ ]/!d; s/[,:]//g;' \| \
				xargs -n5 \| \
				sed -e '$!s/$/ \\\\/g; 2,$s/^ */ /g'`

				hg_global_options=`hg -v help \| \
				sed -e '1,/global/d;/^ -/!d; s/ [^- ].//' \| \
				sed -e 's/ $//; $!s/$/ \\\\/g; 2,$s/^ / /g'`

				hg_version=`hg version \| sed -e '1q'`

				script_name=`basename $0`

				cat > $tcsh_file <<END
				#
				# tcsh completion for Mercurial
				#
				# This file has been auto-generated by $script_name for
				# $hg_version
				#
				# Copyright (C) 2005 TK Soh.
				#
				# This is free software; you can redistribute it and/or modify it under
				# the terms of the GNU General Public License as published by the Free
				# Software Foundation; either version 2 of the License, or (at your
				# option) any later version.
				#

				complete hg \\
				'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \\
				'C/-/($hg_global_options)/' \\
				'p/1/($hg_commands)/'

				END