hgext3rd/evolve/templatekw.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 23 Jan 2019 15:49:44 -0500
changeset 4368 acfd2b1a6176
parent 4329 798298fda3be
child 4625 a4fde4e3e763
child 4659 4d2f8c99f23a
permissions -rw-r--r--
branching: merge with stable A new version has been released
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
# Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     2
#                Logilab SA        <contact@logilab.fr>
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     3
#                Pierre-Yves David <pierre-yves.david@ens-lyon.org>
519
9825c7da5b54 ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 517
diff changeset
     4
#                Patrick Mezard <patrick@mezard.eu>
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     5
#
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     6
# This software may be used and distributed according to the terms of the
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     7
# GNU General Public License version 2 or any later version.
2485
e6ecd35e99ec refactor: extract templates into a new file
Boris Feld <boris.feld@octobus.net>
parents: 2481
diff changeset
     8
"""evolve templates
2032
dd7e092a854a flake8: update the code sources to fixes a horde of pyflake warnings
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2024
diff changeset
     9
"""
2049
b81d3775006b evolve: move extension metadata in their own module
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2048
diff changeset
    10
2485
e6ecd35e99ec refactor: extract templates into a new file
Boris Feld <boris.feld@octobus.net>
parents: 2481
diff changeset
    11
from . import (
2612
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    12
    error,
2485
e6ecd35e99ec refactor: extract templates into a new file
Boris Feld <boris.feld@octobus.net>
parents: 2481
diff changeset
    13
    exthelper,
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
    14
    obshistory
2485
e6ecd35e99ec refactor: extract templates into a new file
Boris Feld <boris.feld@octobus.net>
parents: 2481
diff changeset
    15
)
617
469befc27b26 detect incompatibility with future mercurial 2.5
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 616
diff changeset
    16
1823
649d7a574c3f evolve: cleanup imports
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1822
diff changeset
    17
from mercurial import (
649d7a574c3f evolve: cleanup imports
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1822
diff changeset
    18
    templatekw,
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
    19
    util
1823
649d7a574c3f evolve: cleanup imports
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1822
diff changeset
    20
)
649d7a574c3f evolve: cleanup imports
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1822
diff changeset
    21
2041
3b6550261614 exthelper: extract into its own submodule
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2032
diff changeset
    22
eh = exthelper.exthelper()
491
6989d8fe4ed2 merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 490
diff changeset
    23
6989d8fe4ed2 merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 490
diff changeset
    24
### template keywords
6989d8fe4ed2 merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 490
diff changeset
    25
3516
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    26
if util.safehasattr(templatekw, 'compatlist'):
4329
798298fda3be exthelper: simplify the ability to register templates
Matt Harbison <matt_harbison@yahoo.com>
parents: 4264
diff changeset
    27
    @eh.templatekeyword('troubles', requires=set(['ctx', 'templ']))
3516
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    28
    def showtroubles(context, mapping):
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    29
        ctx = context.resource(mapping, 'ctx')
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    30
        return templatekw.compatlist(context, mapping, 'trouble',
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    31
                                     ctx.instabilities(), plural='troubles')
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    32
else:
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    33
    # older template API in hg < 4.6
4329
798298fda3be exthelper: simplify the ability to register templates
Matt Harbison <matt_harbison@yahoo.com>
parents: 4264
diff changeset
    34
    @eh.templatekeyword('troubles')
3516
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    35
    def showtroubles(**args):
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    36
        """List of strings. Evolution troubles affecting the changeset
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    37
        (zero or more of "unstable", "divergent" or "bumped")."""
359734049764 compat: register a version of 'troubles' template that works with 4.6 API
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3512
diff changeset
    38
        ctx = args['ctx']
3686
36714eeb51d1 template: drop compatibility layer
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3650
diff changeset
    39
        return templatekw.showlist('trouble', ctx.instabilities(), args,
36714eeb51d1 template: drop compatibility layer
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3650
diff changeset
    40
                                   plural='troubles')
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents: 2485
diff changeset
    41
4255
7661706dc14d compat: drop 4.3 compatiblity code for 'precursors' revset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3974
diff changeset
    42
templatekw.keywords["precursors"] = templatekw.showpredecessors
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    43
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    44
def closestsuccessors(repo, nodeid):
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    45
    """ returns the closest visible successors sets instead.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    46
    """
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    47
    return directsuccessorssets(repo, nodeid)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    48
