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

merge: introduce mergeresult.addfile() and use it...

merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r45839:b442920a

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