pass context to dyff to display the context of changes in multiline diffs

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.

[nikitka]

dyff can show context lines of multiline YAML value changes. the helm-diff plugin has context option. With this PR, I propose passing this context option to dyff as the MultilineContextLines option. This will help betterunderstand what has changed in multiline values.

For example, without passion MultilineContextLines I get the following output:

spec.configuration
± value change in multiline text (two inserts, two deletions)
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000

It looks like one block was changed; however, I actually modified different part of the multiline value. With passing 3 context lines, the diff looks much clearer:

spec.configuration
± value change in multiline text (two inserts, two deletions)
actor_system_config:
batch_executor: 2
executor:
[59 lines unchanged)]
bsc_settings:
cluster_balancing_settings:
enable: true
- iteration_interval_ms: 600000
+ iteration_interval_ms: 500000
max_replicating_pdisks: 10
max_replicating_vdisks: 10
prefer_less_occupied_rack: true
[1550 lines unchanged)]
max_traces_per_minute: 10
uploader:
max_batch_accumulation_milliseconds: 500
- max_bytes_in_batch: 300000
+ max_bytes_in_batch: 400000
max_export_requests_inflight: 3
max_exported_spans_per_second: 3000
max_spans_in_batch: 500
[ten lines unchanged)]
hull_comp_level0_max_ssts_at_once: 2
hull_comp_sorted_parts_num: 1
kind: LocalMode

[Copilot]

Pull request overview

This PR wires the existing --context/-C option into dyff’s multiline diff rendering so dyff can show surrounding context lines within multiline YAML value changes, improving readability of multiline diffs.

Changes:

• Capture the report entry context value during dyff report generation.
• Set dyff.HumanReport.MultilineContextLines based on the captured context (when not -1).

[Copilot]

context is taken from each ReportEntry inside the loop and the final value (from the last entry) is applied to the whole dyff report. This makes the dyff multiline context setting dependent on entry ordering and can produce the wrong value when entries have different Context values (e.g., OWNERSHIP entries currently use Context=0). Consider deriving the value once from the global option (or from the first non-ownership/non-(-1) entry) and/or validating that all entries share the same context before setting MultilineContextLines.

[Copilot]

This change introduces new behavior (wiring --context/-C into dyff via MultilineContextLines) but there’s no automated test coverage for dyff report output/behavior in the diff package. Adding a focused unit test that exercises a multiline YAML value change and asserts the presence/absence of context lines based on Context would help prevent regressions across dyff version changes.