4256
e7e154b2388b compat: drop 4.3 compatiblity code for 'successors' revset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4255
diff changeset
    49
templatekw.keywords["successors"] = templatekw.showsuccessorssets
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    50
2612
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    51
def _getusername(ui):
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    52
    """the default username in the config or None"""
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    53
    try:
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    54
        return ui.username()
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    55
    except error.Abort: # no easy way to avoid ui raising Abort here :-/
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    56
        return None
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    57
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    58
def obsfatedefaulttempl(ui):
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    59
    """ Returns a dict with the default templates for obs fate
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    60
    """
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    61
    # Prepare templates
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    62
    verbtempl = '{verb}'
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    63
    usertempl = '{if(users, " by {join(users, ", ")}")}'
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    64
    succtempl = '{if(successors, " as ")}{successors}' # Bypass if limitation
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    65
    datetempleq = ' (at {min_date|isodate})'
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    66
    datetemplnoteq = ' (between {min_date|isodate} and {max_date|isodate})'
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    67
    datetempl = '{if(max_date, "{ifeq(min_date, max_date, "%s", "%s")}")}' % (datetempleq, datetemplnoteq)
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    68
2612
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    69
    optionalusertempl = usertempl
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    70
    username = _getusername(ui)
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    71
    if username is not None:
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    72
        optionalusertempl = ('{ifeq(join(users, "\0"), "%s", "", "%s")}'
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    73
                             % (username, usertempl))
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
    74
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    75
    # Assemble them
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    76
    return {
2629
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
    77
        'obsfate_quiet': verbtempl + succtempl,
2832
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2690
diff changeset
    78
        'obsfate': verbtempl + succtempl + optionalusertempl,
07b9fcf8b6d3 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net>
parents: 2690
diff changeset
    79
        'obsfate_verbose': verbtempl + succtempl + usertempl + datetempl,
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    80
    }
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    81
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
    82
def obsfatedata(repo, ctx):
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
    83
    """compute the raw data needed for computing obsfate
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
    84
    Returns a list of dict
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
    85
    """
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
    86
    if not ctx.obsolete():
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
    87
        return None
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
    88
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    89
    successorssets, pathcache = closestsuccessors(repo, ctx.node())
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    90
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    91
    # closestsuccessors returns an empty list for pruned revisions, remap it
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    92
    # into a list containing en empty list for future processing
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    93
    if successorssets == []:
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    94
        successorssets = [[]]
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
    95
2611
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
    96
    succsmap = repo.obsstore.successors
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
    97
    fullsuccessorsets = [] # successor set + markers
2605
7d9608219362 obsfate: rename 'successorsset' to 'sset' in the loop
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2603
diff changeset
    98
    for sset in successorssets:
2611
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
    99
        if sset:
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   100
            markers = obshistory.successorsetallmarkers(sset, pathcache)
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   101
            fullsuccessorsets.append((sset, markers))
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   102
        else:
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   103
            # XXX we do not catch all prune markers (eg rewritten then pruned)
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   104
            # (fix me later)
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   105
            foundany = False
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   106
            for mark in succsmap.get(ctx.node(), ()):
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   107
                if not mark[1]:
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   108
                    foundany = True
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   109
                    fullsuccessorsets.append((sset, [mark]))
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   110
            if not foundany:
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   111
                fullsuccessorsets.append(([], []))
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   112
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   113
    values = []
45f5dbb24684 obsfate: display more data about direct prune markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2610
diff changeset
   114
    for sset, rawmarkers in fullsuccessorsets:
2610
ee37ab3de5f7 obsfate: split markers fetch from successor set annotation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2608
diff changeset
   115
        raw = obshistory.preparesuccessorset(sset, rawmarkers)
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   116
        values.append(raw)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   117
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   118
    return values
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   119
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   120
def obsfatelineprinter(obsfateline, ui):
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   121
    quiet = ui.quiet
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   122
    verbose = ui.verbose
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   123
    normal = not verbose and not quiet
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   124
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   125
    # Build the line step by step
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   126
    line = []
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   127
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   128
    # Verb
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   129
    line.append(obsfateline['verb'])
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   130
3042
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   131
    # Successors
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   132
    successors = obsfateline["successors"]
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   133
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   134
    if successors:
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   135
        fmtsuccessors = map(lambda s: s[:12], successors)
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   136
        line.append(" as %s" % ", ".join(fmtsuccessors))
