(
&self,
request: Request<ListConflictsRequest>,
)
| 567 | } |
| 568 | |
| 569 | async fn list_conflicts( |
| 570 | &self, |
| 571 | request: Request<ListConflictsRequest>, |
| 572 | ) -> Result<Response<ListConflictsResponse>, Status> { |
| 573 | let request = request.into_inner(); |
| 574 | let handle = self |
| 575 | .state |
| 576 | .resolve(request.repository.as_ref().unwrap_or(&default_ref()))?; |
| 577 | self.state.log_rpc("ListConflicts", Some(&handle)); |
| 578 | // Read transaction: read-only open (with the read-concurrency |
| 579 | // wait), never queued behind writers on the gate. |
| 580 | let result = |
| 581 | tokio::task::spawn_blocking(move || -> Result<ListConflictsResponse, Status> { |
| 582 | let (repo, workspace) = |
| 583 | handle.workspace_repository(atomic_repository::WorkspaceTxnMode::Observe)?; |
| 584 | let working_copy = workspace.working_copy(); |
| 585 | let conflicts = repo |
| 586 | .list_conflicts(working_copy) |
| 587 | .map_err(repository_error)?; |
| 588 | let mut infos = Vec::new(); |
| 589 | for (path, records) in &conflicts { |
| 590 | for record in records { |
| 591 | infos.push(ConflictInfo { |
| 592 | path: path.clone(), |
| 593 | view: None, |
| 594 | base: None, |
| 595 | kind: Some(format!("{:?}", record.kind).to_lowercase()), |
| 596 | line: record.line.map(|line| line as u64), |
| 597 | sides: record.sides.clone(), |
| 598 | }); |
| 599 | } |
| 600 | } |
| 601 | Ok(ListConflictsResponse { conflicts: infos }) |
| 602 | }) |
| 603 | .await |
| 604 | .map_err(|error| Status::internal(format!("conflicts task failed: {error}")))??; |
| 605 | Ok(Response::new(result)) |
| 606 | } |
| 607 | |
| 608 | async fn preview_mutation( |
| 609 | &self, |
no test coverage detected