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

destupdate: move the check related to the "clean" logic in the function...

destupdate: move the check related to the "clean" logic in the function We want this function to exactly predict the behavior for update. Moreover, we would like to remove all high level behavior logic out of the merge module so this is a step forward. Now that the 'destupdate' function both compute and validate the destination, we can directly use it at the command level, ensuring that the 'hg update' command never call 'merge.update' without a defined destination. This is a first (but significant) step toward having 'merge.update' always feed with a properly validated destination and free of high level logic.

Gregory Szorc - - Load All Authors

File last commit:

r25979:b723f05e default


                r26628:45b86dba

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