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

rebase: don't forward "source" argument to rebase (issue4633)...

rebase: don't forward "source" argument to rebase (issue4633) `hg pull` takes an optional "source" argument to define the path/url to pull from. Under some circumstances, this option could get proxied to rebase and interpretted as the --source argument to rebase, leading to unexpected behavior. In my local environment, "source" always appears in "opts" in pullrebase. However, when attempting to write a test, I couldn't reproduce this. Instead, the source is being captured as a positional argument in "args." I suspect an interaction between **kwargs and an extension is to blame for the differences in behavior. This is why no test has been written. I have tested behavior locally and the patch has the intended side-effect of making `hg pull --rebase` work again.

Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable


                r24870:4ec40a4d

stable

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