Remove an empty locally-created view whose identity conflicts with the manifest about to be applied. `Repository::init` pre-creates a shared root view (e.g. "dev"). If the remote's view of the same name is a draft or has a parent, `apply_view_manifest` would report an identity mismatch even though the local view is just an empty scaffold. Deleting the scaffold lets the manifest recreate the view
(
&self,
repo: &mut Repository,
manifest: &ViewManifest,
)
| 711 | /// Views with changes are left alone: a genuine divergence must surface |
| 712 | /// as an apply error, never a silent delete. |
| 713 | fn reconcile_scaffold_view( |
| 714 | &self, |
| 715 | repo: &mut Repository, |
| 716 | manifest: &ViewManifest, |
| 717 | ) -> CliResult<()> { |
| 718 | if !repo |
| 719 | .view_exists(&manifest.name) |
| 720 | .map_err(CliError::Repository)? |
| 721 | { |
| 722 | return Ok(()); |
| 723 | } |
| 724 | let info = repo |
| 725 | .get_view_info(&manifest.name) |
| 726 | .map_err(CliError::Repository)?; |
| 727 | if info.scope == manifest.scope && info.parent_name == manifest.parent { |
| 728 | // Identity matches; apply_view_manifest handles the log. |
| 729 | return Ok(()); |
| 730 | } |
| 731 | if info.change_count > 0 { |
| 732 | // Not a scaffold; let apply_view_manifest report the mismatch. |
| 733 | return Ok(()); |
| 734 | } |
| 735 | |
| 736 | // The scaffold may be the desired view (init leaves it current), |
| 737 | // and the desired view cannot be deleted — park on a temporary |
| 738 | // root view first. It is removed again before clone finishes. |
| 739 | let working_copy = repo |
| 740 | .require_working_copy_id() |
| 741 | .map_err(CliError::Repository)?; |
| 742 | let desired_view = repo |
| 743 | .desired_view_name(working_copy) |
| 744 | .map_err(CliError::Repository)?; |
| 745 | if desired_view == manifest.name { |
| 746 | if !repo |
| 747 | .view_exists(SCAFFOLD_PARK_VIEW) |
| 748 | .map_err(CliError::Repository)? |
| 749 | { |
| 750 | repo.create_shared_view(SCAFFOLD_PARK_VIEW) |
| 751 | .map_err(CliError::Repository)?; |
| 752 | } |
| 753 | repo.align_to_view(working_copy, SCAFFOLD_PARK_VIEW) |
| 754 | .map_err(CliError::Repository)?; |
| 755 | } |
| 756 | |
| 757 | // Shared views cannot be deleted directly; demote first. |
| 758 | if info.scope.is_shared() { |
| 759 | repo.set_view_scope(&manifest.name, ViewScope::Draft) |
| 760 | .map_err(CliError::Repository)?; |
| 761 | } |
| 762 | repo.delete_view(&manifest.name) |
| 763 | .map_err(CliError::Repository)?; |
| 764 | Ok(()) |
| 765 | } |
| 766 | |
| 767 | /// Remove the temporary parking view, if scaffold reconciliation |
| 768 | /// created it. Best-effort: a leftover parking view is cosmetic. |
no test coverage detected