upstream/mercurial-mirror Files · mercurial/stack.py

errors: raise ConfigError on failure to parse config file...

errors: raise ConfigError on failure to parse config file This replaces two raises of `ParseError` by `ConfigError`, which makes it so we get the desired exit code when `ui.detailed-exit-code` is enabled. Because the exceptions include a location, I had to add that to `ConfigError` as well. I considered making `ConfigError` a subclass of `ParseError`, but it doesn't feel like it quite passes the "is-a" test. I used "config error: " as prefix for these errors instead of the previous "hg: parse error: ", which seems a little less accurate now (and, as I've said before, I don't know what the "hg: " part is supposed to signify anyway). I can easily be convinced to change the prefix to something else (including "abort: "). Some of the exceptions raised here mean that we fail to even load the `ui` object in the `dispatch` module. When that happens, we don't know to use detailed exit codes, so some tests (e.g. `test-hgrc.t`) still see exit code 255. I'll try to get back to that later. It should be possible to give detailed exit codes if at least part of the config can be read (e.g. when the system-wide one enables detailed exit codes and the user's config fails to parse). Differential Revision: https://phab.mercurial-scm.org/D9355

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r46506:9dc1351d

default

Download file

             stack.py
        
                    24 lines
            
             | 757 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / stack.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Boris Feld
    
stack: add a new module for stack-related commands...

              r37018
            
      # stack.py - Mercurial functions for stack definition

      #

      #  Copyright Matt Mackall <mpm@selenic.com> and other

      #

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

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

      from __future__ import absolute_import

        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
        Boris Feld
    
stack: add a new module for stack-related commands...

              r37018
            
      def getstack(repo, rev=None):

        Boris Feld
    
stack: return a sorted smartrev by default...

              r37022
            
          """return a sorted smartrev of the stack containing either rev if it is

          not None or the current working directory parent.

        Boris Feld
    
stack: add a new module for stack-related commands...

              r37018
            
          The stack will always contain all drafts changesets which are ancestors to

          the revision and are not merges.

          """

          if rev is None:

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
              rev = b'.'

        Boris Feld
    
stack: add a new module for stack-related commands...

              r37018
            
        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          revspec = b'only(%s) and not public() and not ::merge()'

        av6
    
stack: use repo.revs() instead of revsetlang.formatspec() + scmutil.revrange()...

              r43230
            
          revisions = repo.revs(revspec, rev)

        Boris Feld
    
stack: return a sorted smartrev by default...

              r37022
            
          revisions.sort()

          return revisions

	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

Boris Feld stack: add a new module for stack-related commands...	r37018	# stack.py - Mercurial functions for stack definition
		#
		# Copyright Matt Mackall <mpm@selenic.com> and other
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.

		from __future__ import absolute_import

Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Boris Feld stack: add a new module for stack-related commands...	r37018	def getstack(repo, rev=None):
Boris Feld stack: return a sorted smartrev by default...	r37022	"""return a sorted smartrev of the stack containing either rev if it is
		not None or the current working directory parent.
Boris Feld stack: add a new module for stack-related commands...	r37018
		The stack will always contain all drafts changesets which are ancestors to
		the revision and are not merges.
		"""
		if rev is None:
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	rev = b'.'
Boris Feld stack: add a new module for stack-related commands...	r37018
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	revspec = b'only(%s) and not public() and not ::merge()'
av6 stack: use repo.revs() instead of revsetlang.formatspec() + scmutil.revrange()...	r43230	revisions = repo.revs(revspec, rev)
Boris Feld stack: return a sorted smartrev by default...	r37022	revisions.sort()
		return revisions