This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3159

eol: look up partial nodeid as partial nodeid
ClosedPublic

Authored by martinvonz on Apr 6 2018, 12:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9b16a67cef56: eol: look up partial nodeid as partial nodeid
Summary

Similar reasoning as the previous patch. For some reason the hook
gives us a partial nodeid, so we need to resolve that to a full
nodeid.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mhgext/eol.py (3 lines)
Mtests/test-blackbox.t (5 lines)

Diff 7784

hgext/eol.py

def checkheadshook(ui, repo, node, hooktype, **kwargs): def checkheadshook(ui, repo, node, hooktype, **kwargs):
"""verify that files have expected EOLs""" """verify that files have expected EOLs"""
_checkhook(ui, repo, node, True) _checkhook(ui, repo, node, True)
# "checkheadshook" used to be called "hook" # "checkheadshook" used to be called "hook"
hook = checkheadshook hook = checkheadshook
def preupdate(ui, repo, hooktype, parent1, parent2): def preupdate(ui, repo, hooktype, parent1, parent2):
repo.loadeol([parent1]) p1node = repo.unfiltered().changelog._partialmatch(parent1)
repo.loadeol([p1node])
return False return False
def uisetup(ui): def uisetup(ui):
ui.setconfig('hooks', 'preupdate.eol', preupdate, 'eol') ui.setconfig('hooks', 'preupdate.eol', preupdate, 'eol')
def extsetup(ui): def extsetup(ui):
try: try:
extensions.find('win32text') extensions.find('win32text')

tests/test-blackbox.t

updated to "d02f48003e62: c" updated to "d02f48003e62: c"
1 other heads for branch "default" 1 other heads for branch "default"
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> # disable eol, because it is not needed for subsequent tests > # disable eol, because it is not needed for subsequent tests
> # (in addition, keeping it requires extra care for fsmonitor) > # (in addition, keeping it requires extra care for fsmonitor)
> eol=! > eol=!
> EOF > EOF
$ hg blackbox -l 6 $ hg blackbox -l 5
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update (no-chg !) 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update (no-chg !)
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob) 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> exthook-update: echo hooked finished in * seconds (glob) 1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> exthook-update: echo hooked finished in * seconds (glob)
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> update exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> update exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> serve --cmdserver chgunix --address $TESTTMP.chgsock/server.* --daemon-postexec 'chdir:/' (glob) (chg !) 1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> serve --cmdserver chgunix --address $TESTTMP.chgsock/server.* --daemon-postexec 'chdir:/' (glob) (chg !)
1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> blackbox -l 6 1970/01/01 00:00:00 bob @d02f48003e62c24e2659d97d30f2a83abe5d5d51 (5000)> blackbox -l 5
log rotation log rotation
$ echo '[blackbox]' >> .hg/hgrc $ echo '[blackbox]' >> .hg/hgrc
$ echo 'maxsize = 20 b' >> .hg/hgrc $ echo 'maxsize = 20 b' >> .hg/hgrc
$ echo 'maxfiles = 3' >> .hg/hgrc $ echo 'maxfiles = 3' >> .hg/hgrc
$ hg status $ hg status
$ hg status $ hg status