Repository navigation
Commit 3ef8f20
Cargo VEX: read member manifests, match liveness by origin, withhold mixed and vendored bypasses (#2012)
* Match ledger liveness uuids by origin, not substring
Redirect-ledger liveness step 1 kept a record alive when any lock
inventory entry's resolved url merely CONTAINED the patch uuid, so a url
on any host spelling the uuid (or a Socket url for another patch whose
grant token is that uuid) kept a dead hosted record alive.
Step 1 now classifies the url with the one origin classifier,
`patch::redirect::hosted_patch_uuid`, over Socket's host and the run's
patch-server origins, and requires the classified uuid to equal the
record's. Discovery records the origins it was run with
(`Discovery::patch_server_origins`, set in `discover_with_ctx`), so
liveness classifies with exactly the origins discovery did; every
`LedgerLiveness` caller already holds a discovery built from the run's
`DiscoverOptions`. Socket-host and configured-origin urls for the
record's uuid stay live; anything else falls to step 2 (resolves
elsewhere: dead).
The uv script-lock regression test relied on the substring match for an
unconfigured internal host; it now shows that host dead without the
origin and live with it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Read Cargo workspace members in VEX discovery
Hosted mode pins a patched crate in the root Cargo.toml AND every
workspace-member manifest that declares it, and vendored mode's
live-redirect refusal reads member manifests too. Discovery read only
the root manifest, so a crate the root does not declare was "the lock is
the only word": a member whose declaration was reverted to crates.io
(no `registry = "socket-patch-<uuid>"`) left a ref attested although
cargo re-resolves that dependency from crates.io.
Discovery now enumerates the members the way the hosted rewriter does
(`cargo_workspace::member_manifests_in`, filtered by the rewriter's own
`is_cargo_member_manifest_key`, so nothing under `.socket/` or `target/`)
and applies its manifest-declaration check across root + members. Each
declaration carries its file: diagnostics, the conflict-pair Cargo.toml
ref and lockless `UnlockedPin`s name the member manifest that holds the
pin. `[patch]` stays root-only (cargo ignores a member's).
The member walk over a `DiskSnapshot` now notes every manifest it reads
and directory it probes or lists with the snapshot instead of asking for
its raw root, so a discovery run under a read-set recording (the re-scan
cache) keeps the recording usable.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Address review: view-mediated member walk, lockless pins, undecided liveness
Cargo member walk (review 4, 6, 7):
- `cargo_workspace::member_manifests_in` is now async over the
ProjectView: manifests are read with `read_text` (concurrently, bounded,
ordered), globs list with `list_dir`, and directory probes use the view's
own mediated `is_dir` / `is_symlink`. A snapshot's overlays and content
cache apply and its recording notes the walk, so fresh manifests (a
`.socket/` copy followed through `[patch]` included) no longer leave a
racy read set. `DiskSnapshot::touch` / `touch_listing` are private again;
`SnapshotTree` is gone. The in-memory engine keeps the sync walk
(`member_manifests_in_memory`); disk-only callers keep `member_manifests`.
A test pins the view walk to the disk walk over globs, `**`, excludes,
path dependencies, `[patch]` copies, dot / `target` dirs and a
symlinked member.
Discovery (review 5, 8):
- Members are walked only when they can matter: a lock with a
Socket-sourced package, or no lock (then parsed only when some manifest
carries a `socket-patch-` pin). The walk's texts are adopted into the
ctx's read log and rule-11 recognition instead of being read again.
- The root `DocumentMut` is moved into the manifest list, not cloned.
Lockless pins (review 1, 3):
- `UnlockedPin` gains `excluded_reqs`: the requirements of the crate's
unpinned declarations. The rewriter leaves a declaration alone only when
its requirement excludes the patched version, so a member's
`serde = "0.9"` beside a pinned `serde = "1"` no longer suppresses the
pin; a ledger version must satisfy every pinned requirement and no
excluded one. An unpinned declaration with no requirement still blocks.
- One pin and one diagnostic per (crate, patch): the union of the
pinning declarations' requirements, every pinning manifest listed once.
Liveness (review 2):
- A lock entry whose url has the hosted shape for the record's uuid on an
origin this run was not given is `RecordLiveness::Undecided`: never
attested (`redirect_record_live` / `LedgerLiveness::redirect_record`
stay attestation-grade) and never judged dead. `scan`'s takeover
classifier and hosted-wiring-retained advisory use the new
`LedgerLiveness::redirect_record_retained`, so a record written against
a patch server a later run is not pointed at keeps its wiring. A url
that merely contains the uuid (file name, query) is still dead.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Name the view walk's read-manifest pair (clippy type_complexity)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Stop attesting a Cargo pin a workspace member resolves from crates.io
Cargo resolves each source on its own. When one declaration of a crate
pins it to `socket-patch-<uuid>` but another (the root's or a workspace
member's) names no Socket registry (crates.io, another registry, a path
or git) with a requirement the locked patched version satisfies, that
declaration builds a separate, unpatched copy, possibly of the very
version the pin covers. Discovery still attested the Cargo.lock ref
because "some declaration pins the patch" was enough.
The hosted rewriter pins every declaration, so this mixed state is a
partial revert or a hand edit. The ref now stays (rollback, remove and
the ledgers' liveness still see the pin) but is marked unattested with
the new `UnattestedKind::CargoUnpinnedDeclaration`, naming the unpinned
declaration's manifest. When Cargo.lock already locks a same-version
copy from another source beside the Socket entry, the detail names that
lock entry as direct evidence. A declaration whose requirement excludes
the patched version, and a `[patch]` registry entry (which redirects
declarations rather than adding one), do not withhold the statement.
The CLI omits the ref as `vex_cargo_unpinned_declaration`; documented in
CLI_CONTRACT.md.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Classify each Cargo declaration before judging a hosted pin
Review fixes for the unpinned-declaration mark. Each declaration of a
Socket-locked crate is now classified once (`route`): routed to a Socket
patch (its own `socket-patch-<uuid>` registry, or a Socket `[patch.<source>]`
registry entry that redirects it), unpinned (cargo builds its own copy),
or saying nothing about the locked version.
- A crates.io (or registry) declaration that a Socket `[patch.<source>]`
registry entry in the root manifest or project config redirects is no
longer counted as unpinned.
- A declaration naming `registry = "socket-patch-<uuid>"` beside `path`,
`git` or `registry-index` is not a pin (the hosted rewriter's own pinned
check): cargo builds that other source, so it now marks the ref.
- Requirements go through `patch::redirect::cargo_req_selects` with the
lock's other versions of the crate, and the detail says whether a
re-scan can pin the declaration: only a crates.io declaration whose
requirement matches no other locked version; otherwise the rewriter
refuses (`redirect_cargo_toml_dep_unrewritable`), so the remedy is to
change the declaration or roll back. The CLI note's remedy is now
generic and the per-case remedy lives in the detail.
- `registry-index` declarations are reported as such, not as crates.io.
- A `[workspace.dependencies]` template counts only when some manifest
inherits it (`workspace = true`).
- When the lock already holds a same-version copy from another source,
no mark is added: the twin rule (#679) withholds the ref and names it.
- Root pinned to patch A with a member pinned to patch B (for the locked
version, and B not resolved by the lock) now emits B's Cargo.toml ref
beside A's, so the CLI's wiring-conflict gate runs.
- `Decl` carries a `DeclSource` enum and a `live` flag; the origin text is
formatted only for messages, and `[patch]` pins are built with
`Decl::patch` (no dead version parameter).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Withhold a vendored Cargo copy a member's other source bypasses
`vendor` wires a crate through the root's `[patch.crates-io]`, which
cargo applies only to declarations from crates.io. A workspace member
(or the root) that declares the crate from another registry, a
`registry-index` or git, at a requirement that may select the patched
version, resolves its own unpatched copy. The vendored ref stayed
attested beside it because the lock copy claim only reads sourceless
entries.
The ref now stays (rollback, remove and the ledgers still see the
wiring) but is marked unattested with the new
`UnattestedKind::CargoPatchBypassed`, naming the declaration. A
same-version Cargo.lock entry from any registry or git source beside the
copy is marked the same way, naming the lock entry. The check reads the
declarations through #2019's classification: live declarations only, a
registry dependency counts as covered when a `[patch.<registry>]` table
pointing at the same copy redirects it (`Decl::patched_by`), a path
declaration (the user's own fork) keeps the existing "ignored" rule, and
a `socket-patch-*` registry dependency is hosted wiring. The CLI omits
the ref as `vex_cargo_patch_bypassed`; documented in CLI_CONTRACT.md.
The workspace member walk ran only when the lock held a Socket-sourced
package (or, with no lock, a manifest named a `socket-patch-` registry).
A vendored copy's lock entry has no source and it has no such pin, so
the walk now also runs whenever the root manifest or the project config
wires a Socket copy through `[patch]`, whatever the lock's state.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Classify Cargo lockless pins, git patch tables and conflict pins
Three Cargo follow-ups to the declaration classification:
Lockless pins read declarations like locked ones. A
`socket-patch-<uuid>` registry beside `path`, `git` or `registry-index`
is no pin (cargo builds that source, and the rewriter's own pinned check
agrees), so it no longer adds its requirement to an `UnlockedPin` or
makes one on its own. It counts as an unpinned declaration instead,
excluding the versions it accepts (every version, without a
requirement). A `[workspace.dependencies]` template no manifest
inherits is no declaration: a Socket-pinned one makes no lockless pin,
and an unpinned one excludes nothing from the root's pin. A non-Socket
`[patch]` registry entry no longer counts as an unpinned declaration
either (it redirects declarations, it adds none).
`DeclSource::Git` keeps its URL, and `Decl::patched_by` matches a
`[patch."<repository URL>"]` table against it (a trailing `/` or `.git`
ignored). So a git declaration whose repository table points at the
same vendored copy no longer withholds that copy, while one from
another repository still does. Hosted routing gains the same match for
a Socket registry pin in such a table.
When no declaration pins the lock's patch, a pin to another patch now
makes the conflict pair only when it is live and its requirement may
select the locked version (`cargo_req_selects`). One that excludes it is
about another version; the stale lock entry is then diagnosed and
dropped like any unrouted one.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Normalize foreign hosted urls before reading their origin
foreign_hosted_uuid parsed the raw lock url, while hosted_patch_uuid
first unescapes \/, percent-decodes and strips a Cargo sparse+ /
registry+ prefix. A hosted url on an unconfigured origin that only
parses after that normalization was never Undecided and could be
marked Dead, dropping live wiring. Share the normalization. Addresses
one of the two Bugbot findings on this PR.
Co-Authored-By: Claude <noreply@anthropic.com>
* Fix review findings on Cargo vendored bypass and pin diagnostics
False attestation: the vendored bypass check counted a declaration as
redirected by any root or config `[patch]` entry pointing at the copy,
including a manifest entry cargo ignores (the project config redefines
its crates.io key, or a crates.io URL table replaces `[patch.crates-io]`).
Cargo then builds whatever replaced it for those declarations, while the
copy's other, honored entry was attested. Only honored entries count now:
the root's `[patch]` entries are collected once with their shadow reason
(a `Shadow` built from the root manifest and the config), and the bypass
check sees only the unshadowed ones. `vendored` (the member gate) is
derived from the same list instead of re-reading every `[patch]` table.
One classifier: the bypass check runs each declaration through `route`
with the copy's honored `[patch]` tables as the pins, as hosted pins do,
passing the lock's other versions of the crate. A path declaration (the
user's own fork) is still left alone.
`patched_by` now covers a `registry-index` declaration with a
`[patch."<index URL>"]` table for the same index (a `registry+` prefix,
host case and a trailing `/` ignored; `sparse+` is another source), and
treats a `registry-index` naming the crates.io git index as crates.io.
The sparse crates.io index stays a separate source. Git URLs compare as
cargo's `CanonicalUrl` spells them (one trailing `/` and a `.git` suffix
dropped, a GitHub URL lowercased whole, any host lowercased).
The bypass detail ends with the remedy for its evidence: a declaration
(re-running `vendor` does not help), a crates.io lock entry beside a
`[patch.crates-io]` copy (stale: re-lock), or another lock entry
(`cargo tree -i` names its declarer). The CLI note no longer claims
re-vendoring never helps.
Diagnostics: a Socket pin to another patch that the lock does not
reflect (its requirement excludes every locked version) used to vanish
once any Socket entry of the crate was locked; it is now diagnosed
`patched_ref_unattributable`. A well-formed `socket-patch-<uuid>`
registry that pins nothing (beside `path` / `git` / `registry-index`, or
on a `[workspace.dependencies]` entry no manifest inherits) is diagnosed
`patched_ref_invalid`. The committed `workspace-member` redirect golden
gains that diagnostic: its `expected/` tree omits the unchanged
inheriting member, so the pinned template reads as uninherited there.
`Decl::describe` and `same_version_foreign_entry` are shared by the
hosted and vendored checks.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Read Cargo members whenever a Socket pin could need them
Second review round on Cargo member liveness and origin matching.
- `read_members` returned nothing for a parsed lock with no
Socket-sourced package or an unparseable one, so a member's
`socket-patch-` pin beside a stale lock lost its "stale lock, or a
server outside the allowlist" diagnostic and its uuid was no longer
recognized (rule 11). Members are now parsed whenever the lock is
Socket-sourced or a `socket-patch-` name appears in a member's text,
the root's or the config's, whatever the lock says; a root or config
`[patch]` pin now counts too (it governs members' declarations).
- `foreign_hosted_uuid` read any url on any host ending in the record's
uuid as a foreign patch server's, so an artifact store's
`/blobs/<uuid>/` url kept a dead hosted record retained (and raised a
takeover note). It now needs a patch server's path shape (a `patch`,
`patch-registry` or `gopatch` segment).
- Two inserted functions split their neighbours' doc comments
(`hosted_patch_url_uuids`, `log_read`); restored.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Count registry = "crates-io" as re-pinnable in the Cargo remedy
Second review round. The unpinned-declaration remedy sent every
declaration with an explicit `registry` key to "it names another
registry ... roll the patch back", including `registry = "crates-io"`,
which the hosted rewriter re-pins (#386); it now says a re-scan pins it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Let a shadowed [patch] Socket pin pin no hosted declaration
FALSE ATTESTATION (found reviewing #2019; fixed here, where `Shadow`
lives): a root `[patch.crates-io]` Socket registry pin cargo ignores
(a `[patch."<crates.io URL>"]` table replaces it, or the config
redefines the key) still counted as pinning every crates.io
declaration of the crate, so a member's plain declaration was taken as
routed to the patch and the hosted ref attested while cargo builds
crates.io. Such an entry stays a declaration (Socket's wiring is
present, the ref stays) but is not live, and `route` only weighs live
`[patch]` pins, as the vendored bypass check already weighs only
honored entries.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Shadow a manifest [patch] item by any config item for its source and key
Cargo replaces a manifest [patch] item with a project-config item of the
same source and key, whatever the source table and whether either wires a
path. Shadow only looked at crates.io tables and treated two path-less
items (a registry pin and a git fork) as the same wiring, so a config fork
left the manifest's Socket pin live and its stale lock row could be
attested. Only an identical path is now the same wiring, and named and
URL tables are compared too (URLs as an index key).
The ineffective-registry diagnostic also called a shadowed [patch] pin an
uninherited [workspace.dependencies] template; it now says cargo ignores
the [patch] entry.
Addresses Bugbot 4501098254, 4501098256 and 4501098258.
Co-Authored-By: Claude <noreply@anthropic.com>
* Compare [patch] URL tables the way cargo canonicalizes them
Shadow compared a config's [patch."<url>"] table with the manifest's
through index_key, which keeps a trailing .git and a GitHub path's case.
Cargo canonicalizes both, so a config item under a canonical-equivalent
git URL replaced the manifest's Socket copy while discovery still counted
it. Non-sparse URL tables now compare through git_key; sparse+ ones stay
index keys (another source).
Addresses Bugbot 4501313607.
Co-Authored-By: Claude <noreply@anthropic.com>
* Treat registry = "crates-io" as crates.io for URL-form [patch] tables
Cargo reads an explicit `registry = "crates-io"` the same as no
registry, so a Socket pin under `[patch."https://github.com/rust-lang/
crates.io-index"]` redirects such a declaration. `patched_by` only
compared the key to the table name, so it missed that case and marked
the lock ref CargoUnpinnedDeclaration. Route the explicit spelling
through `is_crates_io_source` like a bare declaration (Bugbot on #2019).
Co-Authored-By: Claude <noreply@anthropic.com>
* Withhold a vendored Cargo copy a stale pin to another patch bypasses
patch_bypassed only withheld the vendored ref for declarations route()
finds Unpinned. A member declaring the crate from another socket-patch
registry routes to Pin(other) and was skipped. When the lock resolves the
crate from that patch, its hosted ref sits beside the vendored one and the
CLI's wiring_conflict gate refuses both. When the lock is stale and holds
no entry from that patch, only a patched_ref_unattributable diagnostic was
left, and patch A was attested even though the member re-resolves to
patch B. Mark the vendored copy CargoPatchBypassed in that case instead.
Co-Authored-By: Claude <noreply@anthropic.com>
* Pair the stale-pin bypass with an emitted ref, not any lock line
The exemption for a member pinned to another Socket patch trusted any
lock line from that patch. hosted_from_lock drops a line whose project
registry definition disagrees, and a line at another version is no ref
for this package, so wiring_conflicts never fired and the vendored copy
stayed attested. Exempt only when the hosted pass emitted a ref for that
patch at this very purl that is not itself withheld.
Co-Authored-By: Claude <noreply@anthropic.com>
* Fail closed on hosted wiring from an unconfigured patch server
Owner decision on #2012: a pre-v5 redirect-ledger record whose wiring
resolves the package from a hosted-shaped url on an origin this run was
not given (a staging server used without --patch-server-url, or a
look-alike host) is never attested. vex reports it as redirect_unwired,
whatever is installed and even under --no-verify.
Step 1 of redirect_record_verdict already returned Undecided for a lock
inventory entry carrying such a url. The formats whose inventory has no
url (yarn berry __archiveUrl bindings, Cargo.lock registry sources, pom
repositories, Gemfile source blocks, go.mod replace module paths) fell
through to the recorded-wiring step 3 (or the gem step 0) and attested.
Those steps now return Undecided when any recorded file spells a
hosted-shaped url for the uuid on an unconfigured origin. A Socket-host
spelling elsewhere in the files does not clear it.
foreign_hosted_uuid drops userinfo before reading the origin, so a
https://patch.socket.dev@evil.example/... look-alike is Undecided in
every step rather than Dead in step 1 and Live in step 3.
vex adds a vex_claim_unwired note for such a record naming the cause and
--patch-server-url. CLI_CONTRACT.md "Patch hosts (manifest-less VEX)"
and the vex_sources module docs state the new rule. The yarn, cargo and
maven e2e cells that asserted the old staging fallback now expect
redirect_unwired.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Ask the hosted rewriter whether a re-scan can pin a Cargo declaration
Review on #2019 (/code-review high):
- The vex_cargo_unpinned_declaration remedy said "re-run socket-patch
scan" whenever every unpinned declaration was a crates.io one the
rewriter would pin. The rewriter skips the whole dependency on its
first refusal, including one over a declaration discovery doesn't count
as unpinned (the pin's own requirement matching another locked version,
a path template nobody inherits). Discovery now runs the rewriter's own
Cargo.toml planner dry over the same manifests (plan_cargo_tomls,
extracted from rewrite_cargo_with) before it promises a re-scan.
- A declaration naming registry = "socket-patch-<uuid>" beside a path,
git or registry-index read as if the registry were missing. The detail
now says the source overrides it, and says "those declarations" when
there are several.
- manifest_declarations looks up inherited template keys in a set.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Fix review findings on Cargo [patch] shadowing and bypass details
Review on #2024 (/code-review high), round 4:
- The "resolves it only from other Socket patches" diagnostic fired
beside a same-version crates.io twin; it now needs a lock with no
non-Socket entry of the crate.
- Shadow resolves a [patch.<registry>] table through the config's
[registries] index, so a config [patch."<index>"] item shadows it.
- An identical path-less Socket registry [patch] pin in the manifest and
the config is the same wiring, not a shadow.
- patched_by (registry-index) and same_patch_source share
patch_source_key, with CanonicalUrl rules on both.
- patch_bypassed's conflict-gate check matches the CLI's bypassed_ref
(file-scoped marks only); it routes each declaration once; its detail
also names other-patch declarations; a git lock entry a git [patch]
table redirects gets the stale/re-lock remedy.
- Reuse patch::redirect::is_crates_io_source for lock sources.
- Move the manifests comment back above its vector.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Simplify the folded Cargo VEX stack
Behavior-preserving cleanup of #2012 after #2019 and #2024 were folded in:
- One `distinct<T>` replaces four hand-written order-preserving dedups;
`describe_all` and one `other_declared` replace repeated describe/join
chains.
- `DeclSource::patched_by` is the one redirect rule; the bypass check's
stale-entry test maps the lock source to a `DeclSource` instead of
re-deriving crates.io and git matching. `index_key` is folded into
`patch_source_key`.
- `beside_the_pin` collects the lock's Socket uuids once; the manifests
are serialized for the rewriter's dry planner once per discovery
(`ManifestTexts`), not per crate. `vendored_from_patches` takes the lock
from `Bypass`; the two `decls` passes in `extract` are one.
- `foreign_hosted_uuid` moves to `origin::hosted_shape_uuid`, so
`normalized_hosted_url` is private again; the cheap accepted-origin
check runs first in `foreign_hosted_url_in_files`.
- Comments and docs no longer narrate review history; the cargo module
doc points at `beside_the_pin` / `patch_bypassed` instead of restating
them; CLI_CONTRACT.md states the registry-index rule once and the
`apply` sentence parses.
- Tests share `workspace_root`, `member`, `one_mark` and `shadow` instead
of respelling manifests and config parsing; the e2e fail-closed comments
point at CLI_CONTRACT.md.
Review of the simplify diff (/code-review high): the stale-lock remedy
named `[patch.crates-io]` and `socket-patch vendor` for a git entry too;
it now names the table that redirects the entry and offers `vendor` only
for crates.io. CLI_CONTRACT.md keeps the member-walk and uninherited-
template rules the trim had dropped.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>1 parent 6d17873 commit 3ef8f20
16 files changed
Lines changed: 4144 additions & 507 deletions
File tree
- crates
- socket-patch-cli
- src/commands
- scan
- tests/e2e_vex_lockfile
- socket-patch-core
- src
- hosted
- memory
- patch/redirect
- utils
- vex/discover
- testing
- tests/fixtures/vex-discover-golden
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
981 | 981 | | |
982 | 982 | | |
983 | 983 | | |
984 | | - | |
985 | | - | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
986 | 988 | | |
987 | 989 | | |
988 | 990 | | |
| |||
1067 | 1069 | | |
1068 | 1070 | | |
1069 | 1071 | | |
1070 | | - | |
| 1072 | + | |
1071 | 1073 | | |
1072 | 1074 | | |
1073 | 1075 | | |
| |||
1394 | 1396 | | |
1395 | 1397 | | |
1396 | 1398 | | |
1397 | | - | |
1398 | | - | |
| 1399 | + | |
| 1400 | + | |
| 1401 | + | |
1399 | 1402 | | |
1400 | 1403 | | |
1401 | 1404 | | |
| |||
1438 | 1441 | | |
1439 | 1442 | | |
1440 | 1443 | | |
1441 | | - | |
| 1444 | + | |
1442 | 1445 | | |
1443 | 1446 | | |
1444 | 1447 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
48 | 51 | | |
49 | 52 | | |
50 | 53 | | |
| |||
82 | 85 | | |
83 | 86 | | |
84 | 87 | | |
85 | | - | |
| 88 | + | |
86 | 89 | | |
87 | 90 | | |
88 | 91 | | |
| |||
232 | 235 | | |
233 | 236 | | |
234 | 237 | | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
235 | 246 | | |
236 | 247 | | |
237 | 248 | | |
| |||
300 | 311 | | |
301 | 312 | | |
302 | 313 | | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
303 | 323 | | |
304 | 324 | | |
305 | 325 | | |
| |||
660 | 680 | | |
661 | 681 | | |
662 | 682 | | |
663 | | - | |
664 | | - | |
665 | | - | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
666 | 691 | | |
667 | 692 | | |
668 | 693 | | |
| |||
671 | 696 | | |
672 | 697 | | |
673 | 698 | | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
674 | 702 | | |
675 | 703 | | |
676 | 704 | | |
| |||
1096 | 1124 | | |
1097 | 1125 | | |
1098 | 1126 | | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
1099 | 1141 | | |
1100 | 1142 | | |
1101 | 1143 | | |
| |||
2090 | 2132 | | |
2091 | 2133 | | |
2092 | 2134 | | |
| 2135 | + | |
| 2136 | + | |
| 2137 | + | |
| 2138 | + | |
| 2139 | + | |
| 2140 | + | |
| 2141 | + | |
| 2142 | + | |
| 2143 | + | |
| 2144 | + | |
| 2145 | + | |
| 2146 | + | |
| 2147 | + | |
| 2148 | + | |
| 2149 | + | |
| 2150 | + | |
| 2151 | + | |
| 2152 | + | |
| 2153 | + | |
| 2154 | + | |
| 2155 | + | |
| 2156 | + | |
| 2157 | + | |
| 2158 | + | |
| 2159 | + | |
| 2160 | + | |
| 2161 | + | |
| 2162 | + | |
| 2163 | + | |
| 2164 | + | |
| 2165 | + | |
| 2166 | + | |
| 2167 | + | |
| 2168 | + | |
| 2169 | + | |
| 2170 | + | |
| 2171 | + | |
| 2172 | + | |
| 2173 | + | |
| 2174 | + | |
| 2175 | + | |
| 2176 | + | |
| 2177 | + | |
| 2178 | + | |
| 2179 | + | |
| 2180 | + | |
| 2181 | + | |
| 2182 | + | |
| 2183 | + | |
| 2184 | + | |
| 2185 | + | |
| 2186 | + | |
| 2187 | + | |
| 2188 | + | |
| 2189 | + | |
| 2190 | + | |
| 2191 | + | |
| 2192 | + | |
| 2193 | + | |
| 2194 | + | |
| 2195 | + | |
| 2196 | + | |
| 2197 | + | |
| 2198 | + | |
| 2199 | + | |
| 2200 | + | |
| 2201 | + | |
| 2202 | + | |
| 2203 | + | |
| 2204 | + | |
| 2205 | + | |
| 2206 | + | |
| 2207 | + | |
| 2208 | + | |
| 2209 | + | |
| 2210 | + | |
| 2211 | + | |
| 2212 | + | |
| 2213 | + | |
| 2214 | + | |
| 2215 | + | |
| 2216 | + | |
| 2217 | + | |
| 2218 | + | |
| 2219 | + | |
| 2220 | + | |
| 2221 | + | |
| 2222 | + | |
| 2223 | + | |
| 2224 | + | |
| 2225 | + | |
| 2226 | + | |
| 2227 | + | |
| 2228 | + | |
| 2229 | + | |
| 2230 | + | |
| 2231 | + | |
| 2232 | + | |
| 2233 | + | |
| 2234 | + | |
2093 | 2235 | | |
2094 | 2236 | | |
2095 | 2237 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
913 | 913 | | |
914 | 914 | | |
915 | 915 | | |
916 | | - | |
917 | | - | |
918 | | - | |
919 | | - | |
920 | | - | |
921 | | - | |
922 | | - | |
923 | | - | |
924 | | - | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
925 | 919 | | |
926 | | - | |
927 | | - | |
928 | | - | |
929 | | - | |
930 | | - | |
931 | | - | |
932 | | - | |
933 | | - | |
934 | | - | |
935 | | - | |
936 | | - | |
937 | | - | |
938 | | - | |
939 | | - | |
940 | | - | |
941 | | - | |
942 | | - | |
943 | | - | |
944 | | - | |
945 | | - | |
946 | | - | |
947 | | - | |
948 | | - | |
949 | | - | |
950 | | - | |
951 | | - | |
952 | | - | |
953 | | - | |
954 | | - | |
955 | | - | |
956 | | - | |
957 | | - | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
958 | 941 | | |
959 | 942 | | |
960 | 943 | | |
| |||
0 commit comments