@theia/scm 1.77.0-next.95 → 1.77.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/decorations/scm-decorations-service.d.ts +2 -2
- package/lib/browser/decorations/scm-decorations-service.d.ts.map +1 -1
- package/lib/browser/decorations/scm-decorations-service.js +22 -28
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js +22 -28
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.js +2 -5
- package/lib/browser/dirty-diff/content-lines.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +15 -17
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts +1 -1
- package/lib/browser/dirty-diff/diff-computer.d.ts.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +11 -16
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +26 -28
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-decorator.js +19 -22
- package/lib/browser/dirty-diff/dirty-diff-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +11 -14
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts +3 -3
- package/lib/browser/dirty-diff/dirty-diff-navigator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +30 -40
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +50 -54
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +43 -49
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +35 -45
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +49 -54
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts +5 -5
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +77 -92
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.js +6 -10
- package/lib/browser/merge-editor/model/line-range.js.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts +1 -1
- package/lib/browser/merge-editor/model/live-diff.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +14 -18
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +4 -4
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +88 -98
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.d.ts +3 -3
- package/lib/browser/merge-editor/model/merge-range.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +26 -30
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts +1 -1
- package/lib/browser/merge-editor/model/range-editing.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-editing.js +8 -13
- package/lib/browser/merge-editor/model/range-editing.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.d.ts +2 -2
- package/lib/browser/merge-editor/model/range-mapping.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +28 -37
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.spec.js +19 -21
- package/lib/browser/merge-editor/model/range-mapping.spec.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -12
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +7 -10
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/index.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js +5 -8
- package/lib/browser/merge-editor/view/merge-editor-panes/index.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts +3 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js +11 -15
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +48 -58
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js +32 -38
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts +4 -4
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js +32 -41
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js +3 -7
- package/lib/browser/merge-editor/view/merge-editor-scroll-sync.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts +5 -5
- package/lib/browser/merge-editor/view/merge-editor-view-zones.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +18 -25
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +2 -2
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +34 -38
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +13 -16
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +7 -10
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +2 -2
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +17 -21
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +226 -229
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +70 -81
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +66 -68
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -1
- package/lib/browser/scm-action-button-widget.d.ts +2 -2
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -1
- package/lib/browser/scm-action-button-widget.js +30 -39
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.d.ts +3 -3
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-component.js +24 -29
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +2 -2
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +26 -36
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-avatar-service.js +7 -10
- package/lib/browser/scm-avatar-service.js.map +1 -1
- package/lib/browser/scm-colors.js +2 -5
- package/lib/browser/scm-colors.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +2 -2
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +25 -31
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-context-key-service.js +10 -17
- package/lib/browser/scm-context-key-service.js.map +1 -1
- package/lib/browser/scm-context-key-service.spec.js +33 -35
- package/lib/browser/scm-context-key-service.spec.js.map +1 -1
- package/lib/browser/scm-contribution.d.ts +8 -8
- package/lib/browser/scm-contribution.d.ts.map +1 -1
- package/lib/browser/scm-contribution.js +114 -131
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.js +99 -103
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts +3 -3
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +15 -22
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.d.ts +4 -4
- package/lib/browser/scm-history-graph-contribution.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-contribution.js +52 -60
- package/lib/browser/scm-history-graph-contribution.js.map +1 -1
- package/lib/browser/scm-history-graph-contribution.spec.js +35 -37
- package/lib/browser/scm-history-graph-contribution.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts +1 -1
- package/lib/browser/scm-history-graph-helpers.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-helpers.js +14 -30
- package/lib/browser/scm-history-graph-helpers.js.map +1 -1
- package/lib/browser/scm-history-graph-helpers.spec.js +44 -46
- package/lib/browser/scm-history-graph-helpers.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.js +1 -4
- package/lib/browser/scm-history-graph-lanes.js.map +1 -1
- package/lib/browser/scm-history-graph-lanes.spec.js +135 -137
- package/lib/browser/scm-history-graph-lanes.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-model.d.ts +4 -4
- package/lib/browser/scm-history-graph-model.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-model.js +34 -43
- package/lib/browser/scm-history-graph-model.js.map +1 -1
- package/lib/browser/scm-history-graph-model.spec.js +74 -76
- package/lib/browser/scm-history-graph-model.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.d.ts +2 -2
- package/lib/browser/scm-history-graph-tooltip.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.js +33 -42
- package/lib/browser/scm-history-graph-tooltip.js.map +1 -1
- package/lib/browser/scm-history-graph-tooltip.spec.js +63 -65
- package/lib/browser/scm-history-graph-tooltip.spec.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.d.ts +7 -7
- package/lib/browser/scm-history-graph-widget.d.ts.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +116 -134
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +40 -43
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +11 -16
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-layout-migrations.js +15 -18
- package/lib/browser/scm-layout-migrations.js.map +1 -1
- package/lib/browser/scm-provider.js +1 -4
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.d.ts +1 -1
- package/lib/browser/scm-quick-open-service.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +20 -27
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.d.ts +4 -4
- package/lib/browser/scm-repositories-widget.d.ts.map +1 -1
- package/lib/browser/scm-repositories-widget.js +55 -67
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +86 -89
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-repository.d.ts +2 -2
- package/lib/browser/scm-repository.d.ts.map +1 -1
- package/lib/browser/scm-repository.js +6 -10
- package/lib/browser/scm-repository.js.map +1 -1
- package/lib/browser/scm-service.d.ts +3 -3
- package/lib/browser/scm-service.d.ts.map +1 -1
- package/lib/browser/scm-service.js +18 -22
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-service.spec.js +15 -17
- package/lib/browser/scm-service.spec.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts +1 -1
- package/lib/browser/scm-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +16 -20
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts +2 -2
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +27 -32
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +4 -4
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +98 -122
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +6 -6
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +49 -64
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +21 -26
- package/lib/common/scm-preferences.js.map +1 -1
- package/lib/node/scm-backend-module.js +4 -6
- package/lib/node/scm-backend-module.js.map +1 -1
- package/package.json +16 -7
- package/src/browser/decorations/scm-decorations-service.ts +5 -5
- package/src/browser/dirty-diff/content-lines.spec.ts +3 -2
- package/src/browser/dirty-diff/diff-computer.spec.ts +4 -3
- package/src/browser/dirty-diff/diff-computer.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-decorator.ts +1 -1
- package/src/browser/dirty-diff/dirty-diff-module.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +3 -3
- package/src/browser/dirty-diff/dirty-diff-widget.ts +2 -2
- package/src/browser/merge-editor/merge-editor-contribution.ts +2 -2
- package/src/browser/merge-editor/merge-editor-dev-contribution.ts +1 -1
- package/src/browser/merge-editor/merge-editor-module.ts +7 -7
- package/src/browser/merge-editor/merge-editor.ts +5 -5
- package/src/browser/merge-editor/model/live-diff.ts +2 -2
- package/src/browser/merge-editor/model/merge-editor-model.ts +8 -8
- package/src/browser/merge-editor/model/merge-range.ts +4 -4
- package/src/browser/merge-editor/model/range-editing.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.spec.ts +1 -1
- package/src/browser/merge-editor/model/range-mapping.ts +3 -3
- package/src/browser/merge-editor/view/diff-spacers.ts +1 -1
- package/src/browser/merge-editor/view/merge-editor-panes/index.ts +5 -5
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-base-pane.ts +3 -3
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.ts +7 -7
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-result-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-panes/merge-editor-side-pane.ts +4 -4
- package/src/browser/merge-editor/view/merge-editor-scroll-sync.ts +2 -2
- package/src/browser/merge-editor/view/merge-editor-view-zones.ts +5 -5
- package/src/browser/merge-editor/view/merge-range-actions.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +2 -2
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +3 -3
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +1 -1
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +1 -1
- package/src/browser/scm-action-button-widget.tsx +3 -3
- package/src/browser/scm-amend-component.tsx +3 -3
- package/src/browser/scm-amend-widget.tsx +3 -3
- package/src/browser/scm-commit-widget.tsx +2 -2
- package/src/browser/scm-context-key-service.spec.ts +3 -3
- package/src/browser/scm-contribution.ts +8 -8
- package/src/browser/scm-frontend-module.ts +23 -23
- package/src/browser/scm-groups-tree-model.ts +3 -3
- package/src/browser/scm-history-graph-contribution.spec.ts +3 -3
- package/src/browser/scm-history-graph-contribution.ts +6 -6
- package/src/browser/scm-history-graph-helpers.spec.ts +2 -2
- package/src/browser/scm-history-graph-helpers.ts +1 -1
- package/src/browser/scm-history-graph-lanes.spec.ts +1 -1
- package/src/browser/scm-history-graph-model.spec.ts +3 -3
- package/src/browser/scm-history-graph-model.ts +5 -5
- package/src/browser/scm-history-graph-tooltip.spec.ts +3 -3
- package/src/browser/scm-history-graph-tooltip.ts +3 -3
- package/src/browser/scm-history-graph-widget.spec.ts +4 -4
- package/src/browser/scm-history-graph-widget.tsx +8 -8
- package/src/browser/scm-layout-migrations.ts +1 -1
- package/src/browser/scm-quick-open-service.ts +1 -1
- package/src/browser/scm-repositories-widget.spec.ts +2 -2
- package/src/browser/scm-repositories-widget.tsx +4 -4
- package/src/browser/scm-repository.ts +2 -2
- package/src/browser/scm-service.spec.ts +2 -2
- package/src/browser/scm-service.ts +3 -3
- package/src/browser/scm-tree-label-provider.ts +1 -1
- package/src/browser/scm-tree-model.ts +2 -2
- package/src/browser/scm-tree-widget.tsx +4 -4
- package/src/browser/scm-widget.tsx +6 -6
- package/src/node/scm-backend-module.ts +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH and others.
|
|
4
3
|
//
|
|
@@ -14,12 +13,11 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const scm_history_graph_lanes_1 = require("./scm-history-graph-lanes");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { computeGraphRows } from './scm-history-graph-lanes.js';
|
|
20
18
|
describe('computeGraphRows', () => {
|
|
21
19
|
function lanes(commits) {
|
|
22
|
-
return
|
|
20
|
+
return computeGraphRows(commits).map(r => r.lane);
|
|
23
21
|
}
|
|
24
22
|
// -------------------------------------------------------------------------
|
|
25
23
|
// Linear history
|
|
@@ -31,26 +29,26 @@ describe('computeGraphRows', () => {
|
|
|
31
29
|
{ id: 'A', parentIds: [] },
|
|
32
30
|
];
|
|
33
31
|
it('all commits stay in lane 0', () => {
|
|
34
|
-
|
|
32
|
+
expect(lanes(commits)).to.deep.equal([0, 0, 0]);
|
|
35
33
|
});
|
|
36
34
|
it('colors default to the first rotation color (foreground1 = index 3)', () => {
|
|
37
|
-
const rows =
|
|
38
|
-
|
|
35
|
+
const rows = computeGraphRows(commits);
|
|
36
|
+
expect(rows.map(r => r.color)).to.deep.equal([3, 3, 3]);
|
|
39
37
|
});
|
|
40
38
|
it('topColor equals color when no ref color overrides the lane', () => {
|
|
41
|
-
const rows =
|
|
42
|
-
rows.forEach(r =>
|
|
39
|
+
const rows = computeGraphRows(commits);
|
|
40
|
+
rows.forEach(r => expect(r.topColor).to.equal(r.color));
|
|
43
41
|
});
|
|
44
42
|
it('first parent same-lane continuation emits no separate edge (handled by commit line)', () => {
|
|
45
|
-
const rows =
|
|
43
|
+
const rows = computeGraphRows(commits);
|
|
46
44
|
// Row 0 (C): first parent B is in the same lane — no edge emitted
|
|
47
45
|
// Only pass-through edges from other lanes (none here) are emitted
|
|
48
46
|
const edgesC = rows[0].edges.filter(e => e.fromLane === 0 && e.toLane === 0);
|
|
49
|
-
|
|
47
|
+
expect(edgesC.length).to.equal(0);
|
|
50
48
|
});
|
|
51
49
|
it('root commit (A) emits no edges', () => {
|
|
52
|
-
const rows =
|
|
53
|
-
|
|
50
|
+
const rows = computeGraphRows(commits);
|
|
51
|
+
expect(rows[2].edges).to.be.empty;
|
|
54
52
|
});
|
|
55
53
|
});
|
|
56
54
|
// -------------------------------------------------------------------------
|
|
@@ -76,42 +74,42 @@ describe('computeGraphRows', () => {
|
|
|
76
74
|
{ id: 'A', parentIds: [] },
|
|
77
75
|
];
|
|
78
76
|
it('merge commit M is in lane 0', () => {
|
|
79
|
-
|
|
77
|
+
expect(lanes(commits)[0]).to.equal(0);
|
|
80
78
|
});
|
|
81
79
|
it('D (first parent) stays in lane 0', () => {
|
|
82
|
-
|
|
80
|
+
expect(lanes(commits)[1]).to.equal(0);
|
|
83
81
|
});
|
|
84
82
|
it('E (second parent) is in a different lane', () => {
|
|
85
|
-
|
|
83
|
+
expect(lanes(commits)[2]).to.not.equal(0);
|
|
86
84
|
});
|
|
87
85
|
it('B and A eventually converge back to lane 0', () => {
|
|
88
86
|
const ls = lanes(commits);
|
|
89
87
|
// B must be in lane 0 (first parent chain)
|
|
90
|
-
|
|
88
|
+
expect(ls[3]).to.equal(0);
|
|
91
89
|
// A also stays in lane 0
|
|
92
|
-
|
|
90
|
+
expect(ls[4]).to.equal(0);
|
|
93
91
|
});
|
|
94
92
|
it('M emits a branch-out edge for second parent E', () => {
|
|
95
|
-
const rows =
|
|
93
|
+
const rows = computeGraphRows(commits);
|
|
96
94
|
const mEdges = rows[0].edges;
|
|
97
95
|
// Branch-out: from commit lane 0 to E's new lane
|
|
98
96
|
const branchOut = mEdges.filter(e => e.type === 'branch-out' && e.fromLane === 0);
|
|
99
|
-
|
|
97
|
+
expect(branchOut.length).to.be.greaterThan(0);
|
|
100
98
|
});
|
|
101
99
|
it('M does not emit a merge-in edge (no existing lane converges into M)', () => {
|
|
102
|
-
const rows =
|
|
100
|
+
const rows = computeGraphRows(commits);
|
|
103
101
|
const mEdges = rows[0].edges;
|
|
104
102
|
const mergeIn = mEdges.filter(e => e.type === 'merge-in');
|
|
105
|
-
|
|
103
|
+
expect(mergeIn.length).to.equal(0);
|
|
106
104
|
});
|
|
107
105
|
it('E emits a merge-in edge (E parent B is already in lane 0)', () => {
|
|
108
|
-
const rows =
|
|
106
|
+
const rows = computeGraphRows(commits);
|
|
109
107
|
// E is at index 2, in lane 1; its parent B is already in lane 0.
|
|
110
108
|
// merge-in edge: fromLane=0 (B's lane), toLane=1 (E's commit lane)
|
|
111
109
|
const eRow = rows[2];
|
|
112
110
|
const eEdges = eRow.edges;
|
|
113
111
|
const mergeIn = eEdges.filter(e => e.type === 'merge-in' && e.fromLane === 0 && e.toLane === eRow.lane);
|
|
114
|
-
|
|
112
|
+
expect(mergeIn.length).to.be.greaterThan(0);
|
|
115
113
|
});
|
|
116
114
|
});
|
|
117
115
|
// -------------------------------------------------------------------------
|
|
@@ -128,18 +126,18 @@ describe('computeGraphRows', () => {
|
|
|
128
126
|
{ id: 'B1', parentIds: [] },
|
|
129
127
|
];
|
|
130
128
|
it('A2 is in lane 0', () => {
|
|
131
|
-
|
|
129
|
+
expect(lanes(commits)[0]).to.equal(0);
|
|
132
130
|
});
|
|
133
131
|
it('B2 is in a different lane from A2', () => {
|
|
134
132
|
const ls = lanes(commits);
|
|
135
|
-
|
|
133
|
+
expect(ls[1]).to.not.equal(ls[0]);
|
|
136
134
|
});
|
|
137
135
|
it('A1 is in lane 0 (continues A2 branch)', () => {
|
|
138
|
-
|
|
136
|
+
expect(lanes(commits)[2]).to.equal(0);
|
|
139
137
|
});
|
|
140
138
|
it('B1 continues in the same lane as B2', () => {
|
|
141
139
|
const ls = lanes(commits);
|
|
142
|
-
|
|
140
|
+
expect(ls[3]).to.equal(ls[1]);
|
|
143
141
|
});
|
|
144
142
|
});
|
|
145
143
|
// -------------------------------------------------------------------------
|
|
@@ -155,36 +153,36 @@ describe('computeGraphRows', () => {
|
|
|
155
153
|
{ id: 'P3', parentIds: [] },
|
|
156
154
|
];
|
|
157
155
|
it('O is in lane 0', () => {
|
|
158
|
-
|
|
156
|
+
expect(lanes(commits)[0]).to.equal(0);
|
|
159
157
|
});
|
|
160
158
|
it('P1 is in lane 0 (first parent)', () => {
|
|
161
|
-
|
|
159
|
+
expect(lanes(commits)[1]).to.equal(0);
|
|
162
160
|
});
|
|
163
161
|
it('P2 is in a distinct lane', () => {
|
|
164
162
|
const ls = lanes(commits);
|
|
165
|
-
|
|
163
|
+
expect(ls[2]).to.not.equal(0);
|
|
166
164
|
});
|
|
167
165
|
it('P3 is in a distinct lane different from P2', () => {
|
|
168
166
|
const ls = lanes(commits);
|
|
169
|
-
|
|
167
|
+
expect(ls[3]).to.not.equal(ls[2]);
|
|
170
168
|
});
|
|
171
169
|
it('O emits 2 branch-out edges (for P2 and P3; P1 same-lane has no edge)', () => {
|
|
172
|
-
const rows =
|
|
170
|
+
const rows = computeGraphRows(commits);
|
|
173
171
|
const oEdges = rows[0].edges.filter(e => e.type === 'branch-out');
|
|
174
|
-
|
|
172
|
+
expect(oEdges.length).to.equal(2);
|
|
175
173
|
});
|
|
176
174
|
it('O emits no merge-in edges (no existing lanes converge into O)', () => {
|
|
177
|
-
const rows =
|
|
175
|
+
const rows = computeGraphRows(commits);
|
|
178
176
|
const mergeIn = rows[0].edges.filter(e => e.type === 'merge-in');
|
|
179
|
-
|
|
177
|
+
expect(mergeIn.length).to.equal(0);
|
|
180
178
|
});
|
|
181
179
|
it('lane colors rotate through the default registry (indices 3-7)', () => {
|
|
182
|
-
const rows =
|
|
180
|
+
const rows = computeGraphRows(commits);
|
|
183
181
|
// O and P1 share lane 0 → first rotation color; P2/P3 opened new lanes
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
rows.forEach(r =>
|
|
182
|
+
expect(rows[0].color).to.equal(3);
|
|
183
|
+
expect(rows[1].color).to.equal(3);
|
|
184
|
+
expect(rows[2].color).to.not.equal(rows[3].color);
|
|
185
|
+
rows.forEach(r => expect(r.color).to.be.within(3, 7));
|
|
188
186
|
});
|
|
189
187
|
});
|
|
190
188
|
// -------------------------------------------------------------------------
|
|
@@ -193,11 +191,11 @@ describe('computeGraphRows', () => {
|
|
|
193
191
|
describe('single root commit', () => {
|
|
194
192
|
const commits = [{ id: 'R', parentIds: [] }];
|
|
195
193
|
it('is placed in lane 0', () => {
|
|
196
|
-
|
|
194
|
+
expect(lanes(commits)).to.deep.equal([0]);
|
|
197
195
|
});
|
|
198
196
|
it('emits no edges', () => {
|
|
199
|
-
const rows =
|
|
200
|
-
|
|
197
|
+
const rows = computeGraphRows(commits);
|
|
198
|
+
expect(rows[0].edges).to.be.empty;
|
|
201
199
|
});
|
|
202
200
|
});
|
|
203
201
|
// -------------------------------------------------------------------------
|
|
@@ -205,7 +203,7 @@ describe('computeGraphRows', () => {
|
|
|
205
203
|
// -------------------------------------------------------------------------
|
|
206
204
|
describe('empty input', () => {
|
|
207
205
|
it('returns an empty array', () => {
|
|
208
|
-
|
|
206
|
+
expect(computeGraphRows([])).to.deep.equal([]);
|
|
209
207
|
});
|
|
210
208
|
});
|
|
211
209
|
// -------------------------------------------------------------------------
|
|
@@ -219,19 +217,19 @@ describe('computeGraphRows', () => {
|
|
|
219
217
|
{ id: 'A', parentIds: [] },
|
|
220
218
|
];
|
|
221
219
|
it('first (newest/HEAD) commit has hasContinuation:true, hasTopLine:false', () => {
|
|
222
|
-
const rows =
|
|
223
|
-
|
|
224
|
-
|
|
220
|
+
const rows = computeGraphRows(commits);
|
|
221
|
+
expect(rows[0].hasContinuation).to.equal(true);
|
|
222
|
+
expect(rows[0].hasTopLine).to.equal(false);
|
|
225
223
|
});
|
|
226
224
|
it('middle commit has hasContinuation:true, hasTopLine:true', () => {
|
|
227
|
-
const rows =
|
|
228
|
-
|
|
229
|
-
|
|
225
|
+
const rows = computeGraphRows(commits);
|
|
226
|
+
expect(rows[1].hasContinuation).to.equal(true);
|
|
227
|
+
expect(rows[1].hasTopLine).to.equal(true);
|
|
230
228
|
});
|
|
231
229
|
it('root (oldest) commit has hasContinuation:false, hasTopLine:true', () => {
|
|
232
|
-
const rows =
|
|
233
|
-
|
|
234
|
-
|
|
230
|
+
const rows = computeGraphRows(commits);
|
|
231
|
+
expect(rows[2].hasContinuation).to.equal(false);
|
|
232
|
+
expect(rows[2].hasTopLine).to.equal(true);
|
|
235
233
|
});
|
|
236
234
|
});
|
|
237
235
|
describe('branch-and-merge', () => {
|
|
@@ -253,19 +251,19 @@ describe('computeGraphRows', () => {
|
|
|
253
251
|
{ id: 'A', parentIds: [] },
|
|
254
252
|
];
|
|
255
253
|
it('merge commit E (whose parent B is already in lane 0) has hasContinuation:false, hasTopLine:true', () => {
|
|
256
|
-
const rows =
|
|
254
|
+
const rows = computeGraphRows(commits);
|
|
257
255
|
// E is at index 2; its first parent B is already in lane 0,
|
|
258
256
|
// so its own lane is freed — hasContinuation must be false.
|
|
259
257
|
// E was reserved as a parent by M, so hasTopLine must be true.
|
|
260
|
-
|
|
261
|
-
|
|
258
|
+
expect(rows[2].hasContinuation).to.equal(false);
|
|
259
|
+
expect(rows[2].hasTopLine).to.equal(true);
|
|
262
260
|
});
|
|
263
261
|
});
|
|
264
262
|
describe('single root commit (no parents)', () => {
|
|
265
263
|
it('has hasContinuation:false, hasTopLine:false', () => {
|
|
266
|
-
const rows =
|
|
267
|
-
|
|
268
|
-
|
|
264
|
+
const rows = computeGraphRows([{ id: 'R', parentIds: [] }]);
|
|
265
|
+
expect(rows[0].hasContinuation).to.equal(false);
|
|
266
|
+
expect(rows[0].hasTopLine).to.equal(false);
|
|
269
267
|
});
|
|
270
268
|
});
|
|
271
269
|
});
|
|
@@ -293,25 +291,25 @@ describe('computeGraphRows', () => {
|
|
|
293
291
|
{ id: 'A', parentIds: [] },
|
|
294
292
|
];
|
|
295
293
|
it('E is placed in lane 1', () => {
|
|
296
|
-
const rows =
|
|
297
|
-
|
|
294
|
+
const rows = computeGraphRows(commits);
|
|
295
|
+
expect(rows[2].lane).to.equal(1); // E
|
|
298
296
|
});
|
|
299
297
|
it('B is in lane 0 (converges back after E)', () => {
|
|
300
|
-
const rows =
|
|
301
|
-
|
|
298
|
+
const rows = computeGraphRows(commits);
|
|
299
|
+
expect(rows[3].lane).to.equal(0); // B
|
|
302
300
|
});
|
|
303
301
|
it('A is in lane 0', () => {
|
|
304
|
-
const rows =
|
|
305
|
-
|
|
302
|
+
const rows = computeGraphRows(commits);
|
|
303
|
+
expect(rows[4].lane).to.equal(0); // A
|
|
306
304
|
});
|
|
307
305
|
it('lane 1 is freed after E — B row has no pass-through edge for lane 1', () => {
|
|
308
|
-
const rows =
|
|
306
|
+
const rows = computeGraphRows(commits);
|
|
309
307
|
// Row for B (index 3): there should be no pass-through edge that
|
|
310
308
|
// goes from lane 1 to lane 1, because E has already been rendered
|
|
311
309
|
// and its lane should have been freed.
|
|
312
310
|
const bRow = rows[3];
|
|
313
311
|
const spuriousEdge = bRow.edges.find(e => e.fromLane === 1 && e.toLane === 1);
|
|
314
|
-
|
|
312
|
+
expect(spuriousEdge).to.be.undefined;
|
|
315
313
|
});
|
|
316
314
|
it('lane 1 is reusable after E — new branch between B and A uses lane 1', () => {
|
|
317
315
|
// Insert an independent branch X→Y between B and A so that at the
|
|
@@ -330,18 +328,18 @@ describe('computeGraphRows', () => {
|
|
|
330
328
|
{ id: 'A', parentIds: [] },
|
|
331
329
|
{ id: 'Y', parentIds: [] },
|
|
332
330
|
];
|
|
333
|
-
const rows =
|
|
331
|
+
const rows = computeGraphRows(commitsWithExtra);
|
|
334
332
|
// X (index 4) should reuse the freed lane 1 rather than lane 2.
|
|
335
|
-
|
|
333
|
+
expect(rows[4].lane).to.equal(1);
|
|
336
334
|
});
|
|
337
335
|
it('E emits a merge-in edge from lane 0 into E\'s commit lane (B already in lane 0)', () => {
|
|
338
|
-
const rows =
|
|
336
|
+
const rows = computeGraphRows(commits);
|
|
339
337
|
// E is at index 2, in lane 1; B is in lane 0.
|
|
340
338
|
// merge-in edge: fromLane=0 (B's existing lane), toLane=1 (E's commit lane)
|
|
341
339
|
const eRow = rows[2];
|
|
342
340
|
const eEdges = eRow.edges;
|
|
343
341
|
const mergeIn = eEdges.filter(e => e.type === 'merge-in' && e.fromLane === 0 && e.toLane === eRow.lane);
|
|
344
|
-
|
|
342
|
+
expect(mergeIn.length).to.equal(1);
|
|
345
343
|
});
|
|
346
344
|
});
|
|
347
345
|
// -------------------------------------------------------------------------
|
|
@@ -351,8 +349,8 @@ describe('computeGraphRows', () => {
|
|
|
351
349
|
it('cycles through indices 3-7 and wraps', () => {
|
|
352
350
|
// 6 independent tips → 6 lanes; the sixth wraps back to the first color
|
|
353
351
|
const commits = ['A', 'B', 'C', 'D', 'E', 'F'].map(id => ({ id, parentIds: [id.toLowerCase()] }));
|
|
354
|
-
const rows =
|
|
355
|
-
|
|
352
|
+
const rows = computeGraphRows(commits);
|
|
353
|
+
expect(rows.map(r => r.color)).to.deep.equal([3, 4, 5, 6, 7, 3]);
|
|
356
354
|
});
|
|
357
355
|
it('assigns distinct lanes to 8 simultaneous branches', () => {
|
|
358
356
|
// 8 independent commits whose parents haven't been seen yet
|
|
@@ -366,11 +364,11 @@ describe('computeGraphRows', () => {
|
|
|
366
364
|
{ id: 'G', parentIds: ['g'] },
|
|
367
365
|
{ id: 'H', parentIds: ['h'] },
|
|
368
366
|
];
|
|
369
|
-
const rows =
|
|
367
|
+
const rows = computeGraphRows(commits);
|
|
370
368
|
const laneSet = new Set(rows.map(r => r.lane));
|
|
371
|
-
|
|
369
|
+
expect(laneSet.size).to.equal(8); // all distinct lanes
|
|
372
370
|
// Default colors never use the reserved ref color indices 0-2
|
|
373
|
-
rows.forEach(r =>
|
|
371
|
+
rows.forEach(r => expect(r.color).to.be.within(3, 7));
|
|
374
372
|
});
|
|
375
373
|
});
|
|
376
374
|
// -------------------------------------------------------------------------
|
|
@@ -384,19 +382,19 @@ describe('computeGraphRows', () => {
|
|
|
384
382
|
{ id: 'A', parentIds: [] },
|
|
385
383
|
];
|
|
386
384
|
it('a tip with a color index colors its row', () => {
|
|
387
|
-
const rows =
|
|
388
|
-
|
|
385
|
+
const rows = computeGraphRows(behindCommits);
|
|
386
|
+
expect(rows[0].color).to.equal(1);
|
|
389
387
|
});
|
|
390
388
|
it('an overriding commit recolors the chain from its row downward', () => {
|
|
391
|
-
const rows =
|
|
392
|
-
|
|
393
|
-
|
|
389
|
+
const rows = computeGraphRows(behindCommits);
|
|
390
|
+
expect(rows[1].color).to.equal(0);
|
|
391
|
+
expect(rows[2].color).to.equal(0);
|
|
394
392
|
});
|
|
395
393
|
it('topColor keeps the inherited color for the segment above an overriding commit', () => {
|
|
396
|
-
const rows =
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
394
|
+
const rows = computeGraphRows(behindCommits);
|
|
395
|
+
expect(rows[0].topColor).to.equal(1);
|
|
396
|
+
expect(rows[1].topColor).to.equal(1);
|
|
397
|
+
expect(rows[2].topColor).to.equal(0);
|
|
400
398
|
});
|
|
401
399
|
// Diverged: L (main = HEAD) and R (origin/main) both branched off A
|
|
402
400
|
const divergedCommits = [
|
|
@@ -405,14 +403,14 @@ describe('computeGraphRows', () => {
|
|
|
405
403
|
{ id: 'A', parentIds: [] },
|
|
406
404
|
];
|
|
407
405
|
it('pass-through edges use the propagated ref color', () => {
|
|
408
|
-
const rows =
|
|
406
|
+
const rows = computeGraphRows(divergedCommits);
|
|
409
407
|
const pass = rows[1].edges.find(e => e.type === 'pass-through');
|
|
410
|
-
|
|
408
|
+
expect(pass?.color).to.equal(0);
|
|
411
409
|
});
|
|
412
410
|
it('merge-in edges from a ref-colored lane keep that color', () => {
|
|
413
|
-
const rows =
|
|
411
|
+
const rows = computeGraphRows(divergedCommits);
|
|
414
412
|
const mergeIn = rows[2].edges.find(e => e.type === 'merge-in');
|
|
415
|
-
|
|
413
|
+
expect(mergeIn?.color).to.equal(1);
|
|
416
414
|
});
|
|
417
415
|
});
|
|
418
416
|
// -------------------------------------------------------------------------
|
|
@@ -425,10 +423,10 @@ describe('computeGraphRows', () => {
|
|
|
425
423
|
{ id: 'B', parentIds: ['b'] },
|
|
426
424
|
{ id: 'C', parentIds: ['c'] },
|
|
427
425
|
];
|
|
428
|
-
const rows =
|
|
426
|
+
const rows = computeGraphRows(commits);
|
|
429
427
|
// Row for B (index 1): A's lane (0) passes through as pass-through
|
|
430
428
|
const bPassThrough = rows[1].edges.filter(e => e.type === 'pass-through');
|
|
431
|
-
bPassThrough.forEach(e =>
|
|
429
|
+
bPassThrough.forEach(e => expect(e.fromLane).to.equal(e.toLane));
|
|
432
430
|
});
|
|
433
431
|
it('branch-out edges have fromLane equal to commit lane', () => {
|
|
434
432
|
const commits = [
|
|
@@ -436,10 +434,10 @@ describe('computeGraphRows', () => {
|
|
|
436
434
|
{ id: 'D', parentIds: [] },
|
|
437
435
|
{ id: 'E', parentIds: [] },
|
|
438
436
|
];
|
|
439
|
-
const rows =
|
|
437
|
+
const rows = computeGraphRows(commits);
|
|
440
438
|
const mRow = rows[0];
|
|
441
439
|
const branchOut = mRow.edges.filter(e => e.type === 'branch-out');
|
|
442
|
-
branchOut.forEach(e =>
|
|
440
|
+
branchOut.forEach(e => expect(e.fromLane).to.equal(mRow.lane));
|
|
443
441
|
});
|
|
444
442
|
it('merge-in edges have toLane equal to commit lane', () => {
|
|
445
443
|
// M (lane 0) parents: D (lane 0, new), E (lane 1, new)
|
|
@@ -450,11 +448,11 @@ describe('computeGraphRows', () => {
|
|
|
450
448
|
{ id: 'E', parentIds: ['B'] }, // B already in lane 0
|
|
451
449
|
{ id: 'B', parentIds: [] },
|
|
452
450
|
];
|
|
453
|
-
const rows =
|
|
451
|
+
const rows = computeGraphRows(commits2);
|
|
454
452
|
const eRow = rows[2]; // E
|
|
455
453
|
const mergeIn = eRow.edges.filter(e => e.type === 'merge-in');
|
|
456
454
|
// toLane of merge-in must equal the commit's own lane
|
|
457
|
-
mergeIn.forEach(e =>
|
|
455
|
+
mergeIn.forEach(e => expect(e.toLane).to.equal(eRow.lane));
|
|
458
456
|
});
|
|
459
457
|
});
|
|
460
458
|
// -------------------------------------------------------------------------
|
|
@@ -476,59 +474,59 @@ describe('computeGraphRows', () => {
|
|
|
476
474
|
{ id: 'Q', parentIds: [] },
|
|
477
475
|
];
|
|
478
476
|
it('A is placed in lane 0', () => {
|
|
479
|
-
|
|
477
|
+
expect(computeGraphRows(commits)[0].lane).to.equal(0);
|
|
480
478
|
});
|
|
481
479
|
it('B is placed in lane 1 (sibling gets new lane)', () => {
|
|
482
|
-
|
|
480
|
+
expect(computeGraphRows(commits)[1].lane).to.equal(1);
|
|
483
481
|
});
|
|
484
482
|
it('P converges back to lane 0', () => {
|
|
485
|
-
|
|
483
|
+
expect(computeGraphRows(commits)[2].lane).to.equal(0);
|
|
486
484
|
});
|
|
487
485
|
it('A row (row 0) emits NO branch-out edges (siblings are not connected to each other)', () => {
|
|
488
|
-
const rows =
|
|
486
|
+
const rows = computeGraphRows(commits);
|
|
489
487
|
const aEdges = rows[0].edges;
|
|
490
488
|
const branchOut = aEdges.filter(e => e.type === 'branch-out');
|
|
491
|
-
|
|
489
|
+
expect(branchOut.length).to.equal(0);
|
|
492
490
|
});
|
|
493
491
|
it('B row (row 1) has hasTopLine:false (lane starts fresh, no connection from above)', () => {
|
|
494
|
-
const rows =
|
|
495
|
-
|
|
492
|
+
const rows = computeGraphRows(commits);
|
|
493
|
+
expect(rows[1].hasTopLine).to.equal(false);
|
|
496
494
|
});
|
|
497
495
|
it('B row (row 1) has hasContinuation:true (lane continues as pass-through to parent P at row 2)', () => {
|
|
498
|
-
const rows =
|
|
499
|
-
|
|
496
|
+
const rows = computeGraphRows(commits);
|
|
497
|
+
expect(rows[1].hasContinuation).to.equal(true);
|
|
500
498
|
});
|
|
501
499
|
it('B row (row 1) does NOT emit a merge-in edge', () => {
|
|
502
500
|
// A merge-in on B\'s row would mean "a top-of-row line curves into B\'s
|
|
503
501
|
// circle", which is wrong since B was not pre-reserved.
|
|
504
|
-
const rows =
|
|
502
|
+
const rows = computeGraphRows(commits);
|
|
505
503
|
const mergeIn = rows[1].edges.filter(e => e.type === 'merge-in');
|
|
506
|
-
|
|
504
|
+
expect(mergeIn.length).to.equal(0);
|
|
507
505
|
});
|
|
508
506
|
it('A row (row 0) has hasTopLine:false (A was not pre-reserved)', () => {
|
|
509
|
-
const rows =
|
|
510
|
-
|
|
507
|
+
const rows = computeGraphRows(commits);
|
|
508
|
+
expect(rows[0].hasTopLine).to.equal(false);
|
|
511
509
|
});
|
|
512
510
|
it('P row (row 2) has hasTopLine:true (continuing from A\'s lane)', () => {
|
|
513
|
-
const rows =
|
|
514
|
-
|
|
511
|
+
const rows = computeGraphRows(commits);
|
|
512
|
+
expect(rows[2].hasTopLine).to.equal(true);
|
|
515
513
|
});
|
|
516
514
|
it('B row (row 1) has a pass-through edge for lane 0', () => {
|
|
517
515
|
// Lane 0 (pointing at P) continues as a pass-through through B\'s row.
|
|
518
|
-
const rows =
|
|
516
|
+
const rows = computeGraphRows(commits);
|
|
519
517
|
const passThrough = rows[1].edges.find(e => e.type === 'pass-through' && e.fromLane === 0 && e.toLane === 0);
|
|
520
|
-
|
|
518
|
+
expect(passThrough).to.not.be.undefined;
|
|
521
519
|
});
|
|
522
520
|
it('P row (row 2) has a merge-in edge from lane 1', () => {
|
|
523
521
|
// Lane 1 (kept alive through B) converges into P\'s lane 0 with a merge-in.
|
|
524
|
-
const rows =
|
|
522
|
+
const rows = computeGraphRows(commits);
|
|
525
523
|
const mergeIn = rows[2].edges.find(e => e.type === 'merge-in' && e.fromLane === 1 && e.toLane === 0);
|
|
526
|
-
|
|
524
|
+
expect(mergeIn).to.not.be.undefined;
|
|
527
525
|
});
|
|
528
526
|
it('P row (row 2) has no pass-through for lane 1 (lane 1 is freed at P)', () => {
|
|
529
|
-
const rows =
|
|
527
|
+
const rows = computeGraphRows(commits);
|
|
530
528
|
const spurious = rows[2].edges.find(e => e.fromLane === 1 && e.toLane === 1 && e.type === 'pass-through');
|
|
531
|
-
|
|
529
|
+
expect(spurious).to.be.undefined;
|
|
532
530
|
});
|
|
533
531
|
});
|
|
534
532
|
// -------------------------------------------------------------------------
|
|
@@ -544,47 +542,47 @@ describe('computeGraphRows', () => {
|
|
|
544
542
|
{ id: 'P', parentIds: [] },
|
|
545
543
|
];
|
|
546
544
|
it('A is lane 0', () => {
|
|
547
|
-
const rows =
|
|
548
|
-
|
|
545
|
+
const rows = computeGraphRows(commits);
|
|
546
|
+
expect(rows[0].lane).to.equal(0);
|
|
549
547
|
});
|
|
550
548
|
it('B is lane 1', () => {
|
|
551
|
-
const rows =
|
|
552
|
-
|
|
549
|
+
const rows = computeGraphRows(commits);
|
|
550
|
+
expect(rows[1].lane).to.equal(1);
|
|
553
551
|
});
|
|
554
552
|
it('C is in a lane other than lane 0', () => {
|
|
555
553
|
// C is a sibling tip; its lane is re-assigned from freed lanes
|
|
556
|
-
const rows =
|
|
557
|
-
|
|
554
|
+
const rows = computeGraphRows(commits);
|
|
555
|
+
expect(rows[2].lane).to.not.equal(0);
|
|
558
556
|
});
|
|
559
557
|
it('A row emits NO branch-out edges (siblings are not connected to each other)', () => {
|
|
560
|
-
const rows =
|
|
558
|
+
const rows = computeGraphRows(commits);
|
|
561
559
|
const branchOuts = rows[0].edges.filter(e => e.type === 'branch-out');
|
|
562
|
-
|
|
560
|
+
expect(branchOuts.length).to.equal(0);
|
|
563
561
|
});
|
|
564
562
|
it('B row emits NO branch-out edges', () => {
|
|
565
|
-
const rows =
|
|
563
|
+
const rows = computeGraphRows(commits);
|
|
566
564
|
const branchOuts = rows[1].edges.filter(e => e.type === 'branch-out');
|
|
567
|
-
|
|
565
|
+
expect(branchOuts.length).to.equal(0);
|
|
568
566
|
});
|
|
569
567
|
it('B and C rows both have hasTopLine:false (lanes start fresh, no connection from above)', () => {
|
|
570
|
-
const rows =
|
|
571
|
-
|
|
572
|
-
|
|
568
|
+
const rows = computeGraphRows(commits);
|
|
569
|
+
expect(rows[1].hasTopLine).to.equal(false);
|
|
570
|
+
expect(rows[2].hasTopLine).to.equal(false);
|
|
573
571
|
});
|
|
574
572
|
it('B and C rows have no merge-in edges', () => {
|
|
575
|
-
const rows =
|
|
576
|
-
|
|
577
|
-
|
|
573
|
+
const rows = computeGraphRows(commits);
|
|
574
|
+
expect(rows[1].edges.filter(e => e.type === 'merge-in').length).to.equal(0);
|
|
575
|
+
expect(rows[2].edges.filter(e => e.type === 'merge-in').length).to.equal(0);
|
|
578
576
|
});
|
|
579
577
|
it('P row has merge-in edges from both B\'s lane and C\'s lane', () => {
|
|
580
|
-
const rows =
|
|
578
|
+
const rows = computeGraphRows(commits);
|
|
581
579
|
// P is at index 3, in lane 0. Both lane 1 (B) and lane 2 (C) must
|
|
582
580
|
// converge into P with merge-in edges.
|
|
583
581
|
const pRow = rows[3];
|
|
584
582
|
const mergeInFromLane1 = pRow.edges.find(e => e.type === 'merge-in' && e.fromLane === rows[1].lane && e.toLane === pRow.lane);
|
|
585
583
|
const mergeInFromLane2 = pRow.edges.find(e => e.type === 'merge-in' && e.fromLane === rows[2].lane && e.toLane === pRow.lane);
|
|
586
|
-
|
|
587
|
-
|
|
584
|
+
expect(mergeInFromLane1).to.not.be.undefined;
|
|
585
|
+
expect(mergeInFromLane2).to.not.be.undefined;
|
|
588
586
|
});
|
|
589
587
|
});
|
|
590
588
|
});
|