mutable-history: hgext/obsolete.py annotate

annotate hgext/obsolete.py @ 332:36e2016d6563 stable

obsolete: public changeset are no longer latecomer. They are plain duplicate.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Wed, 27 Jun 2012 17:21:24 +0200
parents	41ba89f0caa5
children	fb83210bce32

rev	line source
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1 # obsolete.py - introduce the obsolete concept in mercurial.
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2 #
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3 # Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4 # Logilab SA <contact@logilab.fr>
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	5 #
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	6 # This software may be used and distributed according to the terms of the
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	7 # GNU General Public License version 2 or any later version.
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	8 """Introduce the Obsolete concept to mercurial
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	9
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	10 General concept
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	11 ===============
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	12
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	13 This extension introduces the obsolete concept. It adds a new obsolete
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	14 relation between two changesets. A relation ``<changeset B> obsolete <changeset
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	15 A>`` is set to denote that ``<changeset B>`` is new version of ``<changeset
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	16 A>``.
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	17
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	18 The obsolete relation act as a perpendicular history to the standard
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	19 changeset history. Standard changeset history versions files. The obsolete
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	20 relation versions changesets.
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	21
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	22 :obsolete: a changeset that has been replaced by another one.
5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	23 :unstable: a changeset that is not obsolete but has an obsolete ancestor.
85 531058dbd703 [obsolete] vocabulary update suggestion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 84 diff changeset	24 :suspended: an obsolete changeset with unstable descendant.
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	25 :extinct: an obsolete changeset without unstable descendant.
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	26 (subject to garbage collection)
85 531058dbd703 [obsolete] vocabulary update suggestion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 84 diff changeset	27
531058dbd703 [obsolete] vocabulary update suggestion Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 84 diff changeset	28 Another name for unstable could be out of sync.
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	29
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	30
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	31 Usage and Feature
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	32 =================
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	33
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	34 Display and Exchange
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	35 --------------------
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	36
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	37 obsolete changesets are hidden. (except if they have non obsolete changeset)
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	38
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	39 obsolete changesets are not exchanged. This will probably change later but it
5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	40 was the simpler solution for now.
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	41
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	42 New commands
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	43 ------------
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	44
275 336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	45 Note that rebased changesets are not marked obsolete rather than being stripped
336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	46 In this experimental extensions, this is done forcing the --keep option. Trying
336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	47 to use the --keep option of rebase with this extensionn this experimental
336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	48 extension will cause such a call to abort. Until better releasen please use
336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	49 graft command to rebase and copy changesets.
336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	50
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	51 Context object
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	52 --------------
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	53
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	54 Context gains a ``obsolete`` method that will return True if a changeset is
5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	55 obsolete False otherwise.
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	56
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	57 revset
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	58 ------
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	59
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	60 Add an ``obsolete()`` entry.
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	61
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	62 repo extension
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	63 --------------
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	64
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	65 To Do
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	66 ~~~~~
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	67
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	68 - refuse to obsolete published changesets
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	69
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	70 - handle split
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	71
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	72 - handle conflict
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	73
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	74 - handle unstable // out of sync
69 aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	75
aee53d546849 [obsolete] update doc Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 58 diff changeset	76 """
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	77
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	78 import os
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	79 try:
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	80 from cStringIO import StringIO
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	81 except ImportError:
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	82 from StringIO import StringIO
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	83
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 74 diff changeset	84 from mercurial.i18n import _
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	85
89 757153438e58 [obsolet] base64 encore obsolete rel for pushkey Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	86 import base64
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	87 import json
89 757153438e58 [obsolet] base64 encore obsolete rel for pushkey Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	88
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	89 from mercurial import util
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	90 from mercurial import context
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	91 from mercurial import revset
40 b9a5a596d9ef proper computation of hidden changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 39 diff changeset	92 from mercurial import scmutil
42 eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	93 from mercurial import extensions
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	94 from mercurial import pushkey
46 3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	95 from mercurial import discovery
3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	96 from mercurial import error
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	97 from mercurial import commands
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	98 from mercurial import changelog
115 d60eddda9546 add an option to ensure unstable are secret Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 114 diff changeset	99 from mercurial import phases
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	100 from mercurial.node import hex, bin, short, nullid
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	101 from mercurial.lock import release
252 470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	102 from mercurial import localrepo
276 f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	103 from mercurial import cmdutil
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	104 from mercurial import templatekw
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	105
160 24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	106 try:
24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	107 from mercurial.localrepo import storecache
24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	108 storecache('babar') # to trigger import
197 c2d692c8f599 stronger try except for store cache Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 160 diff changeset	109 except (TypeError, ImportError):
160 24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	110 def storecache(*args):
24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	111 return scmutil.filecache(*args, instore=True)
24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	112
24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	113
72 774932a6cc0d [obsolete] rationalize doc header. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 71 diff changeset	114 ### Patch changectx
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	115 #############################
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	116
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	117 def obsolete(ctx):
37 9493ffa68633 Documentation ! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	118 """is the changeset obsolete by other"""
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	119 if ctx.node()is None:
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	120 return False
112 eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 109 diff changeset	121 return bool(ctx._repo.obsoletedby(ctx.node())) and ctx.phase()
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	122
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	123 context.changectx.obsolete = obsolete
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	124
148 8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	125 def unstable(ctx):
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	126 """is the changeset unstable (have obsolete ancestor)"""
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	127 if ctx.node() is None:
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	128 return False
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	129 return ctx.rev() in ctx._repo._unstableset
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	130
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	131 context.changectx.unstable = unstable
8e93e1f67205 obsolete: define an unstable property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 144 diff changeset	132
213 ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	133 def extinct(ctx):
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	134 """is the changeset extinct by other"""
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	135 if ctx.node() is None:
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	136 return False
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	137 return ctx.rev() in ctx._repo._extinctset
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	138
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	139 context.changectx.extinct = extinct
ea4aa1890b16 obsolete: add an extinct property on context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 212 diff changeset	140
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	141 def latecomer(ctx):
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	142 """is the changeset latecomer (Try to succeed to public change)"""
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	143 if ctx.node() is None:
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	144 return False
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	145 return ctx.rev() in ctx._repo._latecomerset
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	146
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	147 context.changectx.latecomer = latecomer
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	148
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	149
72 774932a6cc0d [obsolete] rationalize doc header. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 71 diff changeset	150 ### revset
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	151 #############################
b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	152
321 41ba89f0caa5 obsolete: add an hidden revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	153 def revsethidden(repo, subset, x):
41ba89f0caa5 obsolete: add an hidden revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	154 """hidden changesets"""
41ba89f0caa5 obsolete: add an hidden revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	155 args = revset.getargs(x, 0, 0, 'hidden takes no argument')
41ba89f0caa5 obsolete: add an hidden revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	156 return [r for r in subset if r in repo.changelog.hiddenrevs]
112 eae9be0ee00e adapt obsolete to phase. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 109 diff changeset	157
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	158 def revsetobsolete(repo, subset, x):
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	159 """obsolete changesets"""
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	160 args = revset.getargs(x, 0, 0, 'obsolete takes no argument')
252 470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	161 return [r for r in subset if r in repo._obsoleteset and repo._phasecache.phase(repo, r) > 0]
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	162
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	163 # XXX Backward compatibility, to be removed once stabilized
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	164 if '_phasecache' not in vars(localrepo.localrepository): # new api
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	165 def revsetobsolete(repo, subset, x):
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	166 """obsolete changesets"""
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	167 args = revset.getargs(x, 0, 0, 'obsolete takes no argument')
470232cea503 [obsolete] fix new api: use the new phase cache api Alain Leufroy <alain.leufroy@logilab.fr> parents: 228 diff changeset	168 return [r for r in subset if r in repo._obsoleteset and repo._phaserev[r] > 0]
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	169
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	170 def revsetunstable(repo, subset, x):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	171 """non obsolete changesets descendant of obsolete one"""
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	172 args = revset.getargs(x, 0, 0, 'unstable takes no arguments')
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	173 return [r for r in subset if r in repo._unstableset]
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	174
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	175 def revsetsuspended(repo, subset, x):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	176 """obsolete changesets with non obsolete descendants"""
310 2d0dc5c18489 [obsolete] fix revset error message Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 308 diff changeset	177 args = revset.getargs(x, 0, 0, 'suspended takes no arguments')
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	178 return [r for r in subset if r in repo._suspendedset]
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	179
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	180 def revsetextinct(repo, subset, x):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	181 """obsolete changesets without obsolete descendants"""
310 2d0dc5c18489 [obsolete] fix revset error message Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 308 diff changeset	182 args = revset.getargs(x, 0, 0, 'extinct takes no arguments')
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	183 return [r for r in subset if r in repo._extinctset]
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	184
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	185 def revsetlatecomer(repo, subset, x):
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	186 """latecomer, Try to succeed to public change"""
310 2d0dc5c18489 [obsolete] fix revset error message Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 308 diff changeset	187 args = revset.getargs(x, 0, 0, 'latecomer takes no arguments')
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	188 return [r for r in subset if r in repo._latecomerset]
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	189
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	190 def _precursors(repo, s):
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	191 """Precursor of a changeset"""
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	192 cs = set()
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	193 nm = repo.changelog.nodemap
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	194 markerbysubj = repo.obsoletestore.subjects
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	195 for r in s:
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	196 for p in markerbysubj.get(repo[r].node(), ()):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	197 pr = nm.get(p['object'])
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	198 if pr is not None:
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	199 cs.add(pr)
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	200 return cs
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	201
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	202 def revsetprecursors(repo, subset, x):
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	203 """precursors of a subset"""
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	204 s = revset.getset(repo, range(len(repo)), x)
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	205 cs = _precursors(repo, s)
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	206 return [r for r in subset if r in cs]
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	207
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	208 def _allprecursors(repo, s): # XXX we need a better naming
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	209 """transitive precursors of a subset"""
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	210 toproceed = [repo[r].node() for r in s]
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	211 seen = set()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	212 allsubjects = repo.obsoletestore.subjects
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	213 while toproceed:
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	214 nc = toproceed.pop()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	215 for mark in allsubjects.get(nc, ()):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	216 np = mark['object']
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	217 if np not in seen:
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	218 seen.add(np)
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	219 toproceed.append(np)
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	220 nm = repo.changelog.nodemap
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	221 cs = set()
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	222 for p in seen:
204 50039b9b535e 2.2 compat: nodemap.get take a single argument now. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 203 diff changeset	223 pr = nm.get(p)
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	224 if pr is not None:
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	225 cs.add(pr)
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	226 return cs
f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	227
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	228 def revsetallprecursors(repo, subset, x):
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	229 """obsolete parents"""
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	230 s = revset.getset(repo, range(len(repo)), x)
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	231 cs = _allprecursors(repo, s)
143 0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	232 return [r for r in subset if r in cs]
0599fb01dc41 add an obsolete parent revset and related alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 135 diff changeset	233
306 8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	234 def _successors(repo, s):
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	235 """Successors of a changeset"""
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	236 cs = set()
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	237 nm = repo.changelog.nodemap
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	238 markerbyobj = repo.obsoletestore.objects
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	239 for r in s:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	240 for p in markerbyobj.get(repo[r].node(), ()):
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	241 for sub in p['subjects']:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	242 sr = nm.get(sub)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	243 if sr is not None:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	244 cs.add(sr)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	245 return cs
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	246
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	247 def revsetsuccessors(repo, subset, x):
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	248 """successors of a subset"""
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	249 s = revset.getset(repo, range(len(repo)), x)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	250 cs = _successors(repo, s)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	251 return [r for r in subset if r in cs]
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	252
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	253 def _allsuccessors(repo, s): # XXX we need a better naming
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	254 """transitive successors of a subset"""
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	255 toproceed = [repo[r].node() for r in s]
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	256 seen = set()
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	257 allobjects = repo.obsoletestore.objects
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	258 while toproceed:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	259 nc = toproceed.pop()
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	260 for mark in allobjects.get(nc, ()):
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	261 for sub in mark['subjects']:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	262 if sub not in seen:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	263 seen.add(sub)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	264 toproceed.append(sub)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	265 nm = repo.changelog.nodemap
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	266 cs = set()
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	267 for s in seen:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	268 sr = nm.get(s)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	269 if sr is not None:
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	270 cs.add(sr)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	271 return cs
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	272
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	273 def revsetallsuccessors(repo, subset, x):
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	274 """obsolete parents"""
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	275 s = revset.getset(repo, range(len(repo)), x)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	276 cs = _allsuccessors(repo, s)
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	277 return [r for r in subset if r in cs]
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	278
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	279
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	280 ### template keywords
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	281 #####################
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	282
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	283 def obsoletekw(repo, ctx, templ, **args):
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	284 """:obsolete: String. The obsolescence level of the node, could be
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	285 ``stable``, ``unstable``, ``suspended`` or ``extinct``.
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	286 """
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	287 rev = ctx.rev()
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	288 if rev in repo._extinctset:
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	289 return 'extinct'
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	290 if rev in repo._suspendedset:
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	291 return 'suspended'
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	292 if rev in repo._unstableset:
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	293 return 'unstable'
eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	294 return 'stable'
144 f387658d6d22 Add a bosancestors revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 143 diff changeset	295
71 19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	296 ### Other Extension compat
19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	297 ############################
19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	298
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	299
253 8ee6c5b98d73 [obsolete] fix new api: be more flexible on rebase's buildstate signature Alain Leufroy <alain.leufroy@logilab.fr> parents: 252 diff changeset	300 def buildstate(orig, repo, dest, rebaseset, ags, *kws):
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	301 """wrapper for rebase 's buildstate that exclude obsolete changeset"""
f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	302 rebaseset = repo.revs('%ld - extinct()', rebaseset)
253 8ee6c5b98d73 [obsolete] fix new api: be more flexible on rebase's buildstate signature Alain Leufroy <alain.leufroy@logilab.fr> parents: 252 diff changeset	303 return orig(repo, dest, rebaseset, ags, *kws)
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	304
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	305 def defineparents(orig, repo, rev, target, state, args, *kwargs):
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	306 rebasestate = getattr(repo, '_rebasestate', None)
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	307 if rebasestate is not None:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	308 repo._rebasestate = dict(state)
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	309 repo._rebasetarget = target
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	310 return orig(repo, rev, target, state, args, *kwargs)
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	311
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	312 def concludenode(orig, repo, rev, p1, args, *kwargs):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	313 """wrapper for rebase 's concludenode that set obsolete relation"""
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	314 newrev = orig(repo, rev, p1, args, *kwargs)
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	315 rebasestate = getattr(repo, '_rebasestate', None)
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	316 if rebasestate is not None:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	317 if newrev is not None:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	318 nrev = repo[newrev].rev()
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	319 else:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	320 nrev = p1
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	321 repo._rebasestate[rev] = nrev
71 19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	322 return newrev
19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	323
274 6622a24f3b0f obsolete: fix rebase wrapping Patrick Mezard <patrick@mezard.eu> parents: 273 diff changeset	324 def cmdrebase(orig, ui, repo, args, *kwargs):
311 5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	325
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	326 reallykeep = kwargs.get('keep', False)
275 336210dada95 obsolete: make rebase abort with --keep Patrick Mezard <patrick@mezard.eu> parents: 274 diff changeset	327 kwargs = dict(kwargs)
84 c4cc5f3bcf12 [obsolete] rebase always keep changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 83 diff changeset	328 kwargs['keep'] = True
c4cc5f3bcf12 [obsolete] rebase always keep changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 83 diff changeset	329
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	330 # We want to mark rebased revision as obsolete and set their
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	331 # replacements if any. Doing it in concludenode() prevents
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	332 # aborting the rebase, and is not called with all relevant
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	333 # revisions in --collapse case. Instead, we try to track the
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	334 # rebase state structure by sampling/updating it in
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	335 # defineparents() and concludenode(). The obsolete markers are
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	336 # added from this state after a successful call.
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	337 repo._rebasestate = {}
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	338 repo._rebasetarget = None
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	339 try:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	340 res = orig(ui, repo, args, *kwargs)
311 5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	341 if not reallykeep:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	342 # Filter nullmerge or unrebased entries
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	343 repo._rebasestate = dict(p for p in repo._rebasestate.iteritems()
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	344 if p[1] >= 0)
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	345 if not res and not kwargs.get('abort') and repo._rebasestate:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	346 # Rebased revisions are assumed to be descendants of
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	347 # targetrev. If a source revision is mapped to targetrev
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	348 # or to another rebased revision, it must have been
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	349 # removed.
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	350 targetrev = repo[repo._rebasetarget].rev()
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	351 newrevs = set([targetrev])
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	352 replacements = {}
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	353 for rev, newrev in sorted(repo._rebasestate.items()):
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	354 oldnode = repo[rev].node()
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	355 if newrev not in newrevs:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	356 newnode = repo[newrev].node()
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	357 newrevs.add(newrev)
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	358 else:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	359 newnode = nullid
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	360 replacements[oldnode] = newnode
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	361
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	362 if kwargs.get('collapse'):
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	363 newnodes = set(n for n in replacements.values() if n != nullid)
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	364 if newnodes:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	365 # Collapsing into more than one revision?
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	366 assert len(newnodes) == 1, newnodes
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	367 newnode = newnodes.pop()
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	368 else:
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	369 newnode = nullid
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	370 repo.addcollapsedobsolete(replacements, newnode)
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	371 else:
311 5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	372 for oldnode, newnode in replacements.iteritems():
5eecfda0a5c7 obsolete: enable rebase --keep again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 310 diff changeset	373 repo.addobsolete(newnode, oldnode)
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	374 return res
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	375 finally:
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	376 delattr(repo, '_rebasestate')
05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	377 delattr(repo, '_rebasetarget')
84 c4cc5f3bcf12 [obsolete] rebase always keep changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 83 diff changeset	378
71 19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	379
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	380 def extsetup(ui):
75 d7b11772f0b5 [obsolete] published changeset can't be obsoleted Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 74 diff changeset	381
321 41ba89f0caa5 obsolete: add an hidden revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 320 diff changeset	382 revset.symbols["hidden"] = revsethidden
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	383 revset.symbols["obsolete"] = revsetobsolete
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	384 revset.symbols["unstable"] = revsetunstable
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	385 revset.symbols["suspended"] = revsetsuspended
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	386 revset.symbols["extinct"] = revsetextinct
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	387 revset.symbols["latecomer"] = revsetlatecomer
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	388 revset.symbols["obsparents"] = revsetprecursors # DEPR
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	389 revset.symbols["precursors"] = revsetprecursors
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	390 revset.symbols["obsancestors"] = revsetallprecursors # DEPR
0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	391 revset.symbols["allprecursors"] = revsetallprecursors # bad name
306 8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	392 revset.symbols["successors"] = revsetsuccessors
8cfa3163dfaa obsolete: add precursors and successors revset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 305 diff changeset	393 revset.symbols["allsuccessors"] = revsetallsuccessors # bad name
46 3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	394
299 eda6491ca269 obsolete: add 'obsolete' keyword Patrick Mezard <patrick@mezard.eu> parents: 298 diff changeset	395 templatekw.keywords['obsolete'] = obsoletekw
46 3b0364fc822f Do not propagate obsolete changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 44 diff changeset	396
42 eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	397 try:
eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	398 rebase = extensions.find('rebase')
eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	399 if rebase:
150 f12fd2410a60 obsolete: improve rebase compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 148 diff changeset	400 extensions.wrapfunction(rebase, 'buildstate', buildstate)
282 05ab164c6593 obsolete: handle rebase --collapse Patrick Mezard <patrick@mezard.eu> parents: 279 diff changeset	401 extensions.wrapfunction(rebase, 'defineparents', defineparents)
42 eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	402 extensions.wrapfunction(rebase, 'concludenode', concludenode)
84 c4cc5f3bcf12 [obsolete] rebase always keep changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 83 diff changeset	403 extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
42 eb6a06d7eae3 Make rebase set-obsolete relation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 41 diff changeset	404 except KeyError:
305 0b444d7c5c96 update revset vocabulary to use precursors, successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 304 diff changeset	405 pass # rebase not found
39 b12655157ba0 revset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 38 diff changeset	406
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	407 # Pushkey mechanism for mutable
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	408 #########################################
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	409
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	410 def pushobsolete(repo, key, old, raw):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	411 """push obsolete relation through pushkey"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	412 assert key == "markers"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	413 l = repo.lock()
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	414 try:
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	415 tmp = StringIO()
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	416 tmp.write(raw)
ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	417 tmp.seek(0)
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	418 repo.obsoletestore.load(tmp)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	419 repo.obsoletestore._dirty = True # XXX meh
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	420 return 1
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	421 finally:
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	422 l.release()
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	423
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	424 def listobsolete(repo):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	425 """dump all obsolete relation in
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	426
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	427 XXX this have be improved"""
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	428 tmp = StringIO()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	429 repo.obsoletestore.save(tmp)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	430 return {'markers': base64.b64encode(tmp.getvalue())}
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	431
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	432 pushkey.register('obsolete', pushobsolete, listobsolete)
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	433
214 a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	434 ### Discovery wrapping
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	435 #############################
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	436
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	437 class blist(list, object):
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	438 """silly class to have non False but empty list"""
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	439
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	440 def __nonzero__(self):
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	441 return bool(len(self.orig))
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	442
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	443 def wrapfindcommonoutgoing(orig, repo, args, *kwargs):
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	444 """wrap mercurial.discovery.findcommonoutgoing to remove extinct changeset
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	445
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	446 Such excluded changeset are removed from excluded and will not appear
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	447 are excluded secret changeset.
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	448 """
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	449 outgoing = orig(repo, args, *kwargs)
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	450 orig = outgoing.excluded
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	451 outgoing.excluded = blist(n for n in orig if not repo[n].extinct())
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	452 # when no revision is specified (push everything) a shortcut is taken when
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	453 # nothign was exclude. taking this code path when extinct changeset have
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	454 # been excluded leads to repository corruption.
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	455 outgoing.excluded.orig = orig
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	456 return outgoing
a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	457
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	458 def wrapcheckheads(orig, repo, remote, outgoing, args, *kwargs):
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	459 """wrap mercurial.discovery.checkheads
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	460
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	461 * prevent unstability to be pushed
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	462 * patch remote to ignore obsolete heads on remote
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	463 """
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	464 # do not push instability
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	465 for h in outgoing.missingheads:
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	466 # checking heads only is enought because any thing base on obsolete
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	467 # changeset is either obsolete or unstable.
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	468 ctx = repo[h]
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	469 hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	470 if ctx.unstable():
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	471 raise util.Abort(_("Trying to push unstable changeset: %s!") % ctx,
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	472 hint=hint)
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	473 if ctx.obsolete():
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	474 raise util.Abort(_("Trying to push obsolete changeset: %s!") % ctx,
786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	475 hint=hint)
308 23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	476 if ctx.latecomer():
23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	477 raise util.Abort(_("Trying to push latecomer changeset: %s!") % ctx,
23ef1c71d164 obsolete: detect late comer during push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 307 diff changeset	478 hint=hint)
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	479 ### patch remote branch map
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	480 # do not read it this burn eyes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	481 try:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	482 if 'oldbranchmap' not in vars(remote):
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	483 remote.oldbranchmap = remote.branchmap
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	484 def branchmap():
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	485 newbm = {}
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	486 oldbm = None
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	487 if (util.safehasattr(phases, 'visiblebranchmap')
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	488 and not util.safehasattr(remote, 'ignorevisiblebranchmap')
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	489 ):
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	490 remote.ignorevisiblebranchmap = False
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	491 remote.branchmap = remote.oldbranchmap
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	492 oldbm = phases.visiblebranchmap(remote)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	493 remote.branchmap = remote.newbranchmap
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	494 remote.ignorevisiblebranchmap = True
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	495 if oldbm is None:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	496 oldbm = remote.oldbranchmap()
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	497 for branch, nodes in oldbm.iteritems():
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	498 nodes = list(nodes)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	499 new = set()
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	500 while nodes:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	501 n = nodes.pop()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	502 if n in repo.obsoletestore.objects:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	503 markers = repo.obsoletestore.objects[n]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	504 for mark in markers:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	505 for newernode in mark['subjects']:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	506 if newernode is not None:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	507 nodes.append(newernode)
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	508 else:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	509 new.add(n)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	510 if new:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	511 newbm[branch] = list(new)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	512 return newbm
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	513 remote.ignorevisiblebranchmap = True
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	514 remote.branchmap = branchmap
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	515 remote.newbranchmap = branchmap
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	516 return orig(repo, remote, outgoing, args, *kwargs)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	517 finally:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	518 remote.__dict__.pop('branchmap', None) # restore class one
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	519 remote.__dict__.pop('oldbranchmap', None)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	520 remote.__dict__.pop('newbranchmap', None)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	521 remote.__dict__.pop('ignorevisiblebranchmap', None)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	522
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	523 # eye are still burning
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	524 def wrapvisiblebranchmap(orig, repo):
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	525 ignore = getattr(repo, 'ignorevisiblebranchmap', None)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	526 if ignore is None:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	527 return orig(repo)
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	528 elif ignore:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	529 return repo.branchmap()
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	530 else:
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	531 return None # break recursion
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	532
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	533 def wrapclearcache(orig, repo, args, *kwargs):
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	534 try:
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	535 return orig(repo, args, *kwargs)
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	536 finally:
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	537 repo._clearobsoletecache()
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	538
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	539
71 19e1930587a0 [obsolete] Move extension compat code Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 70 diff changeset	540 ### New commands
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	541 #############################
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	542
276 f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	543 cmdtable = {}
f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	544 command = cmdutil.command(cmdtable)
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	545
276 f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	546 @command('debugobsolete', [], _('SUBJECT OBJECT'))
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	547 def cmddebugobsolete(ui, repo, subject, object):
278 fa0b9b8a83c0 obsolete: add or fix debug commands help Patrick Mezard <patrick@mezard.eu> parents: 277 diff changeset	548 """add an obsolete relation between two nodes
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	549
278 fa0b9b8a83c0 obsolete: add or fix debug commands help Patrick Mezard <patrick@mezard.eu> parents: 277 diff changeset	550 The subject is expected to be a newer version of the object.
fa0b9b8a83c0 obsolete: add or fix debug commands help Patrick Mezard <patrick@mezard.eu> parents: 277 diff changeset	551 """
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	552 lock = repo.lock()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	553 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	554 sub = repo[subject]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	555 obj = repo[object]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	556 repo.addobsolete(sub.node(), obj.node())
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	557 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	558 lock.release()
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	559 return 0
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	560
276 f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	561 @command('debugconvertobsolete', [], '')
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	562 def cmddebugconvertobsolete(ui, repo):
278 fa0b9b8a83c0 obsolete: add or fix debug commands help Patrick Mezard <patrick@mezard.eu> parents: 277 diff changeset	563 """import markers from an .hg/obsolete-relations file"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	564 cnt = 0
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	565 l = repo.lock()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	566 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	567 repo._importoldobsolete = True
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	568 store = repo.obsoletestore
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	569 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	570 f = repo.opener('obsolete-relations')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	571 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	572 for line in f:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	573 subhex, objhex = line.split()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	574 sub = bin(subhex)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	575 obj = bin(objhex)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	576 newmarker = {
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	577 'subjects': (sub==nullid) and [] or [sub],
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	578 'object': obj,
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	579 'date': util.makedate(),
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	580 'user': ui.username(),
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	581 'reason': 'import from older format.',
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	582 }
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	583 store.new(newmarker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	584 store._dirty = True
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	585 cnt += 1
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	586 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	587 f.close()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	588 util.unlink(repo.join('obsolete-relations'))
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	589 except IOError:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	590 ui.warn('nothing to do\n')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	591 pass
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	592 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	593 del repo._importoldobsolete
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	594 l.release()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	595 ui.status('%i obsolete marker converted\n' % cnt)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	596
276 f26e9bc5f7fc obsolete: use new-style command registration Patrick Mezard <patrick@mezard.eu> parents: 275 diff changeset	597 @command('debugsuccessors', [], '')
273 87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	598 def cmddebugsuccessors(ui, repo):
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	599 """dump obsolete changesets and their successors
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	600
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	601 Each line matches an existing marker, the first identifier is the
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	602 obsolete changeset identifier, followed by it successors.
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	603 """
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	604 lock = repo.lock()
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	605 try:
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	606 allsuccessors = repo.obsoletestore.objects
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	607 for old in sorted(allsuccessors):
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	608 successors = [sorted(m['subjects']) for m in allsuccessors[old]]
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	609 for i, group in enumerate(sorted(successors)):
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	610 ui.write('%s' % short(old))
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	611 for new in group:
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	612 ui.write(' %s' % short(new))
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	613 ui.write('\n')
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	614 finally:
87e4d1eec5e8 obsolete: add debugsuccessors command Patrick Mezard <patrick@mezard.eu> parents: 254 diff changeset	615 lock.release()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	616
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	617 ### Altering existing command
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	618 #############################
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	619
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	620 def wrapmayobsoletewc(origfn, ui, repo, args, *opts):
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	621 res = origfn(ui, repo, args, *opts)
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	622 if repo['.'].obsolete():
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	623 ui.warn(_('Working directory parent is obsolete\n'))
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	624 return res
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	625
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	626 def noextinctsvisibleheads(orig, repo):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	627 repo._turn_extinct_secret()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	628 return orig(repo)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	629
320 63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	630 def wrapcmdutilamend(orig, ui, repo, commitfunc, old, args, *kwargs):
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	631 oldnode = old.node()
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	632 new = orig(ui, repo, commitfunc, old, args, *kwargs)
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	633 if new != oldnode:
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	634 lock = repo.lock()
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	635 try:
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	636 newmarker = {
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	637 'subjects': [new],
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	638 'object': oldnode,
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	639 'date': util.makedate(),
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	640 'user': ui.username(),
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	641 'reason': 'commit --amend',
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	642 }
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	643 repo.obsoletestore.new(newmarker)
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	644 repo._clearobsoletecache()
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	645 repo._turn_extinct_secret()
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	646 finally:
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	647 lock.release()
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	648 return new
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	649
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	650 def uisetup(ui):
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	651 extensions.wrapcommand(commands.table, "update", wrapmayobsoletewc)
9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	652 extensions.wrapcommand(commands.table, "pull", wrapmayobsoletewc)
320 63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	653 if util.safehasattr(cmdutil, 'amend'):
63f267bd2176 obsolete: basic commit --amend support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 311 diff changeset	654 extensions.wrapfunction(cmdutil, 'amend', wrapcmdutilamend)
214 a140d1857931 obsolete: do not warn about unpushed extinct changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 213 diff changeset	655 extensions.wrapfunction(discovery, 'findcommonoutgoing', wrapfindcommonoutgoing)
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 215 diff changeset	656 extensions.wrapfunction(discovery, 'checkheads', wrapcheckheads)
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	657 extensions.wrapfunction(phases, 'visibleheads', noextinctsvisibleheads)
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	658 extensions.wrapfunction(phases, 'advanceboundary', wrapclearcache)
218 ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	659 if util.safehasattr(phases, 'visiblebranchmap'):
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 217 diff changeset	660 extensions.wrapfunction(phases, 'visiblebranchmap', wrapvisiblebranchmap)
79 9906560f585e [obsolete] issue a warning when parent of current directory is obsolete. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 75 diff changeset	661
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	662 ### serialisation
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	663 #############################
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	664
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	665 def _obsserialise(obssubrels, flike):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	666 """serialise an obsolete relation mapping in a plain text one
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	667
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	668 this is for subject -> [objects] mapping
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	669
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	670 format is::
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	671
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	672 <subject-full-hex> <object-full-hex>\n"""
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	673 for sub, objs in obssubrels.iteritems():
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	674 for obj in objs:
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	675 if sub is None:
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	676 sub = nullid
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	677 flike.write('%s %s\n' % (hex(sub), hex(obj)))
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	678
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	679 def _obsdeserialise(flike):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	680 """read a file like object serialised with _obsserialise
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	681
c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	682 this desierialize into a {subject -> objects} mapping"""
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	683 rels = {}
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	684 for line in flike:
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	685 subhex, objhex = line.split()
80 5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	686 subnode = bin(subhex)
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	687 if subnode == nullid:
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	688 subnode = None
5d029a358252 [obsolete] add kill support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 79 diff changeset	689 rels.setdefault( subnode, set()).add(bin(objhex))
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	690 return rels
af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	691
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	692 ### diagnostique tools
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	693 #############################
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	694
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	695 def unstables(repo):
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	696 """Return all unstable changeset"""
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	697 return scmutil.revrange(repo, ['obsolete():: and (not obsolete())'])
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	698
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	699 def newerversion(repo, obs):
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	700 """Return the newer version of an obsolete changeset"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	701 toproceed = set([(obs,)])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	702 # XXX known optimization available
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	703 newer = set()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	704 objectrels = repo.obsoletestore.objects
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	705 while toproceed:
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	706 current = toproceed.pop()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	707 assert len(current) <= 1, 'splitting not handled yet. %r' % current
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	708 if current:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	709 n, = current
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	710 if n in objectrels:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	711 markers = objectrels[n]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	712 for mark in markers:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	713 toproceed.add(tuple(mark['subjects']))
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	714 else:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	715 newer.add(tuple(current))
132 64d16f07d67f obsolete: alter newerversion return Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 131 diff changeset	716 else:
64d16f07d67f obsolete: alter newerversion return Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 131 diff changeset	717 newer.add(())
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	718 return sorted(newer)
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	719
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	720 ### obsolete relation storage
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	721 #############################
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	722 def add2set(d, key, mark):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	723 """add <mark> to a `set` in <d>[<key>]"""
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	724 d.setdefault(key, []).append(mark)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	725
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	726 def markerid(marker):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	727 KEYS = ['subjects', "object", "date", "user", "reason"]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	728 for key in KEYS:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	729 assert key in marker
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	730 keys = sorted(marker.keys())
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	731 a = util.sha1()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	732 for key in keys:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	733 if key == 'subjects':
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	734 for sub in sorted(marker[key]):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	735 a.update(sub)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	736 elif key == 'id':
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	737 pass
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	738 else:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	739 a.update(str(marker[key]))
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	740 a.update('\0')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	741 return a.digest()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	742
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	743 class obsoletestore(object):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	744 """Store obsolete relations
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	745
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	746 Relation are stored in three mapping. All mapping have "obsolete markers"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	747 as values::
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	748
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	749 {'id': "unique id of the obsolete marker"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	750 'subjects': "0-N newer version of changeset in "object" (as ordered list)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	751 'object': "old and obsolete version"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	752 'date': "When was this marker created ?"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	753 'user': "Who did that ?"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	754 'reason': "Why was it done"
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	755 }
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	756
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	757 Three keys exists
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	758
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	759 :self._markers: "id" -> marker
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	760
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	761 :self.subjects: "subject" -> set(marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	762
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	763 :self.objects: "object" -> set(marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	764 """
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	765
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	766 def __init__(self):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	767 self._markers = {}
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	768 self.subjects = {}
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	769 self.objects = {}
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	770 self._dirty = False # should be on repo
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	771
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	772 def new(self, marker):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	773 """Add a new marker to the store. computing it's ID"""
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	774 mid = marker['id'] = markerid(marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	775 self._insert(marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	776 self._dirty = True
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	777 return mid
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	778
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	779 def _insert(self, marker):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	780 if marker['id'] not in self._markers:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	781 self._markers[marker['id']] = marker
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	782 add2set(self.objects, marker['object'], marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	783 for subj in marker['subjects']:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	784 add2set(self.subjects, subj, marker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	785
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	786 def save(self, stream):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	787 markers = []
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	788 for mark in self._markers.itervalues():
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	789 jmark = mark.copy()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	790 jmark['id'] = hex(jmark['id'])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	791 jmark['subjects'] = [hex(n) for n in jmark['subjects']]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	792 jmark['object'] = hex(jmark['object'])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	793 markers.append(jmark)
226 0892b91947ef obsolete: export pretty printed json Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 224 diff changeset	794 json.dump(markers, stream, indent=4)
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	795
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	796 def load(self, stream):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	797 for mark in json.load(stream):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	798 mark['id'] = bin(mark['id'])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	799 mark['subjects'] = [bin(n) for n in mark['subjects']]
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	800 mark['object'] = bin(mark['object'])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	801 self._insert(mark)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	802
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	803 def writeobsolete(repo):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	804 """wire obsolete data on disk"""
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	805 f = repo.sopener('obsoletemarkers', 'w', atomictemp=True)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	806 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	807 repo.obsoletestore.save(f)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	808 repo._dirty = False
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	809 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	810 f.close()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	811
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 86 diff changeset	812
86 7f763bada042 [obsolete] code section comment for repo subclassing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 85 diff changeset	813 ### repo subclassing
7f763bada042 [obsolete] code section comment for repo subclassing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 85 diff changeset	814 #############################
7f763bada042 [obsolete] code section comment for repo subclassing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 85 diff changeset	815
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	816 def reposetup(ui, repo):
47 b73b3e3c9560 Don't overwrite non local repo. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	817 if not repo.local():
b73b3e3c9560 Don't overwrite non local repo. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	818 return
b73b3e3c9560 Don't overwrite non local repo. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 46 diff changeset	819
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	820 opull = repo.pull
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	821 opush = repo.push
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	822 olock = repo.lock
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	823 o_rollback = repo._rollback
210 168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	824 o_updatebranchcache = repo.updatebranchcache
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	825
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	826 # /!\ api change in Hg 2.2 (97efd26eb9576f39590812ea9) /!\
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	827 if util.safehasattr(repo, '_journalfiles'): # Hg 2.2
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	828 o_journalfiles = repo._journalfiles
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	829 o_writejournal = repo._writejournal
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	830
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	831
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	832 class obsoletingrepo(repo.__class__):
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	833
53 0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	834 ### Public method
0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	835 def obsoletedby(self, node):
0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	836 """return the set of node that make <node> obsolete (obj)"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	837 others = set()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	838 for marker in self.obsoletestore.objects.get(node, []):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	839 others.update(marker['subjects'])
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	840 return others
53 0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	841
0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	842 def obsolete(self, node):
0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	843 """return the set of node that <node> make obsolete (sub)"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	844 return set(marker['object'] for marker in self.obsoletestore.subjects.get(node, []))
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	845
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	846 @util.propertycache
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	847 def obsoletestore(self):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	848 if not getattr(self, '_importoldobsolete', False):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	849 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	850 f = self.opener('obsolete-relations')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	851 f.close()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	852 raise util.Abort('old format of obsolete marker detected!\n'
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	853 'run `hg debugconvertobsolete` once.')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	854 except IOError:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	855 pass
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	856 store = obsoletestore()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	857 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	858 f = self.sopener('obsoletemarkers')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	859 store.load(f)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	860 except IOError:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	861 pass
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	862 return store
53 0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	863
109 a2e8057117d3 obsolete: smarter initialisation of obsolete stuff from disk. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 95 diff changeset	864 @util.propertycache
a2e8057117d3 obsolete: smarter initialisation of obsolete stuff from disk. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 95 diff changeset	865 def _obsoleteset(self):
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	866 """the set of obsolete revision"""
109 a2e8057117d3 obsolete: smarter initialisation of obsolete stuff from disk. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 95 diff changeset	867 obs = set()
126 c083fb43daee obsolete: stop using rev as it rebuild the cache every time there is a fault Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 125 diff changeset	868 nm = self.changelog.nodemap
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	869 for obj in self.obsoletestore.objects:
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	870 try: # /!\api change in Hg 2.2 (e8d37b78acfb22ae2c1fb126c2)/!\
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	871 rev = nm.get(obj)
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	872 except TypeError: #XXX to remove while breaking Hg 2.1 support
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	873 rev = nm.get(obj, None)
126 c083fb43daee obsolete: stop using rev as it rebuild the cache every time there is a fault Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 125 diff changeset	874 if rev is not None:
c083fb43daee obsolete: stop using rev as it rebuild the cache every time there is a fault Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 125 diff changeset	875 obs.add(rev)
109 a2e8057117d3 obsolete: smarter initialisation of obsolete stuff from disk. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 95 diff changeset	876 return obs
a2e8057117d3 obsolete: smarter initialisation of obsolete stuff from disk. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 95 diff changeset	877
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	878 @util.propertycache
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	879 def _unstableset(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	880 """the set of non obsolete revision with obsolete parent"""
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	881 return set(self.revs('(obsolete()::) - obsolete()'))
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	882
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	883 @util.propertycache
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	884 def _suspendedset(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	885 """the set of obsolete parent with non obsolete descendant"""
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	886 return set(self.revs('obsolete() and obsolete()::unstable()'))
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	887
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	888 @util.propertycache
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	889 def _extinctset(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	890 """the set of obsolete parent without non obsolete descendant"""
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	891 return set(self.revs('obsolete() - obsolete()::unstable()'))
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	892
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	893 @util.propertycache
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	894 def _latecomerset(self):
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	895 """the set of rev trying to obsolete public revision"""
332 36e2016d6563 obsolete: public changeset are no longer latecomer. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 321 diff changeset	896 query = 'allsuccessors(public()) - obsolete() - public()'
36e2016d6563 obsolete: public changeset are no longer latecomer. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 321 diff changeset	897 return set(self.revs(query))
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	898
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	899 def _clearobsoletecache(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	900 if '_obsoleteset' in vars(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	901 del self._obsoleteset
210 168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	902 self._clearunstablecache()
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	903
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	904 def updatebranchcache(self):
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	905 o_updatebranchcache()
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	906 self._clearunstablecache()
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	907
168ea7d200a0 obsolete: blindly obsolete unstability cache when changeset are added Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 205 diff changeset	908 def _clearunstablecache(self):
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	909 if '_unstableset' in vars(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	910 del self._unstableset
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	911 if '_suspendedset' in vars(self):
1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	912 del self._suspendedset
254 3ff969da57ef obsolete: fix error in cache invalidation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 253 diff changeset	913 if '_extinctset' in vars(self):
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	914 del self._extinctset
307 9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	915 if '_latecomerset' in vars(self):
9ac56d36d6ff obsolete: add latecomer computation and display Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 306 diff changeset	916 del self._latecomerset
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	917
53 0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	918 def addobsolete(self, sub, obj):
0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	919 """Add a relation marking that node <sub> is a new version of <obj>"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	920 assert sub != obj
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	921 if not repo[obj].phase():
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	922 if sub is None:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	923 self.ui.warn(
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	924 _("trying to kill immutable changeset %(obj)s\n")
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	925 % {'obj': short(obj)})
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	926 if sub is not None:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	927 self.ui.warn(
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	928 _("%(sub)s try to obsolete immutable changeset %(obj)s\n")
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	929 % {'sub': short(sub), 'obj': short(obj)})
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	930 lock = self.lock()
53 0bcbf690dfca reorganise code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 52 diff changeset	931 try:
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	932 newmarker = {
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	933 'subjects': (sub==nullid) and [] or [sub],
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	934 'object': obj,
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	935 'date': util.makedate(),
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	936 'user': ui.username(),
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	937 'reason': 'unknown',
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	938 }
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	939 mid = self.obsoletestore.new(newmarker)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	940 self._clearobsoletecache()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	941 self._turn_extinct_secret()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	942 return mid
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	943 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	944 lock.release()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	945
298 f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	946 def addcollapsedobsolete(self, oldnodes, newnode):
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	947 """Mark oldnodes as collapsed into newnode."""
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	948 # Assume oldnodes are all descendants of a single rev
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	949 rootrevs = self.revs('roots(%ln)', oldnodes)
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	950 assert len(rootrevs) == 1, rootrevs
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	951 rootnode = self[rootrevs[0]].node()
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	952 for n in oldnodes:
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	953 self.addobsolete(newnode, n)
f597421662f7 obsolete: unify collapsed revisions markers handling Patrick Mezard <patrick@mezard.eu> parents: 297 diff changeset	954
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	955 def _turn_extinct_secret(self):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	956 """ensure all extinct changeset are secret"""
135 1a08daef8a53 obsolete: add revset for various error case Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 132 diff changeset	957 self._clearobsoletecache()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	958 # this is mainly for safety purpose
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	959 # both pull and push
300 3b1f326878e5 obsolete: suspended changeset with secret only children should be secret too Patrick Mezard <patrick@mezard.eu> parents: 299 diff changeset	960 query = '(obsolete() - obsolete()::(unstable() - secret())) - secret()'
3b1f326878e5 obsolete: suspended changeset with secret only children should be secret too Patrick Mezard <patrick@mezard.eu> parents: 299 diff changeset	961 expobs = [c.node() for c in repo.set(query)]
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	962 phases.retractboundary(repo, 2, expobs)
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	963
37 9493ffa68633 Documentation ! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	964 ### Disk IO
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	965
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	966 def lock(self, args, *kwargs):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	967 l = olock(args, *kwargs)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	968 if not getattr(l.releasefn, 'obspatched', False):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	969 oreleasefn = l.releasefn
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	970 def releasefn(args, *kwargs):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	971 if self.obsoletestore._dirty:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	972 writeobsolete(self)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	973 oreleasefn(args, *kwargs)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	974 releasefn.obspatched = True
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	975 l.releasefn = releasefn
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	976 return l
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	977
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	978 def _readobsrels(self):
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	979 """Read obsolete relation on disk"""
37 9493ffa68633 Documentation ! Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 32 diff changeset	980 # XXX handle lock
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	981 try:
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	982 f = self.opener('obsolete-relations')
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	983 try:
70 af4f7ef0a3c1 [obsolete] extract serialization logic. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 69 diff changeset	984 return _obsdeserialise(f)
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	985 finally:
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	986 f.close()
c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	987 except IOError:
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	988 return {}
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	989
50 19b22ad56b32 clone support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 47 diff changeset	990
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	991 ### pull // push support
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	992
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	993 def pull(self, remote, args, *kwargs):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	994 """wrapper around push that push obsolete relation"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	995 l = repo.lock()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	996 try:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	997 result = opull(remote, args, *kwargs)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	998 if 'obsolete' in remote.listkeys('namespaces'):
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	999 tmp = StringIO()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1000 rels = remote.listkeys('obsolete')['markers']
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1001 tmp.write(base64.b64decode(rels))
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1002 tmp.seek(0)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1003 repo.obsoletestore.load(tmp)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1004 repo.obsoletestore._dirty = True # XXX meh
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1005 self._clearobsoletecache()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1006 self._turn_extinct_secret()
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1007 return result
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1008 finally:
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1009 l.release()
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1010
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1011 def push(self, remote, args, *opts):
74 c7dd26dec7fc [obsolete] update docstring Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 73 diff changeset	1012 """wrapper around pull that pull obsolete relation"""
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1013 self._turn_extinct_secret()
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1014 result = opush(remote, args, *opts)
56 27f9c0d0a996 [obsolete] Update pushkey code Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 54 diff changeset	1015 if 'obsolete' in remote.listkeys('namespaces'):
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	1016 tmp = StringIO()
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1017 self.obsoletestore.save(tmp)
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1018 remote.pushkey('obsolete', 'markers', '', tmp.getvalue())
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1019 self._turn_extinct_secret()
54 ad1a4fb0fc49 Make states more resilient to missing head Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 53 diff changeset	1020
44 b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1021 return result
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1022
b243c10a5fbe Add pushkey support for pull and push Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 43 diff changeset	1023
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	1024 ### rollback support
62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	1025
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1026 # /!\ api change in Hg 2.2 (97efd26eb9576f39590812ea9) /!\
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1027 if util.safehasattr(repo, '_journalfiles'): # Hg 2.2
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1028 def _journalfiles(self):
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1029 return o_journalfiles() + (self.sjoin('journal.obsoletemarkers'),)
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1030
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1031 def _writejournal(self, desc):
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1032 """wrapped version of _writejournal that save obsolete data"""
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1033 o_writejournal(desc)
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1034 filename = 'obsoletemarkers'
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1035 filepath = self.sjoin(filename)
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1036 if os.path.exists(filepath):
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1037 journalname = 'journal.' + filename
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1038 journalpath = self.sjoin(journalname)
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1039 util.copyfile(filepath, journalpath)
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1040
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	1041 else: # XXX removing this bloc will break Hg 2.1 support
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1042 def _writejournal(self, desc):
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1043 """wrapped version of _writejournal that save obsolete data"""
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1044 entries = list(o_writejournal(desc))
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1045 filename = 'obsoletemarkers'
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1046 filepath = self.sjoin(filename)
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1047 if os.path.exists(filepath):
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1048 journalname = 'journal.' + filename
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1049 journalpath = self.sjoin(journalname)
203 9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1050 util.copyfile(filepath, journalpath)
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1051 entries.append(journalpath)
9799d0aa53c8 [obsolete] add supprt for futur Hg 2.2 Alain Leufroy <alain.leufroy@logilab.fr> parents: 202 diff changeset	1052 return tuple(entries)
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	1053
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1054 def _rollback(self, dryrun, force):
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1055 """wrapped version of _rollback that restore obsolete data"""
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1056 ret = o_rollback(dryrun, force)
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1057 if not (ret or dryrun): #rollback did not failed
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1058 src = self.sjoin('undo.obsoletemarkers')
f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1059 dst = self.sjoin('obsoletemarkers')
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1060 if os.path.exists(src):
83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1061 util.rename(src, dst)
205 7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1062 elif os.path.exists(dst):
7ba30bd95a88 obsolete: fix rollback wrapper for 2.2-rc Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 204 diff changeset	1063 # If no state was saved because the file did not existed before.
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1064 os.unlink(dst)
83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1065 # invalidate cache
224 f60555898df4 new obsolete store Pierre-Yves.David@ens-lyon.org parents: 218 diff changeset	1066 self.__dict__.pop('obsoletestore', None)
202 83b7e2c62ac3 [obsolete] simplify by using the Hg 2.1 api Alain Leufroy <alain.leufroy@logilab.fr> parents: 197 diff changeset	1067 return ret
52 62bdc2567099 Rollback support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 51 diff changeset	1068
160 24346b78cd99 mercurial 2.1.2 compat Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 150 diff changeset	1069 @storecache('00changelog.i')
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1070 def changelog(self):
228 5a17c0d41a00 proof-read documentation and docstrings Nicolas Chauvat <nicolas.chauvat@logilab.fr> parents: 226 diff changeset	1071 # << copy pasted from mercurial source
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1072 c = changelog.changelog(self.sopener)
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1073 if 'HG_PENDING' in os.environ:
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1074 p = os.environ['HG_PENDING']
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1075 if p.startswith(self.root):
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1076 c.readpending('00changelog.i.a')
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1077 # >> end of the copy paste
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1078 old = c.__dict__.pop('hiddenrevs', ())
122 c75a73209f1e Locking while writing obsolete data. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 121 diff changeset	1079 if old:
c75a73209f1e Locking while writing obsolete data. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 121 diff changeset	1080 ui.warn("old wasn't empty ? %r" % old)
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1081 def _sethidden(c, value):
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1082 assert not value
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1083
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1084
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1085 class hchangelog(c.__class__):
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1086 @util.propertycache
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1087 def hiddenrevs(c):
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1088 shown = ['not obsolete()', '.', 'bookmark()', 'tagged()',
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1089 'public()']
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1090 basicquery = 'obsolete() - (::(%s))' % (' or '.join(shown))
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1091 # !!! self is repo not changelog
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1092 result = set(scmutil.revrange(self, [basicquery]))
1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1093 return result
215 0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1094 c.__class__ = hchangelog
0eceb5a48485 obsolete: fix changelog reload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 214 diff changeset	1095 return c
114 1a64195e2b09 nicer hiddenrevs init Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 112 diff changeset	1096
32 c27491be4431 obsolet: basic support (hide changeset) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1097 repo.__class__ = obsoletingrepo

Mercurial > hg > mutable-history

annotate hgext/obsolete.py @ 332:36e2016d6563 stable