author | Laurent Charignon <lcharignon@fb.com> |
Mon, 30 Mar 2015 13:31:09 -0700 | |
changeset 1234 | c15d4677f2ba |
parent 1233 | 63ee05dd557a |
child 1240 | e1347ce2f954 |
permissions | -rw-r--r-- |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
"""Reduce the changesets evolution feature scope for early and noob friendly UI |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 |
The full scale changeset evolution have some massive bleeding edge and it is |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
very easy for people not very intimate with the concept to end up in intricate |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 |
situation. In order to get some of the benefit sooner, this extension is |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 |
disabling some of the less polished aspect of evolution. It should gradually |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
7 |
get thinner and thinner as changeset evolution will get more polished. This |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
extension is only recommended for large scale organisations. Individual user |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
should probably stick on using Evolution in its current state, understand its |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
concept and provide feedback |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
The first feature provided by this extension is the ability to "inhibit" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
obsolescence markers. Obsolete revision can be cheaply brought back to life |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
that way. However as the inhibitor are not fitting in an append only model, |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 |
this is incompatible with sharing mutable history. |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
16 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
17 |
The second feature is called direct access. It is the ability to refer and |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
18 |
access hidden sha in commands provided that you know their value. |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
19 |
For example hg log -r XXX where XXX is a commit has should work whether XXX is |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
20 |
hidden or not as we assume that the user knows what he is doing when referring |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
21 |
to XXX. |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
from mercurial import localrepo |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
from mercurial import obsolete |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
from mercurial import extensions |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
from mercurial import cmdutil |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
from mercurial import scmutil |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
28 |
from mercurial import repoview |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
29 |
from mercurial import revset |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
30 |
from mercurial import error |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
31 |
from mercurial import commands |
1234
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
32 |
from mercurial import bookmarks |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
cmdtable = {} |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
command = cmdutil.command(cmdtable) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
def reposetup(ui, repo): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
class obsinhibitedrepo(repo.__class__): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
@localrepo.storecache('obsinhibit') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
def _obsinhibit(self): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
# XXX we should make sure it is invalidated by transaction failure |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
obsinhibit = set() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
raw = self.sopener.tryread('obsinhibit') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
for i in xrange(0, len(raw), 20): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |
obsinhibit.add(raw[i:i+20]) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
return obsinhibit |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
repo.__class__ = obsinhibitedrepo |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
51 |
repo._explicitaccess = set() |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
|
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
53 |
|
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
54 |
def _update(orig, ui, repo, *args, **kwargs): |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
55 |
""" |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
56 |
When moving to a commit we want to inhibit any obsolete commit affecting |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
57 |
the changeset we are updating to. In other words we don't want any visible |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
58 |
commit to be obsolete. |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
59 |
""" |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
60 |
res = orig(ui, repo, *args, **kwargs) |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
61 |
newhead = repo['.'].node() |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
62 |
_inhibitmarkers(repo, [newhead]) |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
63 |
return res |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
64 |
|
1234
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
65 |
def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
66 |
""" Add inhibition markers to every obsolete bookmarks """ |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
67 |
repo = bkmstoreinst._repo |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
68 |
bkmstorenodes = [repo[v].node() for v in bkmstoreinst.values()] |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
69 |
_inhibitmarkers(repo, bkmstorenodes) |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
70 |
return orig(bkmstoreinst, *args, **kwargs) |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
71 |
|
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
# obsolescence inhibitor |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
######################## |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
def _schedulewrite(tr, obsinhibit): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
76 |
"""Make sure on disk content will be updated on transaction commit""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
def writer(fp): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
"""Serialize the inhibited list to disk. |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
raw = ''.join(obsinhibit) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
fp.write(raw) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
tr.addfilegenerator('obsinhibit', ('obsinhibit',), writer) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 |
tr.hookargs['obs_inbihited'] = '1' |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
84 |
|
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
85 |
def _filterpublic(repo, nodes): |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
86 |
"""filter out inhibitor on public changeset |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
87 |
|
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
88 |
Public changesets are already immune to obsolescence""" |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
89 |
getrev = repo.changelog.nodemap.get |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
90 |
getphase = repo._phasecache.phase |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
91 |
return (n for n in repo._obsinhibit if getphase(repo, getrev(n))) |
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
92 |
|
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
93 |
def _inhibitmarkers(repo, nodes): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
94 |
"""add marker inhibitor for all obsolete revision under <nodes> |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
Content of <nodes> and all mutable ancestors are considered. Marker for |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
obsolete revision only are created. |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
newinhibit = repo.set('::%ln and obsolete()', nodes) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
if newinhibit: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
101 |
tr = repo.transaction('obsinhibit') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |
try: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
103 |
repo._obsinhibit.update(c.node() for c in newinhibit) |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
104 |
_schedulewrite(tr, _filterpublic(repo, repo._obsinhibit)) |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
105 |
repo.invalidatevolatilesets() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
106 |
tr.close() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
107 |
finally: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
108 |
tr.release() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
109 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
110 |
def _deinhibitmarkers(repo, nodes): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
111 |
"""lift obsolescence inhibition on a set of nodes |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
112 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
113 |
This will be triggered when inhibited nodes received new obsolescence |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
114 |
markers. Otherwise the new obsolescence markers would also be inhibited. |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
115 |
""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
116 |
deinhibited = repo._obsinhibit & set(nodes) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
117 |
if deinhibited: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
118 |
tr = repo.transaction('obsinhibit') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
119 |
try: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
120 |
repo._obsinhibit -= deinhibited |
1225
577f5340be6f
inhibit: Add some inhibition clearing mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1224
diff
changeset
|
121 |
_schedulewrite(tr, _filterpublic(repo, repo._obsinhibit)) |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
122 |
repo.invalidatevolatilesets() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
123 |
tr.close() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
124 |
finally: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
125 |
tr.release() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
126 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
127 |
def _createmarkers(orig, repo, relations, flag=0, date=None, metadata=None): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
128 |
"""wrap markers create to make sure we de-inhibit target nodes""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
129 |
# wrapping transactio to unify the one in each function |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
130 |
tr = repo.transaction('add-obsolescence-marker') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
131 |
try: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
132 |
orig(repo, relations, flag, date, metadata) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
133 |
precs = (r[0].node() for r in relations) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
134 |
_deinhibitmarkers(repo, precs) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
135 |
tr.close() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
136 |
finally: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
137 |
tr.release() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
138 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
139 |
def extsetup(ui): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
140 |
# lets wrap the computation of the obsolete set |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
141 |
# We apply inhibition there |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
142 |
obsfunc = obsolete.cachefuncs['obsolete'] |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
143 |
def _computeobsoleteset(repo): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
144 |
"""remove any inhibited nodes from the obsolete set |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
145 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
146 |
This will trickle down to other part of mercurial (hidden, log, etc)""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
147 |
obs = obsfunc(repo) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
148 |
getrev = repo.changelog.nodemap.get |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
149 |
for n in repo._obsinhibit: |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
150 |
obs.discard(getrev(n)) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
151 |
return obs |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
152 |
obsolete.cachefuncs['obsolete'] = _computeobsoleteset |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
153 |
# drop divergence computation since it is incompatible with "light revive" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
154 |
obsolete.cachefuncs['divergent'] = lambda repo: set() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
155 |
# drop bumped computation since it is incompatible with "light revive" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
156 |
obsolete.cachefuncs['bumped'] = lambda repo: set() |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
157 |
# wrap create marker to make it able to lift the inhibition |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
158 |
extensions.wrapfunction(obsolete, 'createmarkers', _createmarkers) |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
159 |
extensions.wrapfunction(repoview, '_getdynamicblockers', _accessvisible) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
160 |
extensions.wrapfunction(revset, 'posttreebuilthook', _posttreebuilthook) |
1233
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
161 |
# wrap update to make sure that no obsolete commit is visible after an |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
162 |
# update |
63ee05dd557a
inhibit: ensure no visible changesets are obsolete after an update
Laurent Charignon <lcharignon@fb.com>
parents:
1232
diff
changeset
|
163 |
extensions.wrapcommand(commands.table, 'update', _update) |
1234
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
164 |
# There are two ways to save bookmark changes during a transation, we |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
165 |
# wrap both to add inhibition markers. |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
166 |
extensions.wrapfunction(bookmarks.bmstore, 'recordchange', _bookmarkchanged) |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
167 |
extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged) |
c15d4677f2ba
inhibit: ensure that no obsolete changesets are visible after a bookmark change
Laurent Charignon <lcharignon@fb.com>
parents:
1233
diff
changeset
|
168 |
|
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
169 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
170 |
def gethashsymbols(tree): |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
171 |
# Returns the list of symbols of the tree that look like hashes |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
172 |
# for example for the revset 3::abe3ff it will return ('abe3ff') |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
173 |
if not tree: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
174 |
return [] |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
175 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
176 |
if len(tree) == 2 and tree[0] == "symbol": |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
177 |
try: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
178 |
int(tree[1]) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
179 |
return [] |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
180 |
except ValueError as e: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
181 |
return [tree[1]] |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
182 |
elif len(tree) == 3: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
183 |
return gethashsymbols(tree[1]) + gethashsymbols(tree[2]) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
184 |
else: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
185 |
return [] |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
186 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
187 |
def _posttreebuilthook(orig, tree, repo): |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
188 |
# This is use to enabled direct hash access |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
189 |
# We extract the symbols that look like hashes and add them to the |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
190 |
# explicitaccess set |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
191 |
orig(tree, repo) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
192 |
if repo and repo.filtername == 'visible': |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
193 |
prelength = len(repo._explicitaccess) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
194 |
repo.symbols = gethashsymbols(tree) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
195 |
cl = repo.unfiltered().changelog |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
196 |
for node in repo.symbols: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
197 |
try: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
198 |
node = cl._partialmatch(node) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
199 |
except error.LookupError: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
200 |
node = None |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
201 |
if node is not None: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
202 |
rev = cl.rev(node) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
203 |
if rev not in repo.changelog: |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
204 |
repo._explicitaccess.add(rev) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
205 |
if prelength != len(repo._explicitaccess): |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
206 |
repo.invalidatevolatilesets() |
1224
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
207 |
|
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
208 |
@command('debugobsinhibit', [], '') |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
209 |
def cmddebugobsinhibit(ui, repo, *revs): |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
210 |
"""inhibit obsolescence markers effect on a set of revs""" |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
211 |
nodes = (repo[r].node() for r in scmutil.revrange(repo, revs)) |
859a854cedc3
add a 'inhibit' extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
212 |
_inhibitmarkers(repo, nodes) |
1232
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
213 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
214 |
# ensure revision accessed by hash are visible |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
215 |
############################################### |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
216 |
|
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
217 |
def _accessvisible(orig, repo): |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
218 |
"""ensure accessed revs stay visible""" |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
219 |
blockers = orig(repo) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
220 |
blockers.update(getattr(repo, '_explicitaccess', ())) |
37c00aeb4762
inhibit: enable direct access from parsing the revset tree
Laurent Charignon <lcharignon@fb.com>
parents:
1225
diff
changeset
|
221 |
return blockers |