Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
Poulpe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
octobus
Poulpe
Commits
96fbf00e
Commit
96fbf00e
authored
1 year ago
by
Pierre-Yves David
Browse files
Options
Downloads
Patches
Plain Diff
bin-env: add a way to make pyre2 available for Mercural
parent
0102b4f8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
python-libs/poulpe/bin/result-compare
+1
-0
1 addition, 0 deletions
python-libs/poulpe/bin/result-compare
suites/hg/bin-env-setup/mercurial.poulpe-setup.sh
+13
-0
13 additions, 0 deletions
suites/hg/bin-env-setup/mercurial.poulpe-setup.sh
with
14 additions
and
0 deletions
python-libs/poulpe/bin/result-compare
+
1
−
0
View file @
96fbf00e
...
...
@@ -9,6 +9,7 @@
(
'
data-env-vars
'
,
'
name
'
),
(
'
benchmark
'
,
'
name
'
),
(
'
bin-env-vars
'
,
'
hg
'
,
'
flavor
'
),
(
'
bin-env-vars
'
,
'
hg
'
,
'
py-re2-module
'
),
(
'
bin-env-vars
'
,
'
hg
'
,
'
changeset
'
,
'
node
'
),
]
...
...
This diff is collapsed.
Click to expand it.
suites/hg/bin-env-setup/mercurial.poulpe-setup.sh
+
13
−
0
View file @
96fbf00e
...
...
@@ -20,6 +20,9 @@
# - rust: Mercurila with all available compiled extensions,
# including the Rust one
# - rhg: The pure Rust fastpath, (with fallback when needed)
# MERCURIAL_PY_RE2 the name of a python binding to the re2 library to install.
# Known good value are :
# - google-re2
#
# the script work use some hardcoded temporary directory :
# - /tmp/poulpe-tmp
...
...
@@ -32,6 +35,7 @@
repo_url
=
"
${
MERCURIAL_REPO_URL
:-
https
://foss.heptapod.net/mercurial/mercurial-devel
}
"
flavor
=
"
${
MERCURIAL_FLAVOR
:-
default
}
"
pyre2
=
"
${
MERCURIAL_PY_RE2
:-
default
}
"
[
-n
"
${
MERCURIAL_VERSION
}
"
]
...
...
@@ -86,6 +90,14 @@
echo
"install okay"
if
[
"
$pyre2
"
==
"default"
]
;
then
echo
"no re2 module to install"
else
"
${
root
}
/bin/python"
-m
pip
install
"
$pyre2
"
echo
"installed re2 support through:
$pyre2
"
fi
if
[
"
${
flavor
}
"
==
"rhg"
]
;
then
make
-C
poulpe-tmp/mercurial build-rhg
echo
'BUILT'
...
...
@@ -104,6 +116,7 @@
echo
hg.version
=
"
`
bin/hg
--version
--quiet
| egrep
-o
'\S+\)$'
| egrep
-o
'[^)]+'
`
"
>>
POULPE-VARS
echo
hg.flavor
=
"
${
flavor
}
"
>>
POULPE-VARS
echo
hg.py-re2-module
=
"
${
pyre2
}
"
>>
POULPE-VARS
for
key
in
node branch tag phase
;
do
echo
hg.changeset.
${
key
}
=
"
`
hg log
-R
poulpe-tmp/mercurial/
-r
.
-T
'{'
${
key
}
'}'
`
"
>>
POULPE-VARS
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment