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

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r25590:183965a0

default

Download file

             strutil.py
        
                    34 lines
            
             | 913 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / strutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # strutil.py - string utilities for Mercurial

      #

      # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>

      #

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

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

      def findall(haystack, needle, start=0, end=None):

          if end is None:

              end = len(haystack)

          if end < 0:

              end += len(haystack)

          if start < 0:

              start += len(haystack)

          while start < end:

              c = haystack.find(needle, start, end)

              if c == -1:

                  break

              yield c

              start = c + 1

      def rfindall(haystack, needle, start=0, end=None):

          if end is None:

              end = len(haystack)

          if end < 0:

              end += len(haystack)

          if start < 0:

              start += len(haystack)

          while end >= 0:

              c = haystack.rfind(needle, start, end)

              if c == -1:

                  break

              yield c

              end = c - 1

	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

				# strutil.py - string utilities for Mercurial
				#
				# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				def findall(haystack, needle, start=0, end=None):
				if end is None:
				end = len(haystack)
				if end < 0:
				end += len(haystack)
				if start < 0:
				start += len(haystack)
				while start < end:
				c = haystack.find(needle, start, end)
				if c == -1:
				break
				yield c
				start = c + 1

				def rfindall(haystack, needle, start=0, end=None):
				if end is None:
				end = len(haystack)
				if end < 0:
				end += len(haystack)
				if start < 0:
				start += len(haystack)
				while end >= 0:
				c = haystack.rfind(needle, start, end)
				if c == -1:
				break
				yield c
				end = c - 1