Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/stack.py
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626 865efc020c33
parent 48875 6000f5b25c9b
permissions -rw-r--r--
dirstate: remove the python-side whitelist of allowed matchers This whitelist is too permissive because it allows matchers that contain disallowed ones deep inside, for example through `intersectionmatcher`. It is also too restrictive because it doesn't pass through some of the matchers we support, such as `patternmatcher`. It's also unnecessary because unsupported matchers raise `FallbackError` and we fall back anyway. Making this change makes more of the tests use rust code path, and therefore subtly change behavior. For example, rust status in largefiles repos seems to have strange behavior.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
37000
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     1
 
# stack.py - Mercurial functions for stack definition
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     2
 
#
46819
d4ba4d51f85f contributor: change mentions of mpm to olivia
Raphaël Gomès <rgomes@octobus.net>
parents: 43077
diff changeset 
     3
 
#  Copyright Olivia Mackall <olivia@selenic.com> and other
37000
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     4
 
#
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     5
 
# This software may be used and distributed according to the terms of the
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     6
 
# GNU General Public License version 2 or any later version.
40583c7afd63 stack: add a new module for stack-related commands
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     7
 







43075






57875cf423c9
style: run a patched black on a subset of mercurial



Augie Fackler <augie@google.com>


parents: 
42960

diff
changeset




     8









37000






40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




     9


def getstack(repo, rev=None):







37004






68fcc5503ec5
stack: return a sorted smartrev by default



Boris Feld <boris.feld@octobus.net>


parents: 
37000

diff
changeset




    10


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












68fcc5503ec5
stack: return a sorted smartrev by default



Boris Feld <boris.feld@octobus.net>


parents: 
37000

diff
changeset




    11


    not None or the current working directory parent.







37000






40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    12














40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    13


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












40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    14


    the revision and are not merges.












40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    15


    """












40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    16


    if rev is None:







43077






687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals



Augie Fackler <augie@google.com>


parents: 
43075

diff
changeset




    17


        rev = b'.'







37000






40583c7afd63
stack: add a new module for stack-related commands



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    18









43077






687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals



Augie Fackler <augie@google.com>


parents: 
43075

diff
changeset




    19


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







42960






763028fc6a69
stack: use repo.revs() instead of revsetlang.formatspec() + scmutil.revrange()



Anton Shestakov <av6@dwimlabs.net>


parents: 
42698

diff
changeset




    20


    revisions = repo.revs(revspec, rev)







37004






68fcc5503ec5
stack: return a sorted smartrev by default



Boris Feld <boris.feld@octobus.net>


parents: 
37000

diff
changeset




    21


    revisions.sort()












68fcc5503ec5
stack: return a sorted smartrev by default



Boris Feld <boris.feld@octobus.net>


parents: 
37000

diff
changeset




    22


    return revisions














mercurial