mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
fastmanifest: fix test-check-code.t related errors
Summary: D6685044 changed the location of fastmanifest which exposed it to the additional test that failed. This commit fixes fastmanifest to address that test. Test Plan: Ran all the tests. Reviewers: #mercurial, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D6685170
This commit is contained in:
parent
ad7d64e944
commit
163b35ec2e
@ -4,7 +4,7 @@
|
||||
#
|
||||
# This software may be used and distributed according to the terms of the
|
||||
# GNU General Public License version 2 or any later version.
|
||||
"""
|
||||
'''
|
||||
This extension adds fastmanifest, a treemanifest disk cache for speeding up
|
||||
manifest comparison. It also contains utilities to investigate manifest access
|
||||
patterns.
|
||||
@ -92,7 +92,7 @@ is not normally accessible to manifests.
|
||||
`debugcachemanifest` is a command calling `_cachemanifest`, a function to add
|
||||
manifests to the cache and manipulate what is cached. It allows caching fast
|
||||
and flat manifest, asynchronously and synchronously.
|
||||
"""
|
||||
'''
|
||||
|
||||
import sys
|
||||
|
||||
|
@ -8,7 +8,14 @@
|
||||
import os
|
||||
import errno
|
||||
|
||||
from mercurial import extensions, revlog, scmutil, util, error
|
||||
from mercurial import (
|
||||
encoding,
|
||||
error,
|
||||
extensions,
|
||||
revlog,
|
||||
scmutil,
|
||||
util,
|
||||
)
|
||||
|
||||
import cfastmanifest
|
||||
import concurrency
|
||||
@ -330,7 +337,7 @@ class triggers(object):
|
||||
|
||||
# see if the user wants us to invoke a specific instance of
|
||||
# mercurial.
|
||||
workerexe = os.environ.get("SCM_WORKER_EXE")
|
||||
workerexe = encoding.environ.get("SCM_WORKER_EXE")
|
||||
|
||||
cmd = util.hgcmd()[:]
|
||||
if workerexe is not None:
|
||||
|
@ -84,12 +84,6 @@ New errors are not allowed. Warnings are strongly discouraged.
|
||||
hgext/fastannotate/commands.py:43:
|
||||
> reldir = os.path.relpath(os.getcwd(), reporoot)
|
||||
use pycompat.getcwd instead (py3)
|
||||
hgext/fastmanifest/__init__.py:7:
|
||||
> """
|
||||
don't capitalize docstring title
|
||||
hgext/fastmanifest/cachemanager.py:333:
|
||||
> workerexe = os.environ.get("SCM_WORKER_EXE")
|
||||
use encoding.environ instead (py3)
|
||||
hgext/fbsparse.py:1177:
|
||||
> cwd = util.normpath(os.getcwd())
|
||||
use pycompat.getcwd instead (py3)
|
||||
|
Loading…
Reference in New Issue
Block a user