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

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r46132:feffeb18

default

Download file

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

      # 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

      def getstack(repo, rev=None):

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

          not None or the current working directory parent.

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

          the revision and are not merges.

          """

          if rev is None:

              rev = b'.'

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

          revisions = repo.revs(revspec, rev)

          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

				# 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


				def getstack(repo, rev=None):
				"""return a sorted smartrev of the stack containing either rev if it is
				not None or the current working directory parent.

				The stack will always contain all drafts changesets which are ancestors to
				the revision and are not merges.
				"""
				if rev is None:
				rev = b'.'

				revspec = b'only(%s) and not public() and not ::merge()'
				revisions = repo.revs(revspec, rev)
				revisions.sort()
				return revisions