Skip to content

support non-ascii chars in hgrev #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewdurbin merged 2 commits into from
May 31, 2025
Merged

support non-ascii chars in hgrev #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf170af
support non-ascii chars in hgrev
ewdurbin May 31, 2025
f9e59b8
reduce lifetime of hgrev processes to alay memory leak for now
ewdurbin May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/hg/config/hg.apache.conf.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# A lightweight standin for revision app to maintain support for /lookup
WSGIDaemonProcess hgrev user=hg group=hg \
threads=2 processes=4 maximum-requests=1000 \
threads=1 processes=6 maximum-requests=100 \
display-name=hgrev
# The Location hack ensures the lookup app is run within
# this process group
Expand Down
4 changes: 2 additions & 2 deletions salt/hg/files/hg/src/hgrev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def __init__(self, verbose=False):
def successful_response(self, response, contents):
headers = [("Content-Type", "text/plain")]
response("200 OK", headers)
return [contents.encode()]
return [contents]

def failed_response(self, response, detail=""):
headers = [("Content-Type", "text/plain")]
Expand Down Expand Up @@ -46,7 +46,7 @@ def __call__(self, env, response):
command,
cwd=hg_repo,
capture_output=True,
text=True,
text=False,
shell=False,
check=True
)
Expand Down