93ea1d9d6ad3 log: update obsfate output order
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   137
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   138
    # Users
2690
5d839e1f0ce9 template: handle lack of "users" in the obsfate data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2688
diff changeset
   139
    if (verbose or normal) and 'users' in obsfateline:
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   140
        users = obsfateline['users']
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   141
3051
204a6947a920 obsfate: fix user filtering in obsfate-printer
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   142
        if not verbose:
204a6947a920 obsfate: fix user filtering in obsfate-printer
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   143
            # If current user is the only user, do not show anything if not in
204a6947a920 obsfate: fix user filtering in obsfate-printer
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   144
            # verbose mode
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   145
            username = _getusername(ui)
3051
204a6947a920 obsfate: fix user filtering in obsfate-printer
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   146
            if len(users) == 1 and users[0] == username:
204a6947a920 obsfate: fix user filtering in obsfate-printer
Boris Feld <boris.feld@octobus.net>
parents: 2926
diff changeset
   147
                users = None
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   148
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   149
        if users:
3052
3f85f25b36ed obsfate: make the user list more readable
Boris Feld <boris.feld@octobus.net>
parents: 3051
diff changeset
   150
            line.append(" by %s" % ", ".join(users))
2688
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   151
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   152
    # Date
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   153
    if verbose:
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   154
        min_date = obsfateline['min_date']
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   155
        max_date = obsfateline['max_date']
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   156
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   157
        if min_date == max_date:
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   158
            fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   159
            line.append(" (at %s)" % fmtmin_date)
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   160
        else:
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   161
            fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   162
            fmtmax_date = util.datestr(max_date, '%Y-%m-%d %H:%M %1%2')
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   163
            line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   164
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   165
    return "".join(line)
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   166
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   167
def obsfateprinter(obsfate, ui, prefix=""):
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   168
    lines = []
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   169
    for raw in obsfate:
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   170
        lines.append(obsfatelineprinter(raw, ui))
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   171
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   172
    if prefix:
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   173
        lines = [prefix + line for line in lines]
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   174
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   175
    return "\n".join(lines)
b6e50897b94e obsfate: override the default log output
Boris Feld <boris.feld@octobus.net>
parents: 2685
diff changeset
   176
4262
f7cf556e3775 compat: clarify when some conditional are used
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4256
diff changeset
   177
if not util.safehasattr(templatekw, 'obsfateverb'): # <= hg-4.5
4329
798298fda3be exthelper: simplify the ability to register templates
Matt Harbison <matt_harbison@yahoo.com>
parents: 4264
diff changeset
   178
    @eh.templatekeyword("obsfatedata")
3517
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   179
    def showobsfatedata(repo, ctx, **args):
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   180
        # Get the needed obsfate data
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   181
        values = obsfatedata(repo, ctx)
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   182
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   183
        if values is None:
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   184
            return templatekw.showlist("obsfatedata", [], args)
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   185
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   186
        return _showobsfatedata(repo, ctx, values, **args)
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   187
dc31ec3ef042 compat: register a version of 'obsfatedata' template that works with 4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3516
diff changeset
   188
def _showobsfatedata(repo, ctx, values, **args):
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   189
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   190
    # Format each successorset successors list
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   191
    for raw in values:
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   192
        # As we can't do something like
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   193
        # "{join(map(nodeshort, successors), ', '}" in template, manually
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   194
        # create a correct textual representation
2603
23f1c3b9052f template: use hex successors in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2602
diff changeset
   195
        gen = ', '.join(n[:12] for n in raw['successors'])
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   196
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   197
        makemap = lambda x: {'successor': x}
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   198
        joinfmt = lambda d: "%s" % d['successor']
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   199
        raw['successors'] = templatekw._hybrid(gen, raw['successors'], makemap,
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   200
                                               joinfmt)
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   201
2685
008f7cd1fcbe obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net>
parents: 2629
diff changeset
   202
    # And then format them
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   203
    # Insert default obsfate templates
2612
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
   204
    args['templ'].cache.update(obsfatedefaulttempl(repo.ui))
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   205
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   206
    if repo.ui.quiet:
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   207
        name = "obsfate_quiet"
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   208
    elif repo.ui.verbose:
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   209
        name = "obsfate_verbose"
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   210
    elif repo.ui.debugflag:
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   211
        name = "obsfate_debug"
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   212
    else:
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   213
        name = "obsfate"
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   214
2629
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   215
    # Format a single value
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   216
    def fmt(d):
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   217
        nargs = args.copy()
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   218
        nargs.update(d[name])
