Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Admin message
This instance will be upgraded to Heptapod 17.9.0rc1 on 2025-03-27 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
mercurial
mercurial-devel
Commits
5713adc51f2a
Commit
5713adc51f2a
authored
5 months ago
by
Pierre-Yves David
Browse files
Options
Downloads
Plain Diff
branching: merge stable into default
parents
c6ed4b359c4c
cd788962c6d9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1041
Merge default into stable
,
!1006
merge stable into default.
Pipeline
#89676
passed with warnings
5 months ago
Stage: tests
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
hgdemandimport/__init__.py
+1
-0
1 addition, 0 deletions
hgdemandimport/__init__.py
tests/test-demandimport.py
+10
-10
10 additions, 10 deletions
tests/test-demandimport.py
tests/test-verify-repo-operations.py
+6
-6
6 additions, 6 deletions
tests/test-verify-repo-operations.py
with
17 additions
and
16 deletions
hgdemandimport/__init__.py
+
1
−
0
View file @
5713adc5
...
...
@@ -63,6 +63,7 @@
'
_weakrefset
'
,
'
warnings
'
,
'
threading
'
,
'
collections.abc
'
,
}
_pypy
=
'
__pypy__
'
in
sys
.
builtin_module_names
...
...
This diff is collapsed.
Click to expand it.
tests/test-demandimport.py
+
10
−
10
View file @
5713adc5
...
...
@@ -149,6 +149,6 @@
assert
f
(
type
(
re
.
stderr
))
==
"
<class
'
_io.TextIOWrapper
'
>
"
,
f
(
type
(
re
.
stderr
))
assert
f
(
re
)
==
"
<module
'
sys
'
(built-in)>
"
assert
'
telnetlib
'
not
in
sys
.
modules
import
telnetlib
assert
'
wsgiref
'
not
in
sys
.
modules
import
wsgiref
...
...
@@ -154,5 +154,5 @@
assert
isinstance
(
telnetlib
,
_LazyModule
)
assert
f
(
telnetlib
)
==
"
<module
'
telnetlib
'
from
'
?
'
>
"
assert
isinstance
(
wsgiref
,
_LazyModule
)
assert
f
(
wsgiref
)
==
"
<module
'
wsgiref
'
from
'
?
'
>
"
try
:
...
...
@@ -157,6 +157,6 @@
try
:
from
telnetlib
import
unknownattr
from
wsgiref
import
unknownattr
assert
False
,
(
'
no demandmod should be created for attribute of non-package
'
...
...
@@ -160,7 +160,7 @@
assert
False
,
(
'
no demandmod should be created for attribute of non-package
'
'
module:
\n
telnetlib
.unknownattr = %s
'
%
f
(
unknownattr
)
'
module:
\n
wsgiref
.unknownattr = %s
'
%
f
(
unknownattr
)
)
except
ImportError
as
inst
:
assert
rsub
(
r
"'"
,
''
,
str
(
inst
)).
startswith
(
...
...
@@ -177,5 +177,5 @@
# test deactivation for issue6725
del
sys
.
modules
[
'
telnetlib
'
]
del
sys
.
modules
[
'
wsgiref
'
]
with
demandimport
.
deactivated
():
...
...
@@ -181,4 +181,4 @@
with
demandimport
.
deactivated
():
import
telnetlib
assert
telnetlib
.
__loader__
==
telnetlib
.
__spec__
.
loader
assert
telnetlib
.
__loader__
.
get_resource_reader
import
wsgiref
assert
wsgiref
.
__loader__
==
wsgiref
.
__spec__
.
loader
assert
wsgiref
.
__loader__
.
get_resource_reader
This diff is collapsed.
Click to expand it.
tests/test-verify-repo-operations.py
+
6
−
6
View file @
5713adc5
...
...
@@ -36,7 +36,7 @@
import
binascii
from
contextlib
import
contextmanager
import
pipes
import
shlex
import
shutil
import
silenttestrunner
import
subprocess
...
...
@@ -267,7 +267,7 @@
if
os
.
path
.
exists
(
path
):
return
self
.
log
.
append
(
"
$ mkdir -p -- %s
"
%
(
pipes
.
quote
(
os
.
path
.
relpath
(
path
)),)
"
$ mkdir -p -- %s
"
%
(
shlex
.
quote
(
os
.
path
.
relpath
(
path
)),)
)
os
.
makedirs
(
path
)
...
...
@@ -276,7 +276,7 @@
if
path
==
"
.
"
:
return
os
.
chdir
(
path
)
self
.
log
.
append
(
"
$ cd -- %s
"
%
(
pipes
.
quote
(
path
),))
self
.
log
.
append
(
"
$ cd -- %s
"
%
(
shlex
.
quote
(
path
),))
def
hg
(
self
,
*
args
):
extra_flags
=
[]
...
...
@@ -286,7 +286,7 @@
self
.
command
(
"
hg
"
,
*
(
tuple
(
extra_flags
)
+
args
))
def
command
(
self
,
*
args
):
self
.
log
.
append
(
"
$
"
+
'
'
.
join
(
map
(
pipes
.
quote
,
args
)))
self
.
log
.
append
(
"
$
"
+
'
'
.
join
(
map
(
shlex
.
quote
,
args
)))
subprocess
.
check_output
(
args
,
stderr
=
subprocess
.
STDOUT
)
# Section: Set up basic data
...
...
@@ -355,7 +355,7 @@
)
%
(
binascii
.
hexlify
(
content
),
pipes
.
quote
(
path
),
shlex
.
quote
(
path
),
)
)
...
...
@@ -405,7 +405,7 @@
if
amend
:
errors
.
append
(
"
cannot amend public changesets
"
)
command
.
append
(
"
--amend
"
)
command
.
append
(
"
-m
"
+
pipes
.
quote
(
message
))
command
.
append
(
"
-m
"
+
shlex
.
quote
(
message
))
if
secret
:
command
.
append
(
"
--secret
"
)
if
close_branch
:
...
...
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