Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pascal Bach
CMake
Commits
f10b2f72
Commit
f10b2f72
authored
8 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
ctest_update: Capture failure of svn to load revisions and local mods
Issue: #16646
parent
ef399f9b
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
Source/CTest/cmCTestSVN.cxx
+14
-9
14 additions, 9 deletions
Source/CTest/cmCTestSVN.cxx
Source/CTest/cmCTestSVN.h
+2
-2
2 additions, 2 deletions
Source/CTest/cmCTestSVN.h
with
16 additions
and
11 deletions
Source/CTest/cmCTestSVN.cxx
+
14
−
9
View file @
f10b2f72
...
...
@@ -99,7 +99,9 @@ std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo)
bool
cmCTestSVN
::
NoteOldRevision
()
{
this
->
LoadRepositories
();
if
(
!
this
->
LoadRepositories
())
{
return
false
;
}
std
::
list
<
SVNInfo
>::
iterator
itbeg
=
this
->
Repositories
.
begin
();
std
::
list
<
SVNInfo
>::
iterator
itend
=
this
->
Repositories
.
end
();
...
...
@@ -121,7 +123,9 @@ bool cmCTestSVN::NoteOldRevision()
bool
cmCTestSVN
::
NoteNewRevision
()
{
this
->
LoadRepositories
();
if
(
!
this
->
LoadRepositories
())
{
return
false
;
}
std
::
list
<
SVNInfo
>::
iterator
itbeg
=
this
->
Repositories
.
begin
();
std
::
list
<
SVNInfo
>::
iterator
itend
=
this
->
Repositories
.
end
();
...
...
@@ -374,17 +378,18 @@ private:
bool
cmCTestSVN
::
LoadRevisions
()
{
bool
result
=
true
;
// Get revisions for all the external repositories
std
::
list
<
SVNInfo
>::
iterator
itbeg
=
this
->
Repositories
.
begin
();
std
::
list
<
SVNInfo
>::
iterator
itend
=
this
->
Repositories
.
end
();
for
(;
itbeg
!=
itend
;
itbeg
++
)
{
SVNInfo
&
svninfo
=
*
itbeg
;
LoadRevisions
(
svninfo
);
result
=
this
->
LoadRevisions
(
svninfo
)
&&
result
;
}
return
true
;
return
result
;
}
void
cmCTestSVN
::
LoadRevisions
(
SVNInfo
&
svninfo
)
bool
cmCTestSVN
::
LoadRevisions
(
SVNInfo
&
svninfo
)
{
// We are interested in every revision included in the update.
std
::
string
revs
;
...
...
@@ -403,7 +408,7 @@ void cmCTestSVN::LoadRevisions(SVNInfo& svninfo)
svn_log
.
push_back
(
svninfo
.
LocalPath
.
c_str
());
LogParser
out
(
this
,
"log-out> "
,
svninfo
);
OutputLogger
err
(
this
->
Log
,
"log-err> "
);
this
->
RunSVNCommand
(
svn_log
,
&
out
,
&
err
);
return
this
->
RunSVNCommand
(
svn_log
,
&
out
,
&
err
);
}
void
cmCTestSVN
::
DoRevisionSVN
(
Revision
const
&
revision
,
...
...
@@ -525,10 +530,10 @@ private:
}
};
void
cmCTestSVN
::
LoadRepositories
()
bool
cmCTestSVN
::
LoadRepositories
()
{
if
(
!
this
->
Repositories
.
empty
())
{
return
;
return
true
;
}
// Info for root repository
...
...
@@ -540,7 +545,7 @@ void cmCTestSVN::LoadRepositories()
svn_status
.
push_back
(
"status"
);
ExternalParser
out
(
this
,
"external-out> "
);
OutputLogger
err
(
this
->
Log
,
"external-err> "
);
this
->
RunSVNCommand
(
svn_status
,
&
out
,
&
err
);
return
this
->
RunSVNCommand
(
svn_status
,
&
out
,
&
err
);
}
std
::
string
cmCTestSVN
::
SVNInfo
::
BuildLocalPath
(
std
::
string
const
&
path
)
const
...
...
This diff is collapsed.
Click to expand it.
Source/CTest/cmCTestSVN.h
+
2
−
2
View file @
f10b2f72
...
...
@@ -77,10 +77,10 @@ private:
SVNInfo
*
RootInfo
;
std
::
string
LoadInfo
(
SVNInfo
&
svninfo
);
void
LoadRepositories
();
bool
LoadRepositories
();
bool
LoadModifications
()
CM_OVERRIDE
;
bool
LoadRevisions
()
CM_OVERRIDE
;
void
LoadRevisions
(
SVNInfo
&
svninfo
);
bool
LoadRevisions
(
SVNInfo
&
svninfo
);
void
GuessBase
(
SVNInfo
&
svninfo
,
std
::
vector
<
Change
>
const
&
changes
);
...
...
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