( )⚙ D994 hiddenoverride: work with scmutils.cleanupnodes

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D994

hiddenoverride: work with scmutils.cleanupnodes
ClosedPublic

Authored by quark on Oct 9 2017, 8:22 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX16b9beefc658: hiddenoverride: work with scmutils.cleanupnodes
Summary

Previously, hiddenoverride only unpins nodes when createmarkers gets called.
However, with scmutils.cleanupnodes, createmarkers will not get called when
the nodes are already obsoleted. This patch makes hiddenoverride check
cleanupnodes too to unpin nodes properly.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Oct 9 2017, 8:22 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 9 2017, 8:22 PM
durham accepted this revision.Oct 31 2017, 12:22 PM
This revision is now accepted and ready to land.Oct 31 2017, 12:22 PM
Closed by commit rFBHGX16b9beefc658: hiddenoverride: work with scmutils.cleanupnodes (authored by quark). · Explain WhyNov 2 2017, 3:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2542

hgext3rd/fbamend/hiddenoverride.py

from mercurial.node import short from mercurial.node import short
from mercurial import ( from mercurial import (
dispatch, dispatch,
error, error,
extensions, extensions,
lock as lockmod, lock as lockmod,
obsolete, obsolete,
repoview, repoview,
scmutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
def uisetup(ui): def uisetup(ui):
extensions.wrapfunction(repoview, 'pinnedrevs', pinnedrevs) extensions.wrapfunction(repoview, 'pinnedrevs', pinnedrevs)
extensions.wrapfunction(dispatch, 'runcommand', runcommand) extensions.wrapfunction(dispatch, 'runcommand', runcommand)
extensions.wrapfunction(obsolete, 'createmarkers', createmarkers) extensions.wrapfunction(obsolete, 'createmarkers', createmarkers)
extensions.wrapfunction(scmutil, 'cleanupnodes', cleanupnodes)
def pinnedrevs(orig, repo): def pinnedrevs(orig, repo):
revs = orig(repo) revs = orig(repo)
nodemap = repo.changelog.nodemap nodemap = repo.changelog.nodemap
pinnednodes = set(loadpinnednodes(repo)) pinnednodes = set(loadpinnednodes(repo))
tounpin = getattr(repo, '_tounpinnodes', set()) tounpin = getattr(repo, '_tounpinnodes', set())
pinnednodes -= tounpin pinnednodes -= tounpin
revs.update(nodemap[n] for n in pinnednodes) revs.update(nodemap[n] for n in pinnednodes)
tounpin = getattr(unfi, '_tounpinnodes', set()) tounpin = getattr(unfi, '_tounpinnodes', set())
for r in rels: for r in rels:
try: try:
tounpin.add(r[0].node()) tounpin.add(r[0].node())
except error.RepoLookupError: except error.RepoLookupError:
pass pass
unfi._tounpinnodes = tounpin unfi._tounpinnodes = tounpin
return orig(repo, rels, *args, **kwargs) return orig(repo, rels, *args, **kwargs)
def cleanupnodes(orig, repo, mapping, *args, **kwargs):
# this catches cases where cleanupnodes is called but createmarkers is not
# called. unpin nodes from mapping
unfi = repo.unfiltered()
tounpin = getattr(unfi, '_tounpinnodes', set())
tounpin.update(mapping)
unfi._tounpinnodes = tounpin
return orig(repo, mapping, *args, **kwargs)

tests/test-fbamend-hiddenoverride.t

| |
o Z o Z
$ hg up -C . $ hg up -C .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg uncommit $ hg uncommit
$ hg log -T '{desc}' -G $ hg log -T '{desc}' -G
x A
|
@ Z @ Z