Skip to content

[metadata: 2/3]: Add helper to get commit for local_change.oid#58

Merged
slinder1 merged 1 commit into
mainfrom
users/slinder1/I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4
Jun 25, 2026
Merged

[metadata: 2/3]: Add helper to get commit for local_change.oid#58
slinder1 merged 1 commit into
mainfrom
users/slinder1/I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4

Conversation

@slinder1

@slinder1 slinder1 commented Jun 25, 2026

Copy link
Copy Markdown
Owner

Change-Id: I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4


Stack:

(Note: Closed and merged PRs may not be reflected here and PR numbering is not stable.)

@slinder1 slinder1 changed the base branch from main to users/slinder1/I1f7839e58659666bb0e0b54a0038a2a22209f808 June 25, 2026 15:34
@slinder1 slinder1 changed the title Add helper to get commit for local_change.oid [2/3]: Add helper to get commit for local_change.oid Jun 25, 2026
@slinder1

Copy link
Copy Markdown
Owner Author
🛠️ Initial changes (click to expand):
diff --git b/src/change.rs a/src/change.rs
@@ -115,9 +115,7 @@ impl LocalChange {
     pub fn diff(&self) -> Result<String> {
         let change = self.id.as_str();
         let repo = env::repo();
-        let commit = repo
-            .find_commit(self.oid)
-            .expect("a local change's commit Oid is not found in the repo now?");
+        let commit = self.commit()?;
         let parent = commit
             .parent(0)
             .with_context(|| format!("change {change} has no parent commit",))?;
@@ -133,6 +131,9 @@ impl LocalChange {
             .with_context(|| format!("failed to generate interdiff for change {change}"))?;
         Ok(out)
     }
+    pub fn commit<'repo>(&self) -> Result<Commit<'repo>> {
+        Ok(env::repo().find_commit(self.oid)?)
+    }
 }
 
 #[derive(Debug)]
@@ -143,7 +144,7 @@ pub struct Change {
 
 impl Change {
     pub fn render_pr_ui(&self, changes: &[Self], branch_desc: Option<&str>) -> Result<()> {
-        let commit = env::repo().find_commit(self.local_change.oid)?;
+        let commit = self.local_change.commit()?;
         let mut index = None;
         let title = String::from(
             commit
@@ -191,9 +192,7 @@ impl Change {
             .with_context(|| format!("could not parse revspec for remote branch: {remote_branch}"))?
             .peel_to_commit()
             .context("revspec for remote branch did not resolve to a commit")?;
-        let new_commit = repo
-            .find_commit(self.local_change.oid)
-            .expect("a local change's commit Oid is not found in the repo now?");
+        let new_commit = self.local_change.commit()?;
         let old_merge_base = old_commit
             .parent(0)
             .with_context(|| format!("old version of change {change} has no parent commit"))?;

@slinder1 slinder1 marked this pull request as ready for review June 25, 2026 15:34
@slinder1 slinder1 changed the title [2/3]: Add helper to get commit for local_change.oid [metadata: 2/3]: Add helper to get commit for local_change.oid Jun 25, 2026
@slinder1 slinder1 force-pushed the users/slinder1/I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4 branch from 1216360 to 0e87fa6 Compare June 25, 2026 17:53
@slinder1 slinder1 changed the title [metadata: 2/3]: Add helper to get commit for local_change.oid [2/3]: Add helper to get commit for local_change.oid Jun 25, 2026
Base automatically changed from users/slinder1/I1f7839e58659666bb0e0b54a0038a2a22209f808 to main June 25, 2026 19:38
Change-Id: I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4
@slinder1 slinder1 force-pushed the users/slinder1/I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4 branch from 0e87fa6 to 1c0aade Compare June 25, 2026 19:38
@slinder1 slinder1 changed the title [2/3]: Add helper to get commit for local_change.oid [1/2]: Add helper to get commit for local_change.oid Jun 25, 2026
@slinder1 slinder1 changed the title [1/2]: Add helper to get commit for local_change.oid [metadata: 2/3]: Add helper to get commit for local_change.oid Jun 25, 2026
@slinder1 slinder1 merged commit 56f8a44 into main Jun 25, 2026
2 checks passed
@slinder1 slinder1 deleted the users/slinder1/I3212a00b2ed3a52952eb3a9ccf9d30e40a51c3f4 branch June 25, 2026 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant