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
Show more breadcrumbs
mercurial
mercurial-devel
Commits
e96a0a53de20
Commit
e96a0a53de20
authored
4 years ago
by
Simon Sapin
Browse files
Options
Downloads
Patches
Plain Diff
tests: Adapt expected output for minor differences with rhg
Differential Revision:
https://phab.mercurial-scm.org/D10135
parent
2255e7eb39e5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tests/test-globalopts.t
+1
-1
1 addition, 1 deletion
tests/test-globalopts.t
tests/test-hgrc.t
+1
-1
1 addition, 1 deletion
tests/test-hgrc.t
tests/test-ssh.t
+22
-0
22 additions, 0 deletions
tests/test-ssh.t
with
24 additions
and
2 deletions
tests/test-globalopts.t
+
1
−
1
View file @
e96a0a53
...
...
@@ -264,7 +264,7 @@
Testing --traceback:
#if no-chg
#if no-chg
no-rhg
$ hg --cwd c --config x --traceback id 2>&1 | grep -i
'
traceback
'
Traceback (most recent call last):
Traceback (most recent call last): (py3 !)
...
...
This diff is collapsed.
Click to expand it.
tests/test-hgrc.t
+
1
−
1
View file @
e96a0a53
...
...
@@ -59,7 +59,7 @@
#if unix-permissions no-root
$ chmod u-r $TESTTMP/included
$ hg showconfig section
config error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied)
config error at $TESTTMP/hgrc:2: cannot include $TESTTMP/included (Permission denied
*) (glob
)
[255]
#endif
...
...
This diff is collapsed.
Click to expand it.
tests/test-ssh.t
+
22
−
0
View file @
e96a0a53
...
...
@@ -390,6 +390,7 @@
abort:
destination
'
a repo
'
is
not
empty
[
10
]
#if no-rhg
Make
sure
hg
is
really
paranoid
in
serve
--
stdio
mode
.
It
used
to
be
possible
to
get
a
debugger
REPL
by
specifying
a
repo
named
--
debugger
.
$
hg
-
R
--
debugger
serve
--
stdio
...
...
@@ -402,6 +403,27 @@
$ hg -R narf serv --stdio
abort: potentially unsafe serve --stdio invocation: [
'
-
R
'
,
'
narf
'
,
'
serv
'
,
'
--
stdio
'
]
[255]
#else
rhg aborts early on -R without a repository at that path
$ hg -R --debugger serve --stdio
abort: potentially unsafe serve --stdio invocation: [
'
-
R
'
,
'
--
debugger
'
,
'
serve
'
,
'
--
stdio
'
] (missing-correct-output !)
abort: repository --debugger not found (known-bad-output !)
[255]
$ hg -R --config=ui.debugger=yes serve --stdio
abort: potentially unsafe serve --stdio invocation: [
'
-
R
'
,
'
--
config
=
ui
.
debugger
=
yes
'
,
'
serve
'
,
'
--
stdio
'
] (missing-correct-output !)
abort: repository --config=ui.debugger=yes not found (known-bad-output !)
[255]
$ hg -R narf serv --stdio
abort: potentially unsafe serve --stdio invocation: [
'
-
R
'
,
'
narf
'
,
'
serv
'
,
'
--
stdio
'
] (missing-correct-output !)
abort: repository narf not found (known-bad-output !)
[255]
If the repo does exist, rhg finds an unsupported command and falls back to Python
which still does the right thing
$ hg init narf
$ hg -R narf serv --stdio
abort: potentially unsafe serve --stdio invocation: [
'
-
R
'
,
'
narf
'
,
'
serv
'
,
'
--
stdio
'
]
[255]
#endif
Test hg-ssh using a helper script that will restore PYTHONPATH (which might
have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
...
...
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