Repository navigation
Commit ce2e254
Add a shared terminal capability layer (ui.Env) (#1939)
* Upgrade lipgloss to v1.1.1 and termenv to v0.16.0
The terminal capability layer needs lipgloss's per-writer renderer API
(NewRenderer, SetColorProfile, Style.Renderer), which does not exist in
v0.5.0. Styling that resolves against a process-wide renderer makes output
depend on the machine running the code rather than on the stream it is
written to.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Add a shared terminal capability layer and thread it through CmdConfig
Presentation decisions across doctl are currently re-derived at each call
site from process-wide state: whether stdout is a terminal, whether NO_COLOR
is set, and little else. That answers the question about the wrong stream
when output is redirected, and it misses CI detection, terminal width, and
any ASCII fallback.
ui.Env resolves those facts once per invocation and carries them as a value,
with colour tracked separately per stream so that piping data into another
program still leaves progress on stderr styled. Animation is never inferred
from colour, since CI is routinely colour-capable but must not receive
animation frames.
CmdConfig now carries an Env. Rendering surfaces are migrated separately.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Pre-run flag validation and terminal error styling (#1941)
* pre-run flag validation and terminal error styling
* Fix pre-run validation edge cases for backup policy and error output
* Fix pre-run validation to honor defaults and reuse internal/ui styling
* Restore exit 1 and type-aware required flags; share UI env and palette
* Standardize wait and progress handling behind one shared waiter (#1946)
* Standardize wait and progress handling behind one shared waiter
* Greet the user on a bare doctl instead of printing the command listing
Running `doctl` with no arguments printed cobra's full grouped help, which
buries the two things a newcomer needs: whether their credentials work, and
where to start. Report version, account, team, and context instead, followed
by a short list of next steps and an upgrade notice when one is due.
The account line is resolved against /v2/account rather than inferred from
whether a token is configured, because "configured" and "working" are
different claims. Four outcomes are distinguished, since a user would act on
each differently: no token, accepted, rejected, and unverified. Only an HTTP
401 produces "rejected" -- a 403 from a scoped token, a 5xx, a connection
failure, or a timeout all leave validity genuinely unknown, and reporting
those as a bad token would send someone off to rotate a working credential.
Account and team are separate rows because the same login belongs to several
teams, so the email alone does not say which one a command is about to act on.
Both network lookups are bounded and run concurrently, so a user waits for the
slower rather than their sum: three seconds for the account lookup and two for
the release check, which is additionally cached for a day, skipped in CI, and
disabled outright by DOCTL_NO_UPDATE_CHECK. Retries are turned off so a
greeting cannot sit through a backoff sequence on a rate-limited API.
With no token configured, nothing is contacted at all. There is no account to
resolve, and a binary the user has not configured yet should not make
unsolicited outbound requests to report that a newer one exists; the answer
the greeting owes them is `auth init`, which needs no network to give. The
cost is that an unauthenticated user with an outdated binary is not told so.
Whether the process is in CI is passed into the release-check rule, and
whether that check may run is passed into the step that gathers the greeting,
rather than either being read from the environment where it is used. doctl's
own tests run under a CI provider, so a rule that consulted the environment
directly could not be tested without the ambient environment deciding the
answer -- clearing CI is not enough when GITHUB_ACTIONS is also set.
Args is left unset on the root command so cobra keeps rejecting unknown
subcommands through legacyArgs; only a genuinely empty invocation reaches Run.
SilenceErrors and SilenceUsage are deliberately not set, as cobra consults
them on the root as well as the executed command and would suppress every
subcommand's error output.
The semver comparison behind the notice moves out of Complete and CompleteJSON
into Version.NewerThan so the greeting can reuse it, preserving the "-release"
suffix that keeps a current release build from being reported as stale; a
"-dev" or "-beta" build of the same version is still flagged, as before.
GithubLatestVersioner gains an optional Client so the incidental check can be
time-bounded; `doctl version` behaviour is unchanged.
Co-authored-by: Cursor <cursoragent@cursor.com>
* rebased changes
* Correct the auth command descriptions that contradict the code
Co-authored-by: Cursor <cursoragent@cursor.com>
* Say when the active token came from outside the config file
Co-authored-by: Cursor <cursoragent@cursor.com>
* Fix RunAuthSwitch build break left by the rebase
writeConfig referenced a bare context identifier that was never passed
in or declared, and RunAuthSwitch still carried the old viper-based
existence check and the auth-contexts workaround for #996 that this
branch's file-based config rewrite was meant to replace. Fold the
file-based load/check/write into RunAuthSwitch directly, matching the
pattern RunAuthInit and RunAuthRemove already use, and drop the
orphaned writeConfig helper.
* Fix ASCII glyph assertions in welcome test
The ASCII fallback glyph for a valid auth state is "OK" and the
unicode one is "✓" (internal/ui/glyphs.go), not "+" and "✔" as the
test asserted. Those never appeared in the rendered output, so the
Contains check failed and the NotContains check never exercised
anything real.
* Color the welcome screen's section headers
"Welcome to DigitalOcean" is now bold blue (ui.ColorInfo) and "Get
started" is bold green (ui.ColorSuccess), reusing the palette already
defined in internal/ui/style.go instead of introducing new colors.
* Distinguish record field labels from their values
labelStyle stacked Faint on top of ColorMuted, and unclassified values
fell back to the same ColorMuted tone as their label, so on a dark
terminal a field's label and value rendered in the same washed-out
grey. Drop the Faint stacking on labels, and leave an unclassified
value in the default foreground so it reads apart from the label
introducing it.
* Structure errors as Title/Reason/Status/Next step, name exit codes
checkErr now resolves every error to a StructuredError (an explicit
implementation, or a genericStructuredError synthesized from the
status-code table) and renders Title, Reason, Status and Next step as
separate lines, mirroring the same four fields into the JSON error
envelope additively (detail is unchanged). FlagValidationError
implements the interface for its JSON output while keeping its own
richer text block.
Adds an error-code table (error_codes.go) for common API status codes
(400/401/403/404/409/422/429/5xx), each with a canned reason and a
"run <command>" next step so Style.Hint bolds the whole suggestion.
Names the two exit codes doctl has always used (exitGeneralError=1,
exitUsageError=255) instead of magic numbers, and routes the
config-read failure through checkErr instead of a raw log.Fatalln so
it gets the same formatting and a controlled exit code.
Also fixes a pre-existing bug in auth.go's writeConfig(), which
referenced an out-of-scope `context` identifier and could not compile;
it's now a parameter from its one call site.
* Surface the API's message, request ID, and a saner 404 next step
Reason() preferred the canned status-code table text over the API's
own message, so the specific detail a request failed with (e.g. "the
requested resource does not exist") never reached text output, only
JSON's detail field. It now prefers godo.ErrorResponse.Message,
falling back to the table only when the API had nothing more to say.
A 404's canned next step was "run doctl auth list", which fits a
wrong-context request no better than a plain typo'd ID, and the
latter is by far the more common case. Dropped it in favor of
StructuredError.NextStep() falling through to the command's own
--help when the table entry has nothing to suggest.
Added RequestID() to StructuredError so the identifier the API
assigned a request is available for support to look up, in text
output and the JSON envelope, instead of being buried in Error()'s
full text. Status and request-id values are painted in a light grey
distinct from both their label and the bold default-colored command
path in the hint line beneath them.
* Update integration fixtures for the structured error format
These fixtures still asserted the plain, pre-structured error text
(or, for the retry tests, a hardcoded string with reversed testify
arguments that masked which side was real). None of this was a
regression: the structured-error commit that introduced Title/
Reason/Status/NextStep never updated the golden output these tests
compare against. Update each to the new format, appending the
command-specific --help hint where the shared confirmation-abort or
timestamp-format constants can't since it differs per command.
The two retry-flag tests now expect identical output for the
retried-and-exhausted and retries-disabled cases: Reason() reads
godo.ErrorResponse.Message, not Error()'s full text, so the "giving
up after N attempts" annotation that used to distinguish them is no
longer part of what's shown.
* Add shared colorful --help layout for all doctl commands
* Highlight doctl invocations embedded in Example prose
* Fix Example highlighting across services
* Greet the user on a bare `doctl`, and stop auth commands rewriting the config file (#1954)
* Greet the user on a bare doctl instead of printing the command listing
Running `doctl` with no arguments printed cobra's full grouped help, which
buries the two things a newcomer needs: whether their credentials work, and
where to start. Report version, account, team, and context instead, followed
by a short list of next steps and an upgrade notice when one is due.
The account line is resolved against /v2/account rather than inferred from
whether a token is configured, because "configured" and "working" are
different claims. Four outcomes are distinguished, since a user would act on
each differently: no token, accepted, rejected, and unverified. Only an HTTP
401 produces "rejected" -- a 403 from a scoped token, a 5xx, a connection
failure, or a timeout all leave validity genuinely unknown, and reporting
those as a bad token would send someone off to rotate a working credential.
Account and team are separate rows because the same login belongs to several
teams, so the email alone does not say which one a command is about to act on.
Both network lookups are bounded and run concurrently, so a user waits for the
slower rather than their sum: three seconds for the account lookup and two for
the release check, which is additionally cached for a day, skipped in CI, and
disabled outright by DOCTL_NO_UPDATE_CHECK. Retries are turned off so a
greeting cannot sit through a backoff sequence on a rate-limited API.
With no token configured, nothing is contacted at all. There is no account to
resolve, and a binary the user has not configured yet should not make
unsolicited outbound requests to report that a newer one exists; the answer
the greeting owes them is `auth init`, which needs no network to give. The
cost is that an unauthenticated user with an outdated binary is not told so.
Whether the process is in CI is passed into the release-check rule, and
whether that check may run is passed into the step that gathers the greeting,
rather than either being read from the environment where it is used. doctl's
own tests run under a CI provider, so a rule that consulted the environment
directly could not be tested without the ambient environment deciding the
answer -- clearing CI is not enough when GITHUB_ACTIONS is also set.
Args is left unset on the root command so cobra keeps rejecting unknown
subcommands through legacyArgs; only a genuinely empty invocation reaches Run.
SilenceErrors and SilenceUsage are deliberately not set, as cobra consults
them on the root as well as the executed command and would suppress every
subcommand's error output.
The semver comparison behind the notice moves out of Complete and CompleteJSON
into Version.NewerThan so the greeting can reuse it, preserving the "-release"
suffix that keeps a current release build from being reported as stale; a
"-dev" or "-beta" build of the same version is still flagged, as before.
GithubLatestVersioner gains an optional Client so the incidental check can be
time-bounded; `doctl version` behaviour is unchanged.
Co-authored-by: Cursor <cursoragent@cursor.com>
* rebased changes
* Correct the auth command descriptions that contradict the code
Co-authored-by: Cursor <cursoragent@cursor.com>
* Say when the active token came from outside the config file
Co-authored-by: Cursor <cursoragent@cursor.com>
* Fix RunAuthSwitch build break left by the rebase
writeConfig referenced a bare context identifier that was never passed
in or declared, and RunAuthSwitch still carried the old viper-based
existence check and the auth-contexts workaround for #996 that this
branch's file-based config rewrite was meant to replace. Fold the
file-based load/check/write into RunAuthSwitch directly, matching the
pattern RunAuthInit and RunAuthRemove already use, and drop the
orphaned writeConfig helper.
* Fix ASCII glyph assertions in welcome test
The ASCII fallback glyph for a valid auth state is "OK" and the
unicode one is "✓" (internal/ui/glyphs.go), not "+" and "✔" as the
test asserted. Those never appeared in the rendered output, so the
Contains check failed and the NotContains check never exercised
anything real.
* Color the welcome screen's section headers
"Welcome to DigitalOcean" is now bold blue (ui.ColorInfo) and "Get
started" is bold green (ui.ColorSuccess), reusing the palette already
defined in internal/ui/style.go instead of introducing new colors.
* Distinguish record field labels from their values
labelStyle stacked Faint on top of ColorMuted, and unclassified values
fell back to the same ColorMuted tone as their label, so on a dark
terminal a field's label and value rendered in the same washed-out
grey. Drop the Faint stacking on labels, and leave an unclassified
value in the default foreground so it reads apart from the label
introducing it.
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
* Narrow the next-step hint to failures it can answer
Review feedback on the structured error format raised three problems, each
about a hint or a detail being wrong rather than missing.
`--help` was the fallback for every unannotated error, so it followed both
errors that already said what to do ("access token is required. (hint: run
'doctl auth init')") and errors it cannot explain at all - a 404, a refused
connection, an exhausted retry. It is now offered only for failures doctl
raised itself, such as a bad argument or a rejected flag combination, and
withheld once a request carries a status code or a transport error. A
status-code entry with no NextStep now means what its comment always
claimed - nothing useful to suggest - instead of falling through to --help.
409 and 5xx no longer suggest re-running the command that just failed. 409
drops the hint outright; the 5xx entries keep it only while retries have
not been spent, since the retry client giving up is evidence that trying
again immediately will not help.
godo records the retry count in ErrorResponse.Error() but not in .Message,
and the structured block reads .Message, so an exhausted retry and a
disabled one printed identically. The Reason line now carries the count.
Two defects surfaced while testing the above:
- A confirmation declined outside a terminal printed a warning and
returned ErrExitSilently, so `--output json` produced a bare warning on
stderr and nothing on stdout. It is a real error now, rendered once in
whichever format was asked for.
- commands/auth.go wrapped a rejected token with %s, hiding the godo
error from errors.As. A 401 from `doctl auth init` lost its title,
status, request ID and its `doctl auth init` hint, degrading to raw
text followed by a generic --help.
About fifty confirm-abort call sites discarded whatever AskForConfirm
returned and substituted a generic "Operation aborted.", which is how the
non-interactive warning came to be followed by a contradicting --help.
They now return the error they were handed, via confirmAction and
confirmDelete. `auth switch` and `auth remove` also disagreed about what to
call a missing context; both now report it the same way and point at
`doctl auth list`.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Keep the error block readable when the failure is not well behaved
Three gaps found while testing the previous commit, all cases where the
structured block either fell apart or said nothing useful.
godo fills ErrorResponse.Message with the raw response body when that body
is not the JSON it expected, so a proxy or load balancer between doctl and
the API can put an HTML error page there. Reason printed it verbatim: a
realistic nginx 502 rendered fifty-two lines of markup where one sentence
belongs. A message is now quoted only if it reads like one - single line,
no leading tag, and short enough to be a sentence - and the status code's
canned reason is used otherwise. The raw body is still in the JSON detail.
The attempt count moved so that it survives this fallback; previously a
502 with an unparseable body lost it.
Fourteen call sites wrapped an API error with %v or %s, which hides it from
errors.As. The same 409 rendered as a clean block from one command and as a
raw line with the method and URL in it from another. They wrap with %w now.
That alone would have cost something: with the godo error recovered, Title
returns the status name, so "Unable to delete Droplet 111" became
"Conflict" and `droplet delete 111 222` no longer said which one failed.
Title now prefers the sentence the call site wrote, falling back to the
status name when there is none. The status keeps its own line either way.
Cobra rejects an unknown subcommand only at the root, so `doctl bogus`
exited 255 while `doctl compute bogus` printed the compute help and exited
0 - a typo indistinguishable from success to anything reading the exit
code. Commands that exist only to dispatch to children now reject an
argument naming no child. The check lives in RunE because cobra returns
flag.ErrHelp for a non-runnable command before it validates arguments;
being runnable also means a bare `doctl compute` still prints its help.
One visible consequence: a group's usage block gains the "[flags]" line
that the root command has always shown.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Mask secrets and database credentials unless --show or CI is set (#1966)
* Mask secrets and database credentials unless --show or CI is set
Secret values and database passwords/connection strings were shown in
plain text by default, and secrets get had its own local --show flag.
Promote --show to a global flag, and gate masking on it and on CI
through the shared ui.Env capability layer so scripted/CI usage still
gets the real value without passing --show explicitly.
Also fold IsCI() into the same layer that decides color and TTY-gated
layout (cards, boxed tables, the records fallback), so CI gets the
same plain, uncolored output it always did even on a runner whose
streams would otherwise pass every terminal capability check.
* Mention masking in database user create/group help text
The list/get help text already noted the password is masked by
default and how to reveal it, but the user group description and
create command's help did not, leaving the tradeoff undocumented
where a user would first encounter the generated password.
* pin to godo-v1.210.0
* test fix
* test fix
* Skip welcome-screen API calls when stdout is not a TTY (#2017)
* Skip welcome-screen API calls when stdout is not a TTY.
Bare `doctl` used to be instant and offline; the greeting's account
lookup made health checks and pipes hit the API. Leave Version and
Context, and omit Account/Team instead of reporting a failed check.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Gate welcome-screen lookups on env.DataTTY.
That is the same interactive-stdout check cards and boxed tables already
use, so a pipe, CI, or machine output skips the API without a second
isTerminal helper.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Omit JSON auth fields when the welcome lookup is skipped.
Machine output stays offline with DataTTY, so reporting unverified would
look like a failed check rather than a lookup that never ran.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
* Next gen: neutral table borders, readable list colors, lookup commands in help (#2039)
* Next gen: neutral table borders, readable list colors, lookup commands in help
Address phase 1 review feedback:
- Draw boxed table and card borders in a neutral gray (ColorFrame) instead
of the success green, so a frame no longer implies a state.
- List (records) layout: labels in a slate gray (ColorLabel) that stays
legible on dark backgrounds, separators in the frame gray, and only the
resource name accented so it stands apart from the ID.
- Help: EXAMPLES now opens with the commands that list valid values for the
command's flags (e.g. size, image, region for droplet create), derived
from flag hints. Required flags lead, then flags the examples use.
- Add a shared fallback hint for --project-id, --vpc-uuid,
--private-network-uuid and --ssh-keys, and explicit hints on the main
create commands (databases, load balancer, volume, VPC, reserved IP,
droplet autoscale). Point droplet create --image at
image list-distribution.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Document installing a previous version of doctl
Add per-platform instructions for going back to an earlier release (for
example v2 to v1): the release binary as the default on any OS, Homebrew
pin and replacement on macOS, snap revert and hold on Linux, the zip and
community package managers on Windows, plus Docker tags and go install.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
* test fix
* Update signals deletion integration expectations for next-gen errors
Confirmation refusal and missing --type now render through checkErr /
flag validation as Error: / Missing required flag, not the old Warning
and missing-arguments wording brought in with main.
Co-authored-by: Cursor <cursoragent@cursor.com>
* Use shared error formatting for hosted-agent failures
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: SSharma-10 <shivanisharma@digitalocean.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>1 parent 89a2557 commit ce2e254
150 files changed
Lines changed: 12232 additions & 2054 deletions
File tree
- commands
- charm
- template
- text
- displayers
- doc
- do
- mocks
- integration
- internal
- apps/builder
- ui
- vendor
- github.com
- digitalocean/godo/util
- shiena/ansicolor
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
388 | 388 | | |
389 | 389 | | |
390 | 390 | | |
| 391 | + | |
| 392 | + | |
391 | 393 | | |
392 | 394 | | |
393 | 395 | | |
| |||
396 | 398 | | |
397 | 399 | | |
398 | 400 | | |
399 | | - | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
400 | 404 | | |
401 | | - | |
| 405 | + | |
402 | 406 | | |
403 | 407 | | |
404 | 408 | | |
| |||
422 | 426 | | |
423 | 427 | | |
424 | 428 | | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
425 | 458 | | |
426 | 459 | | |
427 | 460 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
203 | 203 | | |
204 | 204 | | |
205 | 205 | | |
| 206 | + | |
| 207 | + | |
206 | 208 | | |
207 | 209 | | |
208 | 210 | | |
| |||
231 | 233 | | |
232 | 234 | | |
233 | 235 | | |
| 236 | + | |
| 237 | + | |
234 | 238 | | |
235 | 239 | | |
236 | 240 | | |
| |||
734 | 738 | | |
735 | 739 | | |
736 | 740 | | |
737 | | - | |
738 | | - | |
739 | | - | |
740 | | - | |
741 | | - | |
742 | | - | |
| 741 | + | |
743 | 742 | | |
744 | 743 | | |
745 | 744 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
| 81 | + | |
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| 71 | + | |
70 | 72 | | |
71 | 73 | | |
72 | 74 | | |
| |||
237 | 239 | | |
238 | 240 | | |
239 | 241 | | |
240 | | - | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
241 | 246 | | |
242 | | - | |
243 | | - | |
| 247 | + | |
| 248 | + | |
244 | 249 | | |
245 | | - | |
246 | | - | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
247 | 264 | | |
248 | | - | |
| 265 | + | |
249 | 266 | | |
250 | 267 | | |
251 | | - | |
252 | | - | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
253 | 279 | | |
254 | | - | |
255 | | - | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
256 | 287 | | |
257 | 288 | | |
258 | | - | |
| 289 | + | |
259 | 290 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | | - | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
442 | 442 | | |
443 | 443 | | |
444 | 444 | | |
445 | | - | |
446 | 445 | | |
447 | | - | |
| 446 | + | |
448 | 447 | | |
449 | 448 | | |
450 | 449 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4664 | 4664 | | |
4665 | 4665 | | |
4666 | 4666 | | |
4667 | | - | |
| 4667 | + | |
4668 | 4668 | | |
4669 | 4669 | | |
4670 | 4670 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | | - | |
| 139 | + | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
| 149 | + | |
149 | 150 | | |
150 | 151 | | |
151 | 152 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
184 | | - | |
| 184 | + | |
185 | 185 | | |
186 | 186 | | |
187 | 187 | | |
| |||
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
194 | | - | |
| 194 | + | |
| 195 | + | |
195 | 196 | | |
196 | 197 | | |
197 | 198 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
25 | | - | |
26 | | - | |
27 | 24 | | |
28 | 25 | | |
29 | 26 | | |
| |||
45 | 42 | | |
46 | 43 | | |
47 | 44 | | |
48 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
49 | 48 | | |
50 | 49 | | |
51 | 50 | | |
| |||
74 | 73 | | |
75 | 74 | | |
76 | 75 | | |
77 | | - | |
78 | | - | |
79 | | - | |
| 76 | + | |
80 | 77 | | |
81 | 78 | | |
82 | 79 | | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 80 | + | |
| 81 | + | |
91 | 82 | | |
92 | | - | |
| 83 | + | |
| 84 | + | |
93 | 85 | | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
94 | 90 | | |
95 | 91 | | |
96 | 92 | | |
97 | 93 | | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
| 94 | + | |
| 95 | + | |
103 | 96 | | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
114 | 103 | | |
115 | | - | |
| 104 | + | |
116 | 105 | | |
117 | 106 | | |
118 | | - | |
119 | | - | |
120 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
121 | 110 | | |
122 | | - | |
| 111 | + | |
123 | 112 | | |
124 | 113 | | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
129 | 123 | | |
130 | | - | |
| 124 | + | |
131 | 125 | | |
132 | 126 | | |
133 | 127 | | |
134 | 128 | | |
135 | | - | |
136 | | - | |
| 129 | + | |
| 130 | + | |
137 | 131 | | |
138 | | - | |
| 132 | + | |
139 | 133 | | |
140 | 134 | | |
141 | 135 | | |
| |||
148 | 142 | | |
149 | 143 | | |
150 | 144 | | |
151 | | - | |
| 145 | + | |
152 | 146 | | |
153 | 147 | | |
154 | 148 | | |
| |||
357 | 351 | | |
358 | 352 | | |
359 | 353 | | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | | - | |
0 commit comments