Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
b8c78764
Commit
b8c78764
authored
Jun 15, 2010
by
Friedemann Kleint
Browse files
VCS[Mercurial]: Remove LANG=C setting
as it breaks the log output. Task-number: QTCREATORBUG-1623
parent
8c7a54bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/mercurial/mercurialclient.cpp
View file @
b8c78764
...
...
@@ -121,8 +121,6 @@ bool MercurialClient::executeHgSynchronously(const QString &workingDir,
QProcess
hgProcess
;
if
(
!
workingDir
.
isEmpty
())
hgProcess
.
setWorkingDirectory
(
workingDir
);
MercurialJobRunner
::
setProcessEnvironment
(
hgProcess
);
const
MercurialSettings
&
settings
=
MercurialPlugin
::
instance
()
->
settings
();
const
QString
binary
=
settings
.
binary
();
const
QStringList
arguments
=
settings
.
standardArguments
()
+
args
;
...
...
src/plugins/mercurial/mercurialjobrunner.cpp
View file @
b8c78764
...
...
@@ -162,16 +162,6 @@ QString MercurialJobRunner::msgTimeout(int timeoutSeconds)
return
tr
(
"Timed out after %1s waiting for mercurial process to finish."
).
arg
(
timeoutSeconds
);
}
// Set environment for a hg process to run in locale "C". Note that there appears
// to be a bug in hg that causes special characters to be garbled when running
// in a different language, which seems to be independent from the encoding.
void
MercurialJobRunner
::
setProcessEnvironment
(
QProcess
&
p
)
{
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
env
.
insert
(
QLatin1String
(
"LANG"
),
QString
(
QLatin1Char
(
'C'
)));
p
.
setProcessEnvironment
(
env
);
}
void
MercurialJobRunner
::
task
(
const
QSharedPointer
<
HgTask
>
&
job
)
{
HgTask
*
taskData
=
job
.
data
();
...
...
@@ -203,9 +193,6 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
qDebug
()
<<
Q_FUNC_INFO
<<
"Repository root is "
<<
taskData
->
repositoryRoot
();
QProcess
hgProcess
;
hgProcess
.
setWorkingDirectory
(
taskData
->
repositoryRoot
());
MercurialJobRunner
::
setProcessEnvironment
(
hgProcess
);
hgProcess
.
start
(
binary
,
args
);
if
(
!
hgProcess
.
waitForStarted
())
{
...
...
src/plugins/mercurial/mercurialjobrunner.h
View file @
b8c78764
...
...
@@ -99,9 +99,6 @@ public:
static
QString
msgStartFailed
(
const
QString
&
binary
,
const
QString
&
why
);
static
QString
msgTimeout
(
int
timeoutSeconds
);
// Set environment for a hg process to run in locale "C"
static
void
setProcessEnvironment
(
QProcess
&
p
);
protected:
void
run
();
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment