Mercurial > hg
changeset 44001:faf00e30b63f
remotefilelog: actually fix (and test this time) a bytes vs str issue
I attempted this in 94670e124d29 but we didn't actually have any tests for this
function it seems, and I mistook "it works now" for it being fixed (when what
had actually happened was that my cache had populated enough that I didn't
trigger the minimum threshold on my reattempts).
Differential Revision: https://phab.mercurial-scm.org/D7785
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 02 Jan 2020 17:30:27 -0800 |
| parents | 60de488cad11 |
| children | d9d78e70149a |
| files | hgext/remotefilelog/fileserverclient.py tests/test-remotefilelog-prefetch.t |
| diffstat | 2 files changed, 34 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/remotefilelog/fileserverclient.py Tue Jan 07 09:26:06 2020 -0500 +++ b/hgext/remotefilelog/fileserverclient.py Thu Jan 02 17:30:27 2020 -0800 @@ -663,5 +663,5 @@ self.ui.log( b'remotefilelog', b'excess remotefilelog fetching:\n%s\n', - b''.join(pycompat.sysbytes(traceback.format_stack())), + b''.join(pycompat.sysbytes(s) for s in traceback.format_stack()), )
--- a/tests/test-remotefilelog-prefetch.t Tue Jan 07 09:26:06 2020 -0500 +++ b/tests/test-remotefilelog-prefetch.t Thu Jan 02 17:30:27 2020 -0800 @@ -236,3 +236,36 @@ $ hg revert -a -r 1 || true 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob) abort: z2@109c3a557a73: not found in manifest! (?) + +# warning when we have excess remotefilelog fetching + + $ cat > repeated_fetch.py << EOF + > import binascii + > from mercurial import extensions, registrar + > cmdtable = {} + > command = registrar.command(cmdtable) + > @command(b'repeated-fetch', [], b'', inferrepo=True) + > def repeated_fetch(ui, repo, *args, **opts): + > for i in range(20): + > try: + > hexid = (b'%02x' % (i + 1)) * 20 + > repo.fileservice.prefetch([(b'somefile.txt', hexid)]) + > except: + > pass + > EOF + +We should only output to the user once. We're ignoring most of the output +because we're not actually fetching anything real here, all the hashes are +bogus, so it's just going to be errors and a final summary of all the misses. + $ hg --config extensions.repeated_fetch=repeated_fetch.py \ + > --config remotefilelog.fetchwarning="fetch warning!" \ + > --config extensions.blackbox= \ + > repeated-fetch 2>&1 | grep 'fetch warning' + fetch warning! + +We should output to blackbox three times, with a stack trace on each (though +that isn't tested here). + $ grep 'excess remotefilelog fetching' .hg/blackbox.log + .* excess remotefilelog fetching: (re) + .* excess remotefilelog fetching: (re) + .* excess remotefilelog fetching: (re)