This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10018

tags: update the hgtagsfnodes cache if invalid file nodes are found
AbandonedPublic

Authored by pulkit on Feb 17 2021, 2:44 PM.

Details

Reviewers
Alphare
marmoute
Group Reviewers
hg-reviewers
Summary

The cache update happens but it happens post calculation of alltags and hence we
still don't get correct list of tags in current run.
Next patch will try to fix this.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Feb 17 2021, 2:44 PM
Alphare requested changes to this revision.Feb 23 2021, 4:47 AM
Alphare added a subscriber: Alphare.

I'm waiting for the "next patch" mentioned in the commit message before this can be accepted, since the behavior changed from an abort to a silent omission of valid data, which is a regression.

mercurial/tags.py
205

This should probably be gated by the presence of invalidnodes to avoid a useless loop.

This revision now requires changes to proceed.Feb 23 2021, 4:47 AM
marmoute mentioned this in D10017: tags: return set of invalid nodes from _tagsfromfnodes().Mar 1 2021, 4:04 AM
marmoute requested changes to this revision.
marmoute added a subscriber: marmoute.

Same feedback as @Alphare, what about the final fix ?

pulkit added a comment.Mar 1 2021, 1:54 PM

Superseeded by D10083.

pulkit planned changes to this revision.Mar 1 2021, 1:55 PM
pulkit abandoned this revision.Mar 9 2021, 2:15 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/tags.py (20 lines)
Mtests/test-tags.t (14 lines)

Diff 25656

mercurial/tags.py

return alltags return alltags
for head in reversed(heads): # oldest to newest for head in reversed(heads): # oldest to newest
assert repo.changelog.index.has_node( assert repo.changelog.index.has_node(
head head
), b"tag cache returned bogus head %s" % short(head) ), b"tag cache returned bogus head %s" % short(head)
fnodes = _filterfnodes(tagfnode, reversed(heads)) fnodes = _filterfnodes(tagfnode, reversed(heads))
alltags, invalidnodes = _tagsfromfnodes(ui, repo, fnodes) alltags, invalidnodes = _tagsfromfnodes(ui, repo, fnodes)
recomputeheads = []
for head, fnode in pycompat.iteritems(tagfnode):
AlphareUnsubmitted
Not Done

This should probably be gated by the presence of invalidnodes to avoid a useless loop.

Alphare: This should probably be gated by the presence of `invalidnodes` to avoid a useless loop.
if fnode in invalidnodes:
recomputeheads.append(head)
# only hgtagsfnodes contains fnodes explicitly
if source == 'hgtagsfnodes' and recomputeheads:
ui.debug(
b'found invalid fnodes for "%s", updating them\n'
% b','.join([hex(h) for h in recomputeheads])
)
fnodescache = hgtagsfnodescache(repo.unfiltered())
fnodescache.recomputefnodes(recomputeheads)
# and update the cache (if necessary) # and update the cache (if necessary)
if shouldwrite: if shouldwrite:
_writetagcache(ui, repo, valid, alltags) _writetagcache(ui, repo, valid, alltags)
return alltags return alltags
def _filterfnodes(tagfnode, nodes): def _filterfnodes(tagfnode, nodes):
if record != _fnodesmissingrec: if record != _fnodesmissingrec:
return False return False
return None return None
fnode = self._computefnode(node) fnode = self._computefnode(node)
self._writeentry(offset, properprefix, fnode) self._writeentry(offset, properprefix, fnode)
return fnode return fnode
def recomputefnodes(self, nodes):
"""recomputes file nodes for given nodes as the current ones are
invalid and write the updates to the cache"""
for node in nodes:
fnode = self._computefnode(node)
self.setfnode(node, fnode)
self.write()
def _computefnode(self, node): def _computefnode(self, node):
"""Finds the tag filenode for a node which is missing or invalid """Finds the tag filenode for a node which is missing or invalid
in cache""" in cache"""
ctx = self._repo[node] ctx = self._repo[node]
rev = ctx.rev() rev = ctx.rev()
fnode = None fnode = None
cl = self._repo.changelog cl = self._repo.changelog
p1rev, p2rev = cl._uncheckedparentrevs(rev) p1rev, p2rev = cl._uncheckedparentrevs(rev)

tests/test-tags.t

4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d 4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d
5 8dbfe60eff306a54259cfe007db9e330e7ecf866 0c04f2a8deadde17fab7422878ee5a2dadbc943d (invalid node) 5 8dbfe60eff306a54259cfe007db9e330e7ecf866 0c04f2a8deadde17fab7422878ee5a2dadbc943d (invalid node)
$ rm -f .hg/cache/tags2-visible $ rm -f .hg/cache/tags2-visible
$ hg debugtagscache | tail -2 $ hg debugtagscache | tail -2
4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d 4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d
5 8dbfe60eff306a54259cfe007db9e330e7ecf866 0c04f2a8deadde17fab7422878ee5a2dadbc943d (invalid node) 5 8dbfe60eff306a54259cfe007db9e330e7ecf866 0c04f2a8deadde17fab7422878ee5a2dadbc943d (invalid node)
$ hg tags $ hg tags --debug
tip 5:8dbfe60eff30 found invalid fnodes for "8dbfe60eff306a54259cfe007db9e330e7ecf866", updating them
bar 1:78391a272241 tip 5:8dbfe60eff306a54259cfe007db9e330e7ecf866
bar 1:78391a272241d70354aa14c874552cad6b51bb42
$ hg debugtagscache | tail -2
4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d
5 8dbfe60eff306a54259cfe007db9e330e7ecf866 0c04f2a8af31de17fab7422878ee5a2dadbc943d
$ hg tags --debug
tip 5:8dbfe60eff306a54259cfe007db9e330e7ecf866
bar 1:78391a272241d70354aa14c874552cad6b51bb42
BUG: Unless this file is restored, the `hg tags` in the next unix-permissions BUG: Unless this file is restored, the `hg tags` in the next unix-permissions
conditional will fail: "abort: data/.hgtags.i@0c04f2a8dead: no match found" conditional will fail: "abort: data/.hgtags.i@0c04f2a8dead: no match found"
$ mv .hg/cache/hgtagsfnodes1.bak .hg/cache/hgtagsfnodes1 $ mv .hg/cache/hgtagsfnodes1.bak .hg/cache/hgtagsfnodes1
#if unix-permissions no-root #if unix-permissions no-root
Errors writing to .hgtags fnodes cache are silently ignored Errors writing to .hgtags fnodes cache are silently ignored