commit_builder: keep MutableRepo reference

When you're done with the `CommitBuilder`, you're going to have to call `write_to_repo()`, passing it a mutable `MutableRepo` reference. It's a bit simpler to pass that reference when we create the `CommitBuilder` instead, so that's what this patch does. A drawback of passing in the mutable reference when we create the builder is that we can't have multiple unfinished `CommitBuilder` instance live at the same time. We don't have any such use cases yet, and it's not hard to work around them, so I think this change is worth it.

Martin von Zweigbergk committed 3 years ago

Commit 49b2f3b1 parent 70a679821 files · +411 −359Browse files

Showing the changes to lib/src/commit_builder.rs (1 of 21 files). Show all

Unified · Split

lib/src/commit_builder.rs+17−9

 use crate::repo::MutableRepo;
 use crate::settings::UserSettings;
-#[derive(Debug)]
+pub struct CommitBuilder<'repo> {
-pub struct CommitBuilder {
+    mut_repo: &'repo mut MutableRepo,
     commit: backend::Commit,
     rewrite_source: Option<Commit>,
 }
     ChangeId::from_bytes(Uuid::new_v4().as_bytes())
 }
-impl CommitBuilder {
+impl CommitBuilder<'_> {
-    pub fn for_new_commit(
+    pub fn for_new_commit<'repo>(
+        mut_repo: &'repo mut MutableRepo,
         settings: &UserSettings,
         parents: Vec<CommitId>,
         tree_id: TreeId,
-    ) -> CommitBuilder {
+    ) -> CommitBuilder<'repo> {
         let signature = settings.signature();
         assert!(!parents.is_empty());
         let commit = backend::Commit {
             committer: signature,
         };
         CommitBuilder {
+            mut_repo,
             commit,
             rewrite_source: None,
         }
     }
-    pub fn for_rewrite_from(settings: &UserSettings, predecessor: &Commit) -> CommitBuilder {
+    pub fn for_rewrite_from<'repo>(
+        mut_repo: &'repo mut MutableRepo,
+        settings: &UserSettings,
+        predecessor: &Commit,
+    ) -> CommitBuilder<'repo> {
         let mut commit = predecessor.store_commit().clone();
         commit.predecessors = vec![predecessor.id().clone()];
         commit.committer = settings.signature();
             commit.author.email = commit.committer.email.clone();
         }
         CommitBuilder {
+            mut_repo,
             commit,
             rewrite_source: Some(predecessor.clone()),
         }
         self
     }
-    pub fn write_to_repo(self, repo: &mut MutableRepo) -> Commit {
+    pub fn write(self) -> Commit {
         let mut rewrite_source_id = None;
         if let Some(rewrite_source) = self.rewrite_source {
             if *rewrite_source.change_id() == self.commit.change_id {
                 rewrite_source_id.replace(rewrite_source.id().clone());
             }
         }
-        let commit = repo.write_commit(self.commit);
+        let commit = self.mut_repo.write_commit(self.commit);
         if let Some(rewrite_source_id) = rewrite_source_id {
-            repo.record_rewritten_commit(rewrite_source_id, commit.id().clone())
+            self.mut_repo
+                .record_rewritten_commit(rewrite_source_id, commit.id().clone())
         }
         commit
     }