3644
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   219
        templ = args['templ']
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   220
        # HG 4.6
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   221
        if hasattr(templ, "generate"):
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   222
            return templ.generate(name, nargs)
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   223
        else:
4eea4a3ef11f templatekw: fix templatedata for 46
Boris Feld <boris.feld@octobus.net>
parents: 3606
diff changeset
   224
            return args['templ'](name, **nargs)
2629
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   225
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   226
    # Generate a good enough string representation using templater
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   227
    gen = []
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   228
    for d in values:
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   229
        chunk = fmt({name: d})
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   230
        chunkstr = []
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   231
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   232
        # Empty the generator
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   233
        try:
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   234
            while True:
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   235
                chunkstr.append(chunk.next())
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   236
        except StopIteration:
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   237
            pass
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   238
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   239
        gen.append("".join(chunkstr))
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   240
    gen = "; ".join(gen)
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   241
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
   242
    return templatekw._hybrid(gen, values, lambda x: {name: x}, fmt)
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
   243
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   244
# copy from mercurial.obsolete with a small change to stop at first known changeset.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   245
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   246
def directsuccessorssets(repo, initialnode, cache=None):
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   247
    """return set of all direct successors of initial nodes
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   248
    """
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   249
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   250
    succmarkers = repo.obsstore.successors
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   251
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   252
    # Stack of nodes we search successors sets for
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   253
    toproceed = [initialnode]
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   254
    # set version of above list for fast loop detection
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   255
    # element added to "toproceed" must be added here
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   256
    stackedset = set(toproceed)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   257
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   258
    pathscache = {}
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   259
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   260
    if cache is None:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   261
        cache = {}
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   262
    while toproceed:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   263
        current = toproceed[-1]
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   264
        if current in cache:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   265
            stackedset.remove(toproceed.pop())
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   266
        elif current != initialnode and current in repo:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   267
            # We have a valid direct successors.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   268
            cache[current] = [(current,)]
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   269
        elif current not in succmarkers:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   270
            if current in repo:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   271
                # We have a valid last successors.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   272
                cache[current] = [(current,)]
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   273
            else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   274
                # Final obsolete version is unknown locally.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   275
                # Do not count that as a valid successors
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   276
                cache[current] = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   277
        else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   278
            for mark in sorted(succmarkers[current]):
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   279
                for suc in mark[1]:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   280
                    if suc not in cache:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   281
                        if suc in stackedset:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   282
                            # cycle breaking
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   283
                            cache[suc] = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   284
                        else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   285
                            # case (3) If we have not computed successors sets
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   286
                            # of one of those successors we add it to the
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   287
                            # `toproceed` stack and stop all work for this
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   288
                            # iteration.
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   289
                            pathscache.setdefault(suc, []).append((current, mark))
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   290
                            toproceed.append(suc)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   291
                            stackedset.add(suc)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   292
                            break
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   293
                else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   294
                    continue
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   295
                break
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   296
            else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   297
                succssets = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   298
                for mark in sorted(succmarkers[current]):
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   299
                    # successors sets contributed by this marker
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   300
                    markss = [[]]
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   301
                    for suc in mark[1]:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   302
                        # cardinal product with previous successors
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   303
                        productresult = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   304
                        for prefix in markss:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   305
                            for suffix in cache[suc]:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   306
                                newss = list(prefix)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   307
                                for part in suffix:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   308
                                    # do not duplicated entry in successors set
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   309
                                    # first entry wins.
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   310
                                    if part not in newss:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   311
                                        newss.append(part)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   312
                                productresult.append(newss)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   313
                        markss = productresult
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   314
                    succssets.extend(markss)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   315
                # remove duplicated and subset
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   316
                seen = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   317
                final = []
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   318
                candidate = sorted(((set(s), s) for s in succssets if s),
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   319
                                   key=lambda x: len(x[1]), reverse=True)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   320
                for setversion, listversion in candidate:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   321
                    for seenset in seen:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   322
                        if setversion.issubset(seenset):
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   323
                            break
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   324
                    else:
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   325
                        final.append(listversion)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   326
                        seen.append(setversion)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   327
                final.reverse() # put small successors set first
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   328
                cache[current] = final
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   329
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2528
diff changeset
   330
    return cache[initialnode], pathscache