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

histedit: make histedit aware of obsolescense not stored in state (issue4800)...

histedit: make histedit aware of obsolescense not stored in state (issue4800) Before this change, when histedit exited to interactive session (during edit command for example), user could introduce obsolescence markers that would not be known to histedit. For example, user could've amended one of the commits. The fact of this amendment would not be stored in histedit's state file and later, when histedit would try to process all the replacements, one of the final successors (in histedit's opinion) would turn out to be hidden. This behavior is described in issue4800. This commit fixes it.

Gregory Szorc - - Load All Authors

File last commit:

r25979:b723f05e default


                r28216:eed7d8c0

default

Download file

             strutil.py
        
                    36 lines
            
             | 953 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.

      from __future__ import absolute_import

      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.

				from __future__ import absolute_import

				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