fix tests after reformat

Summary: The recent reformat caused a few test failures, this should fix them.

Differential Revision: D8207359

fbshipit-source-id: ced37aff3038715e5876fe27b58a60ebe45e4097

hgext/fastmanifest/__init__.py

@@ -4,7 +4,8 @@
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
-"""
+"""a treemanifest disk cache for speeding up manifest comparison
+
 This extension adds fastmanifest, a treemanifest disk cache for speeding up
 manifest comparison. It also contains utilities to investigate manifest access
 patterns.
@@ -96,7 +97,6 @@ from __future__ import absolute_import
 
 import sys
 
-from mercurial.i18n import _
 from mercurial import (
     bookmarks,
     dispatch,
@@ -107,9 +107,11 @@ from mercurial import (
     registrar,
     revset as revsetmod,
 )
+from mercurial.i18n import _
 
 from . import cachemanager, debug, implementation, metrics
 
+
 metricscollector = metrics.metricscollector
 manifestfactory = implementation.manifestfactory
 fastmanifestcache = implementation.fastmanifestcache

hgext/fbamend/__init__.py

@@ -49,9 +49,6 @@ from __future__ import absolute_import
 
 import tempfile
 
-from mercurial.node import hex, short
-from mercurial.i18n import _
-
 from mercurial import (
     bookmarks,
     cmdutil,
@@ -64,8 +61,8 @@ from mercurial import (
     registrar,
     scmutil,
 )
-
-from .. import histedit, rebase as rebasemod
+from mercurial.i18n import _
+from mercurial.node import hex, short
 
 from . import (
     common,
@@ -80,6 +77,8 @@ from . import (
     split,
     unamend,
 )
+from .. import histedit, rebase as rebasemod
+
 
 revsetpredicate = revsets.revsetpredicate
 hint = registrar.hint()
@@ -398,7 +397,7 @@ def amendtocommit(ui, repo, commitspec):
         targetcommit = repo[revs.first()]
         if targetcommit not in originalcommits:
             raise error.Abort(
-                _("revision '%s' is not a parent of " "the working copy" % commitspec)
+                _("revision '%s' is not a parent of the working copy") % commitspec
             )
 
         tempcommit = repo.commit(text="tempCommit")

hgext/fsmonitor/__init__.py

@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-"""Faster status operations with the Watchman file monitor (EXPERIMENTAL)
+"""faster status operations with the Watchman file monitor (EXPERIMENTAL)
 
 Integrates the file-watching program Watchman with Mercurial to produce faster
 status results.
@@ -114,14 +114,13 @@ import stat
 import sys
 import weakref
 
-from mercurial.i18n import _
-
 from mercurial import (
     context,
     encoding,
     error,
     extensions,
     localrepo,
+    match as matchmod,
     pathutil,
     progress,
     pycompat,
@@ -129,11 +128,11 @@ from mercurial import (
     scmutil,
     util,
 )
-from mercurial import match as matchmod
-
-from ..extlib import pywatchman, watchmanclient
+from mercurial.i18n import _
 
 from . import state
+from ..extlib import pywatchman, watchmanclient
+
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

tests/test-check-config.t

@@ -53,11 +53,11 @@ New errors are not allowed. Warnings are strongly discouraged.
   undocumented: fastmanifest.cachecutoffdays (int) [60]
   undocumented: fastmanifest.cacheonchange (bool)
   undocumented: fastmanifest.cacheonchangebackground (bool) [True]
-  undocumented: fastmanifest.debugfastmanifest (bool)
   undocumented: fastmanifest.debugmetrics (bool)
   undocumented: fastmanifest.logfile (str)
-  undocumented: fastmanifest.maxinmemoryentries (str) [DEFAULT_MAX_MEMORY_ENTRIES]
+  undocumented: fastmanifest.relevantremotenames (list) [["master"]]
   undocumented: fastmanifest.silent (bool)
+  undocumented: fastmanifest.silentworker (bool) [True]
   undocumented: fastmanifest.usecache (bool)
   undocumented: fastmanifest.usetree (bool)
   undocumented: fbconduit.backingrepos (list) [[reponame]]
@@ -86,7 +86,7 @@ New errors are not allowed. Warnings are strongly discouraged.
   undocumented: hgsql.user (str)
   undocumented: hgsql.verifybatchsize (int)
   undocumented: hgsql.waittimeout (str)
-  undocumented: hgsubversion.externals (str) ['svnexternals']
+  undocumented: hgsubversion.externals (str) ["svnexternals"]
   undocumented: hgsubversion.failoninvalidreplayfile (bool)
   undocumented: hgsubversion.failonmissing (bool)
   undocumented: hgsubversion.filestoresize (int) [200]
@@ -124,8 +124,6 @@ New errors are not allowed. Warnings are strongly discouraged.
   undocumented: remotefilelog.fastdatapack (bool)
   undocumented: remotefilelog.fetchpacks (bool)
   undocumented: remotefilelog.fetchwarning (str)
-  undocumented: remotefilelog.getfilesstep (int) [10000]
-  undocumented: remotefilelog.getfilestype (str) ['optimistic']
   undocumented: remotefilelog.includepattern (list)
   undocumented: remotefilelog.pullprefetch (str)
   undocumented: remotefilelog.reponame (str)
@@ -133,7 +131,7 @@ New errors are not allowed. Warnings are strongly discouraged.
   undocumented: remotefilelog.servercachepath (str)
   undocumented: remotefilelog.serverexpiration (int) [30]
   undocumented: remotefilelog.shallowtrees (bool)
-  undocumented: remotefilelog.validatecache (str) ['on']
+  undocumented: remotefilelog.validatecache (str) ["on"]
   undocumented: remotefilelog.validatecachelog (str)
   undocumented: remotenames.alias.default (bool)
   undocumented: remotenames.allownonfastforward (bool)
@@ -159,6 +157,5 @@ New errors are not allowed. Warnings are strongly discouraged.
   undocumented: simplecache.caches (list) [["local"]]
   undocumented: smartlog.ignorebookmarks (str) ["!"]
   undocumented: ssl.timeout (int) [5]
-  undocumented: treemanifest.autocreatetrees (bool)
   undocumented: treemanifest.verifyautocreate (bool)
   undocumented: ui.editor.chunkselector (str)

tests/test-help.t

@@ -331,7 +331,8 @@ Test extension help:
        factotum      http authentication with factotum
        fastannotate  yet another annotate implementation that might be faster
        fastlog
-       fastmanifest
+       fastmanifest  a treemanifest disk cache for speeding up manifest
+                     comparison
        fastpartialmatch
                      extension that makes node prefix lookup faster
        fbamend       extends the existing commit amend functionality