evolve: hgext3rd/evolve/obshistory.py annotate

annotate hgext3rd/evolve/obshistory.py @ 2591:1991935fb603

obsfate: add a new obsfate template The obsfate template display for each obsolete changeset a line summarizing what changed between the changeset and its successors. This dict is computed in obshistory._preparesuccessorset. It uses obshistory.FORMATSSETSFUNCTIONS which is a list of function that individually compute a part of each dict. You can override fields or add new ones by adding your own function in this list. The format of obsfate is computed in templatekw.obsfatedefaulttempl and can be wrapped if necessary, the code is not quite extendable for the moment but can be refactored later.

author	Boris Feld <boris.feld@octobus.net>
date	Fri, 09 Jun 2017 00:52:54 +0100
parents	6e2d56e8f673
children	fb33d856d25e

rev	line source
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	1 # Code dedicated to display and exploration of the obsolescence history
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	2 #
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	3 # This module content aims at being upstreamed enventually.
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	4 #
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	5 # Copyright 2017 Octobus SAS <contact@octobus.net>
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	6 #
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	7 # This software may be used and distributed according to the terms of the
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	8 # GNU General Public License version 2 or any later version.
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	9
2522 a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	10 import re
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	11
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	12 from mercurial import (
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	13 cmdutil,
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	14 commands,
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	15 error,
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	16 graphmod,
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	17 obsolete,
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	18 node as nodemod,
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	19 scmutil,
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	20 )
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	21
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	22 from mercurial.i18n import _
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	23
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	24 from . import (
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	25 exthelper,
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	26 )
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	27
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	28 eh = exthelper.exthelper()
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	29
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	30 @eh.command(
2441 80b5fc054219 evolve: adding longer aliases for olog Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 2418 diff changeset	31 'obslog\|olog',
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	32 [('G', 'graph', True, _("show the revision DAG")),
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	33 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	34 ('a', 'all', False, _('show all related changesets, not only precursors'))
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	35 ] + commands.formatteropts,
2416 23c0bef0b5d4 obshistory: rename the command to "olog" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2415 diff changeset	36 _('hg olog [OPTION]... [REV]'))
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	37 def cmdobshistory(ui, repo, revs, *opts):
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	38 """show the obsolescence history of the specified revisions.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	39
2418 4993d1812311 olog: document the default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2416 diff changeset	40 If no revision range is specified, we display the log for the current
4993d1812311 olog: document the default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2416 diff changeset	41 working copy parent.
4993d1812311 olog: document the default value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2416 diff changeset	42
2415 89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	43 By default this command prints the selected revisions and all its
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	44 precursors. For precursors pointing on existing revisions in the repository,
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	45 it will display revisions node id, revision number and the first line of the
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	46 description. For precursors pointing on non existing revisions in the
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	47 repository (that can happen when exchanging obsolescence-markers), display
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	48 only the node id.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	49
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	50 In both case, for each node, its obsolescence marker will be displayed with
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	51 the obsolescence operation (rewritten or pruned) in addition of the user and
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	52 date of the operation.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	53
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	54 The output is a graph by default but can deactivated with the option '--no-
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	55 graph'.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	56
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	57 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	58 and '+' represents a fork where the changeset from the lines below is a
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	59 parent of the 'o' merge on the same line.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	60
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	61 Paths in the DAG are represented with '\|', '/' and so forth.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	62
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	63 Returns 0 on success.
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	64 """
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	65 revs = list(revs) + opts['rev']
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	66 if not revs:
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	67 revs = ['.']
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	68 revs = scmutil.revrange(repo, revs)
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	69
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	70 if opts['graph']:
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	71 return _debugobshistorygraph(ui, repo, revs, opts)
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	72
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	73 fm = ui.formatter('debugobshistory', opts)
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	74 revs.reverse()
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	75 _debugobshistorysingle(fm, repo, revs)
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	76
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	77 fm.end()
89a5dabbb43d obshistory: move the command into the obshistory module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2411 diff changeset	78
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	79 class obsmarker_printer(cmdutil.changeset_printer):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	80 """show (available) information about a node
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	81
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	82 We display the node, description (if available) and various information
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	83 about obsolescence markers affecting it"""
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	84
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	85 def show(self, ctx, copies=None, matchfn=None, **props):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	86 if self.buffered:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	87 self.ui.pushbuffer(labeled=True)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	88
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	89 changenode = ctx.node()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	90
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	91 fm = self.ui.formatter('debugobshistory', props)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	92 _debugobshistorydisplaynode(fm, self.repo, changenode)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	93
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	94 succs = self.repo.obsstore.successors.get(changenode, ())
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	95
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	96 markerfm = fm.nested("debugobshistory.markers")
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	97 for successor in sorted(succs):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	98 _debugobshistorydisplaymarker(markerfm, self.repo, successor)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	99 markerfm.end()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	100
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	101 markerfm.plain('\n')
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	102
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	103 self.hunk[ctx.node()] = self.ui.popbuffer()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	104 else:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	105 ### graph output is buffered only
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	106 msg = 'cannot be used outside of the graphlog (yet)'
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	107 raise error.ProgrammingError(msg)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	108
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	109 def flush(self, ctx):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	110 ''' changeset_printer has some logic around buffering data
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	111 in self.headers that we don't use
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	112 '''
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	113 pass
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	114
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	115 class missingchangectx(object):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	116 ''' a minimal object mimicking changectx for change contexts
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	117 references by obs markers but not available locally '''
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	118
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	119 def __init__(self, repo, nodeid):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	120 self._repo = repo
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	121 self._node = nodeid
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	122
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	123 def node(self):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	124 return self._node
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	125
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	126 def obsolete(self):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	127 # If we don't have it locally, it's obsolete
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	128 return True
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	129
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	130 def cyclic(graph):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	131 """Return True if the directed graph has a cycle.
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	132 The graph must be represented as a dictionary mapping vertices to
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	133 iterables of neighbouring vertices. For example:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	134
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	135 >>> cyclic({1: (2,), 2: (3,), 3: (1,)})
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	136 True
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	137 >>> cyclic({1: (2,), 2: (3,), 3: (4,)})
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	138 False
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	139
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	140 Taken from: https://codereview.stackexchange.com/a/86067
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	141
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	142 """
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	143 visited = set()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	144 o = object()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	145 path = [o]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	146 path_set = set(path)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	147 stack = [iter(graph)]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	148 while stack:
2411 bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	149 for v in sorted(stack[-1]):
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	150 if v in path_set:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	151 path_set.remove(o)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	152 return path_set
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	153 elif v not in visited:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	154 visited.add(v)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	155 path.append(v)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	156 path_set.add(v)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	157 stack.append(iter(graph.get(v, ())))
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	158 break
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	159 else:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	160 path_set.remove(path.pop())
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	161 stack.pop()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	162 return False
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	163
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	164 def _obshistorywalker(repo, revs, walksuccessors=False):
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	165 """ Directly inspired by graphmod.dagwalker,
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	166 walk the obs marker tree and yield
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	167 (id, CHANGESET, ctx, [parentinfo]) tuples
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	168 """
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	169
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	170 # Get the list of nodes and links between them
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	171 candidates, nodesucc, nodeprec = _obshistorywalker_links(repo, revs, walksuccessors)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	172
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	173 # Shown, set of nodes presents in items
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	174 shown = set()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	175
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	176 def isvalidcandidate(candidate):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	177 """ Function to filter candidates, check the candidate succ are
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	178 in shown set
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	179 """
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	180 return nodesucc.get(candidate, set()).issubset(shown)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	181
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	182 # While we have some nodes to show
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	183 while candidates:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	184
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	185 # Filter out candidates, returns only nodes with all their successors
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	186 # already shown
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	187 validcandidates = filter(isvalidcandidate, candidates)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	188
2411 bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	189 # If we likely have a cycle
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	190 if not validcandidates:
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	191 cycle = cyclic(nodesucc)
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	192 assert cycle
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	193
2411 bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	194 # Then choose a random node from the cycle
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	195 breaknode = sorted(cycle)[0]
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	196 # And display it by force
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	197 repo.ui.debug('obs-cycle detected, forcing display of %s\n'
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	198 % nodemod.short(breaknode))
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	199 validcandidates = [breaknode]
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	200
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	201 # Display all valid candidates
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	202 for cand in sorted(validcandidates):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	203 # Remove candidate from candidates set
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	204 candidates.remove(cand)
2411 bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	205 # And remove it from nodesucc in case of future cycle detected
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	206 try:
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	207 del nodesucc[cand]
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	208 except KeyError:
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	209 pass
bd937b7ce7d2 debugobshistory: handle multiple cycles Boris Feld <boris.feld@octobus.net> parents: 2407 diff changeset	210
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	211 shown.add(cand)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	212
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	213 # Add the right changectx class
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	214 if cand in repo:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	215 changectx = repo[cand]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	216 else:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	217 changectx = missingchangectx(repo, cand)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	218
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	219 childrens = [(graphmod.PARENT, x) for x in nodeprec.get(cand, ())]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	220 yield (cand, 'M', changectx, childrens)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	221
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	222 def _obshistorywalker_links(repo, revs, walksuccessors=False):
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	223 """ Iterate the obs history tree starting from revs, traversing
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	224 each revision precursors recursively.
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	225 If walksuccessors is True, also check that every successor has been
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	226 walked, which ends up walking on all connected obs markers. It helps
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	227 getting a better view with splits and divergences.
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	228 Return a tuple of:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	229 - The list of node crossed
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	230 - The dictionnary of each node successors, values are a set
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	231 - The dictionnary of each node precursors, values are a list
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	232 """
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	233 precursors = repo.obsstore.precursors
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	234 successors = repo.obsstore.successors
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	235 nodec = repo.changelog.node
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	236
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	237 # Parents, set of parents nodes seen during walking the graph for node
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	238 nodesucc = dict()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	239 # Childrens
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	240 nodeprec = dict()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	241
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	242 nodes = [nodec(r) for r in revs]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	243 seen = set(nodes)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	244
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	245 # Iterate on each node
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	246 while nodes:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	247 node = nodes.pop()
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	248
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	249 precs = precursors.get(node, ())
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	250
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	251 nodeprec[node] = []
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	252
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	253 for prec in sorted(precs):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	254 precnode = prec[0]
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	255
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	256 # Mark node as prec successor
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	257 nodesucc.setdefault(precnode, set()).add(node)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	258
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	259 # Mark precnode as node precursor
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	260 nodeprec[node].append(precnode)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	261
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	262 # Add prec for future processing if not node already processed
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	263 if precnode not in seen:
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	264 seen.add(precnode)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	265 nodes.append(precnode)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	266
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	267 # Also walk on successors if the option is enabled
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	268 if walksuccessors:
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	269 for successor in successors.get(node, ()):
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	270 for succnodeid in successor[1]:
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	271 if succnodeid not in seen:
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	272 seen.add(succnodeid)
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	273 nodes.append(succnodeid)
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	274
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	275 return sorted(seen), nodesucc, nodeprec
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	276
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	277 def _debugobshistorygraph(ui, repo, revs, opts):
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	278 displayer = obsmarker_printer(ui, repo.unfiltered(), None, opts, buffered=True)
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	279 edges = graphmod.asciiedges
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	280 walker = _obshistorywalker(repo.unfiltered(), revs, opts.get('all', False))
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2463 diff changeset	281 cmdutil.displaygraph(ui, repo, walker, displayer, edges)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2406 diff changeset	282
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	283 def _debugobshistorysingle(fm, repo, revs):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	284 """ Display the obsolescence history for a single revision
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	285 """
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	286 precursors = repo.obsstore.precursors
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	287 successors = repo.obsstore.successors
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	288 nodec = repo.changelog.node
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	289 nodes = [nodec(r) for r in revs]
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	290
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	291 seen = set(nodes)
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	292
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	293 while nodes:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	294 ctxnode = nodes.pop()
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	295
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	296 _debugobshistorydisplaynode(fm, repo, ctxnode)
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	297
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	298 succs = successors.get(ctxnode, ())
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	299
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	300 markerfm = fm.nested("debugobshistory.markers")
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	301 for successor in sorted(succs):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	302 _debugobshistorydisplaymarker(markerfm, repo, successor)
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	303 markerfm.end()
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	304
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	305 precs = precursors.get(ctxnode, ())
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	306 for p in sorted(precs):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	307 # Only show nodes once
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	308 if p[0] not in seen:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	309 seen.add(p[0])
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	310 nodes.append(p[0])
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	311
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	312 def _debugobshistorydisplaynode(fm, repo, node):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	313 if node in repo.unfiltered():
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	314 _debugobshistorydisplayctx(fm, repo.unfiltered()[node])
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	315 else:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	316 _debugobshistorydisplaymissingctx(fm, node)
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	317
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	318 def _debugobshistorydisplayctx(fm, ctx):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	319 shortdescription = ctx.description().splitlines()[0]
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	320
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	321 fm.startitem()
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	322 fm.write('debugobshistory.node', '%s', str(ctx),
2404 c07f752137f4 label: rename 'evolve.short_node' to 'evolve.node' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2403 diff changeset	323 label="evolve.node")
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	324 fm.plain(' ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	325
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	326 fm.write('debugobshistory.rev', '(%d)', int(ctx),
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	327 label="evolve.rev")
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	328 fm.plain(' ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	329
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	330 fm.write('debugobshistory.shortdescription', '%s', shortdescription,
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	331 label="evolve.short_description")
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	332 fm.plain('\n')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	333
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	334 def _debugobshistorydisplaymissingctx(fm, nodewithoutctx):
2406 31255706b591 obshistory: import 'node' as 'nodemod' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	335 hexnode = nodemod.short(nodewithoutctx)
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	336 fm.startitem()
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	337 fm.write('debugobshistory.node', '%s', hexnode,
2404 c07f752137f4 label: rename 'evolve.short_node' to 'evolve.node' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2403 diff changeset	338 label="evolve.node evolve.missing_change_ctx")
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	339 fm.plain('\n')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	340
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	341 def _debugobshistorydisplaymarker(fm, repo, marker):
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	342 succnodes = marker[1]
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	343 date = marker[4]
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	344 metadata = dict(marker[3])
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	345
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	346 fm.startitem()
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	347 fm.plain(' ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	348
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	349 # Detect pruned revisions
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	350 if len(succnodes) == 0:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	351 verb = 'pruned'
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	352 else:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	353 verb = 'rewritten'
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	354
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	355 fm.write('debugobshistory.verb', '%s', verb,
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	356 label="evolve.verb")
2453 ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	357
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	358 effectflag = metadata.get('ef1')
2455 d93a50a9abf5 effectflag: handle invalid data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2454 diff changeset	359 if effectflag is not None:
d93a50a9abf5 effectflag: handle invalid data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2454 diff changeset	360 try:
d93a50a9abf5 effectflag: handle invalid data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2454 diff changeset	361 effectflag = int(effectflag)
d93a50a9abf5 effectflag: handle invalid data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2454 diff changeset	362 except ValueError:
d93a50a9abf5 effectflag: handle invalid data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2454 diff changeset	363 effectflag = None
2453 ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	364 if effectflag:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	365 effect = []
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	366
2456 63be7982d593 effectflag: add a small comment to suggest improvement Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2455 diff changeset	367 # XXX should be a dict
2453 ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	368 if effectflag & DESCCHANGED:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	369 effect.append('description')
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	370 if effectflag & METACHANGED:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	371 effect.append('meta')
2492 c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	372 if effectflag & USERCHANGED:
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	373 effect.append('user')
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	374 if effectflag & DATECHANGED:
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	375 effect.append('date')
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	376 if effectflag & BRANCHCHANGED:
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	377 effect.append('branch')
2453 ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	378 if effectflag & PARENTCHANGED:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	379 effect.append('parent')
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	380 if effectflag & DIFFCHANGED:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	381 effect.append('content')
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	382
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	383 if effect:
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	384 fmteffect = fm.formatlist(effect, 'debugobshistory.effect', sep=', ')
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	385 fm.write('debugobshistory.effect', '(%s)', fmteffect)
ad08aedf25ac obshistory: display informations from the obs marker effect flag Boris Feld <boris.feld@octobus.net> parents: 2450 diff changeset	386
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	387 fm.plain(' by ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	388
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	389 fm.write('debugobshistory.marker_user', '%s', metadata['user'],
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	390 label="evolve.user")
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	391 fm.plain(' ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	392
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	393 fm.write('debugobshistory.marker_date', '(%s)', fm.formatdate(date),
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	394 label="evolve.date")
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	395
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	396 if len(succnodes) > 0:
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	397 fm.plain(' as ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	398
2406 31255706b591 obshistory: import 'node' as 'nodemod' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	399 shortsnodes = (nodemod.short(succnode) for succnode in sorted(succnodes))
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	400 nodes = fm.formatlist(shortsnodes, 'debugobshistory.succnodes', sep=', ')
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	401 fm.write('debugobshistory.succnodes', '%s', nodes,
2404 c07f752137f4 label: rename 'evolve.short_node' to 'evolve.node' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2403 diff changeset	402 label="evolve.node")
2403 1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	403
1b348702d79e obshistory: refactor debugobshistory Boris Feld <boris.feld@octobus.net> parents: diff changeset	404 fm.plain("\n")
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	405
2454 400dbec0849c effetflag: move the flag back with the test of the creation logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2453 diff changeset	406 # logic around storing and using effect flags
400dbec0849c effetflag: move the flag back with the test of the creation logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2453 diff changeset	407 DESCCHANGED = 1 << 0 # action changed the description
2522 a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	408 METACHANGED = 1 << 1 # action change the meta
2454 400dbec0849c effetflag: move the flag back with the test of the creation logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2453 diff changeset	409 PARENTCHANGED = 1 << 2 # action change the parent
400dbec0849c effetflag: move the flag back with the test of the creation logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2453 diff changeset	410 DIFFCHANGED = 1 << 3 # action change diff introduced by the changeset
2492 c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	411 USERCHANGED = 1 << 4 # the user changed
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	412 DATECHANGED = 1 << 5 # the date changed
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	413 BRANCHCHANGED = 1 << 6 # the branch changed
2454 400dbec0849c effetflag: move the flag back with the test of the creation logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2453 diff changeset	414
2522 a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	415 METABLACKLIST = [
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	416 re.compile('^__touch-noise__$'),
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	417 re.compile('^branch$'),
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	418 re.compile('^.*-source$'),
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	419 re.compile('^.*_source$'),
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	420 re.compile('^source$'),
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	421 ]
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	422
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	423 def ismetablacklisted(metaitem):
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	424 """ Check that the key of a meta item (extrakey, extravalue) does not
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	425 match at least one of the blacklist pattern
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	426 """
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	427 metakey = metaitem[0]
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	428 for pattern in METABLACKLIST:
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	429 if pattern.match(metakey):
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	430 return False
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	431
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	432 return True
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	433
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	434 def geteffectflag(relation):
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	435 """compute the effect flag by comparing the source and destination"""
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	436 effects = 0
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	437
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	438 source = relation[0]
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	439
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	440 for changectx in relation[1]:
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	441 # Check if description has changed
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	442 if changectx.description() != source.description():
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	443 effects \|= DESCCHANGED
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	444
2448 66f05d5f4769 effectflag: detect meta changes Boris Feld <boris.feld@octobus.net> parents: 2446 diff changeset	445 # Check if known meta has changed
2492 c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	446 if changectx.user() != source.user():
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	447 effects \|= USERCHANGED
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	448
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	449 if changectx.date() != source.date():
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	450 effects \|= DATECHANGED
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	451
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	452 if changectx.branch() != source.branch():
c9f1118b33d6 effectflag: split effect flag meta Boris Feld <boris.feld@octobus.net> parents: 2490 diff changeset	453 effects \|= BRANCHCHANGED
2448 66f05d5f4769 effectflag: detect meta changes Boris Feld <boris.feld@octobus.net> parents: 2446 diff changeset	454
2522 a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	455 # Check if other meta has changed
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	456 changeextra = changectx.extra().items()
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	457 ctxmeta = filter(ismetablacklisted, changeextra)
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	458
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	459 sourceextra = source.extra().items()
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	460 srcmeta = filter(ismetablacklisted, sourceextra)
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	461
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	462 if ctxmeta != srcmeta:
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	463 effects \|= METACHANGED
a1cc2a0b9f6f effetflag: detect other meta (extra) changes Boris Feld <boris.feld@octobus.net> parents: 2520 diff changeset	464
2449 0b05142117d2 effectflag: detect parent change Boris Feld <boris.feld@octobus.net> parents: 2448 diff changeset	465 # Check if at least one of the parent has changes
0b05142117d2 effectflag: detect parent change Boris Feld <boris.feld@octobus.net> parents: 2448 diff changeset	466 if changectx.parents() != source.parents():
0b05142117d2 effectflag: detect parent change Boris Feld <boris.feld@octobus.net> parents: 2448 diff changeset	467 effects \|= PARENTCHANGED
0b05142117d2 effectflag: detect parent change Boris Feld <boris.feld@octobus.net> parents: 2448 diff changeset	468
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	469 if not _cmpdiff(source, changectx):
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	470 effects \|= DIFFCHANGED
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	471
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	472 return effects
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	473
2520 5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	474 def _prepare_hunk(hunk):
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	475 """Drop all information but the username and patch"""
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	476 cleanunk = []
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	477 for line in hunk.splitlines():
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	478 if line.startswith(b'# User') or not line.startswith(b'#'):
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	479 if line.startswith(b'@@'):
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	480 line = b'@@\n'
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	481 cleanunk.append(line)
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	482 return cleanunk
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	483
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	484 def _getdifflines(iterdiff):
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	485 """return a cleaned up lines"""
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	486 try:
2520 5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	487 lines = iterdiff.next()
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	488 except StopIteration:
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	489 return None
2520 5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	490 return _prepare_hunk(lines)
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	491
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	492 def _cmpdiff(leftctx, rightctx):
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	493 """return True if both ctx introduce the "same diff"
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	494
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	495 This is a first and basic implementation, with many shortcoming.
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	496 """
2548 3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	497
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	498 # Leftctx or right ctx might be filtered, so we need to use the contexts
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	499 # with an unfiltered repository to safely compute the diff
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	500 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()]
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	501 leftdiff = leftunfi.diff(git=1)
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	502 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()]
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	503 rightdiff = rightunfi.diff(git=1)
3fd4b0dca16c effectflag: fix content change detection for filtered revs Boris Feld <boris.feld@octobus.net> parents: 2522 diff changeset	504
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	505 left, right = (0, 0)
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	506 while None not in (left, right):
2520 5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	507 left = _getdifflines(leftdiff)
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	508 right = _getdifflines(rightdiff)
5fb5d096348c effectflag: better diff detection Boris Feld <boris.feld@octobus.net> parents: 2492 diff changeset	509
2450 98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	510 if left != right:
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	511 return False
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	512 return True
98613938d098 effectflag: basic diff change detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2449 diff changeset	513
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	514 @eh.wrapfunction(obsolete, 'createmarkers')
2463 08c552a5eb37 obshistory: be more flexible about createmarkers API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2457 diff changeset	515 def createmarkerswithbits(orig, repo, relations, flag=0, date=None,
08c552a5eb37 obshistory: be more flexible about createmarkers API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2457 diff changeset	516 metadata=None, **kwargs):
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	517 """compute 'effect-flag' and augment the created markers
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	518
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	519 Wrap obsolete.createmarker in order to compute the effect of each
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	520 relationship and store them as flag in the metadata.
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	521
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	522 While we experiment, we store flag in a metadata field. This field is
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	523 "versionned" to easilly allow moving to other meaning for flags.
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	524
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	525 The comparison of description or other infos just before creating the obs
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	526 marker might induce overhead in some cases. However it is a good place to
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	527 start since it automatically makes all markers creation recording more
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	528 meaningful data. In the future, we can introduce way for commands to
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	529 provide precomputed effect to avoid the overhead.
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	530 """
2586 6e2d56e8f673 effectflag: activate effect flag by default Boris Feld <boris.feld@octobus.net> parents: 2548 diff changeset	531 if not repo.ui.configbool('experimental', 'evolution.effect-flags', True):
2463 08c552a5eb37 obshistory: be more flexible about createmarkers API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2457 diff changeset	532 return orig(repo, relations, flag, date, metadata, **kwargs)
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	533 if metadata is None:
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	534 metadata = {}
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	535 tr = repo.transaction('add-obsolescence-marker')
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	536 try:
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	537 for r in relations:
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	538 # Compute the effect flag for each obsmarker
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	539 effect = geteffectflag(r)
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	540
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	541 # Copy the metadata in order to add them, we copy because the
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	542 # effect flag might be different per relation
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	543 m = metadata.copy()
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	544 # we store the effect even if "0". This disctinct markers created
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	545 # without the feature with markers recording a no-op.
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	546 m['ef1'] = "%d" % effect
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	547
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	548 # And call obsolete.createmarkers for creating the obsmarker for real
2463 08c552a5eb37 obshistory: be more flexible about createmarkers API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2457 diff changeset	549 orig(repo, [r], flag, date, m, **kwargs)
2446 4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	550
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	551 tr.close()
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	552 finally:
4b2f4da124a2 effectflag: allow to save effect of change in obsmarkers Boris Feld <boris.feld@octobus.net> parents: 2441 diff changeset	553 tr.release()
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	554
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	555 def _getobsfate(successorssets):
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	556 """ Compute a changeset obsolescence fate based on his successorssets.
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	557 Successors can be the tipmost ones or the immediate ones.
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	558 Returns one fate in the following list:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	559 - pruned
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	560 - diverged
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	561 - superseed
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	562 - superseed_split
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	563 """
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	564
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	565 if len(successorssets) == 0:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	566 # The commit has been pruned
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	567 return 'pruned'
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	568 elif len(successorssets) > 1:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	569 return 'diverged'
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	570 else:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	571 # No divergence, only one set of successors
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	572 successors = successorssets[0]
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	573
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	574 if len(successors) == 1:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	575 return 'superseed'
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	576 else:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	577 return 'superseed_split'
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	578
2490 94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	579 def _getobsfateandsuccs(repo, revnode, successorssets=None):
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	580 """ Return a tuple containing:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	581 - the reason a revision is obsolete (diverged, pruned or superseed)
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	582 - the list of successors short node if the revision is neither pruned
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	583 or has diverged
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	584 """
2490 94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	585 if successorssets is None:
94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	586 successorssets = obsolete.successorssets(repo, revnode)
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	587
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	588 fate = _getobsfate(successorssets)
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	589
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	590 # Apply node.short if we have no divergence
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	591 if len(successorssets) == 1:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	592 successors = [nodemod.short(node_id) for node_id in successorssets[0]]
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	593 else:
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	594 successors = []
2490 94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	595 for succset in successorssets:
94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	596 successors.append([nodemod.short(node_id) for node_id in succset])
2488 1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	597
1bdbe8f55339 refactor: extract obs fate algorithm from _getobsoletereason Boris Feld <boris.feld@octobus.net> parents: 2484 diff changeset	598 return (fate, successors)
2490 94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	599
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	600 def _successorsetdates(successorset, markers):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	601 """returns the max date and the min date of the markers list
2490 94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	602 """
94f171534918 template: update obsfate to be more human friendly Boris Feld <boris.feld@octobus.net> parents: 2488 diff changeset	603
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	604 if not markers:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	605 return {}
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	606
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	607 dates = [m[4] for m in markers]
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	608
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	609 return {
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	610 'min_date': min(dates),
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	611 'max_date': max(dates)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	612 }
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	613
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	614 def _successorsetusers(successorset, markers):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	615 """ Returns a sorted list of markers users without duplicates
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	616 """
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	617 if not markers:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	618 return {}
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	619
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	620 # Check that user is present in meta
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	621 markersmeta = [dict(m[3]) for m in markers]
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	622 users = set(meta.get('user') for meta in markersmeta if meta.get('user'))
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	623
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	624 return {'users': sorted(users)}
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	625
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	626 def _successorsetverb(successorset, markers):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	627 """ Return the verb summarizing the successorset
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	628 """
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	629 # XXX we need to handle prune markers at some point.
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	630 if not markers:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	631 return {'verb': 'pruned'}
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	632
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	633 return {'verb': 'rewritten'}
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	634
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	635 FORMATSSETSFUNCTIONS = [
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	636 _successorsetdates,
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	637 _successorsetusers,
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	638 _successorsetverb
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	639 ]
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	640
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	641 def _successorsetallmarkers(successorset, pathscache):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	642 """compute all successors of a successorset.
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	643
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	644 pathscache must contains all successors starting from selected nodes
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	645 or revision. This way, iterating on each successor, we can take all
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	646 precursors and have the subgraph of all obsmarkers between roots to
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	647 successors.
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	648 """
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	649
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	650 markers = set()
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	651 seen = set()
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	652
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	653 for successor in successorset:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	654 stack = [successor]
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	655
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	656 while stack:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	657 element = stack.pop()
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	658 seen.add(element)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	659 for prec, mark in pathscache.get(element, []):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	660 if prec not in seen:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	661 # Process element precursors
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	662 stack.append(prec)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	663
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	664 if mark not in markers:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	665 markers.add(mark)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	666
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	667 return markers
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	668
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	669 def _preparesuccessorset(successorset, pathscache):
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	670 """ For a successor set, get all related markers, compute the set of user,
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	671 the min date and the max date
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	672 """
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	673 markers = _successorsetallmarkers(successorset, pathscache)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	674
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	675 # Format basic data
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	676 data = {
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	677 "successors": sorted(successorset),
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	678 "markers": sorted(markers)
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	679 }
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	680
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	681 # Call an extensible list of functions to override or add new data
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	682 for function in FORMATSSETSFUNCTIONS:
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	683 data.update(function(successorset, markers))
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	684
1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2586 diff changeset	685 return data

Mercurial > evolve

annotate hgext3rd/evolve/obshistory.py @ 2591:1991935fb603