Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0bde65dd
Unverified
Commit
0bde65dd
authored
Sep 16, 2021
by
Alex
Committed by
GitHub
Sep 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a small conductor messaging bug (#90229)
* fixed a small messaging bug * forgot to remove a s
parent
93de90bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
next.dart
dev/conductor/lib/next.dart
+11
-4
next_test.dart
dev/conductor/test/next_test.dart
+1
-1
No files found.
dev/conductor/lib/next.dart
View file @
0bde65dd
...
@@ -137,7 +137,11 @@ void runNext({
...
@@ -137,7 +137,11 @@ void runNext({
if
(
unappliedCherrypicks
.
isEmpty
)
{
if
(
unappliedCherrypicks
.
isEmpty
)
{
stdio
.
printStatus
(
'All engine cherrypicks have been auto-applied by the conductor.
\n
'
);
stdio
.
printStatus
(
'All engine cherrypicks have been auto-applied by the conductor.
\n
'
);
}
else
{
}
else
{
stdio
.
printStatus
(
'There were
${unappliedCherrypicks.length}
cherrypicks that were not auto-applied.'
);
if
(
unappliedCherrypicks
.
length
==
1
)
{
stdio
.
printStatus
(
'There was
${unappliedCherrypicks.length}
cherrypick that was not auto-applied.'
);
}
else
{
stdio
.
printStatus
(
'There were
${unappliedCherrypicks.length}
cherrypicks that were not auto-applied.'
);
}
stdio
.
printStatus
(
'These must be applied manually in the directory '
stdio
.
printStatus
(
'These must be applied manually in the directory '
'
${state.engine.checkoutPath}
before proceeding.
\n
'
);
'
${state.engine.checkoutPath}
before proceeding.
\n
'
);
}
}
...
@@ -264,9 +268,12 @@ void runNext({
...
@@ -264,9 +268,12 @@ void runNext({
}
else
if
(
unappliedCherrypicks
.
isEmpty
)
{
}
else
if
(
unappliedCherrypicks
.
isEmpty
)
{
stdio
.
printStatus
(
'All framework cherrypicks were auto-applied by the conductor.'
);
stdio
.
printStatus
(
'All framework cherrypicks were auto-applied by the conductor.'
);
}
else
{
}
else
{
stdio
.
printStatus
(
if
(
unappliedCherrypicks
.
length
==
1
)
{
'There were
${unappliedCherrypicks.length}
cherrypicks that were not auto-applied.'
,
stdio
.
printStatus
(
'There was
${unappliedCherrypicks.length}
cherrypick that was not auto-applied.'
,);
);
}
else
{
stdio
.
printStatus
(
'There were
${unappliedCherrypicks.length}
cherrypicks that were not auto-applied.'
,);
}
stdio
.
printStatus
(
stdio
.
printStatus
(
'These must be applied manually in the directory '
'These must be applied manually in the directory '
'
${state.framework.checkoutPath}
before proceeding.
\n
'
,
'
${state.framework.checkoutPath}
before proceeding.
\n
'
,
...
...
dev/conductor/test/next_test.dart
View file @
0bde65dd
...
@@ -751,7 +751,7 @@ void main() {
...
@@ -751,7 +751,7 @@ void main() {
);
);
expect
(
expect
(
stdio
.
stdout
,
stdio
.
stdout
,
contains
(
'There w
ere 1 cherrypicks that were
not auto-applied'
),
contains
(
'There w
as 1 cherrypick that was
not auto-applied'
),
);
);
expect
(
expect
(
stdio
.
stdout
,
stdio
.
stdout
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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