Patchwork D7785: remotefilelog: actually fix (and test this time) a bytes vs str issue

login
register
mail settings
Submitter phabricator
Date Jan. 7, 2020, 3:26 p.m.
Message ID <bb960f4e9233fce16da1426159f3e0a1@localhost.localdomain>
Download mbox | patch
Permalink /patch/44173/
State Not Applicable
Headers show

Comments

phabricator - Jan. 7, 2020, 3:26 p.m.
Closed by commit rHGfaf00e30b63f: remotefilelog: actually fix (and test this time) a bytes vs str issue (authored by spectral).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7785?vs=19033&id=19062

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7785/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7785

AFFECTED FILES
  hgext/remotefilelog/fileserverclient.py
  tests/test-remotefilelog-prefetch.t

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/tests/test-remotefilelog-prefetch.t b/tests/test-remotefilelog-prefetch.t
--- a/tests/test-remotefilelog-prefetch.t
+++ b/tests/test-remotefilelog-prefetch.t
@@ -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)
diff --git a/hgext/remotefilelog/fileserverclient.py b/hgext/remotefilelog/fileserverclient.py
--- a/hgext/remotefilelog/fileserverclient.py
+++ b/hgext/remotefilelog/fileserverclient.py
@@ -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()),
         )