transaction: move rebasing of descendants out of merge_operation() (#…

…111)

I want to do the rebasing a bit later, so the CLI can do it and print
how many commits got rebased.

lib/src/repo.rs

@@ -313,7 +313,8 @@ impl UnresolvedHeadRepo {
         let base_repo = self.repo_loader.load_at(&self.op_heads[0]);
         let mut tx = base_repo.start_transaction("resolve concurrent operations");
         for other_op_head in self.op_heads.into_iter().skip(1) {
-            tx.merge_operation(user_settings, other_op_head);
+            tx.merge_operation(other_op_head);
+            tx.mut_repo().rebase_descendants(user_settings);
         }
         let merged_repo = tx.write().leave_unpublished();
         self.locked_op_heads.finish(merged_repo.operation());

lib/src/transaction.rs

@@ -22,7 +22,6 @@ use crate::op_store;
 use crate::op_store::OperationMetadata;
 use crate::operation::Operation;
 use crate::repo::{MutableRepo, ReadonlyRepo, RepoLoader};
-use crate::settings::UserSettings;
 use crate::view::View;
 
 pub struct Transaction {
@@ -57,7 +56,7 @@ impl Transaction {
         self.repo.as_mut().unwrap()
     }
 
-    pub fn merge_operation(&mut self, user_settings: &UserSettings, other_op: Operation) {
+    pub fn merge_operation(&mut self, other_op: Operation) {
         let ancestor_op = closest_common_node(
             self.parent_ops.clone(),
             vec![other_op.clone()],
@@ -71,7 +70,6 @@ impl Transaction {
         self.parent_ops.push(other_op);
         let merged_repo = self.mut_repo();
         merged_repo.merge(&base_repo, &other_repo);
-        merged_repo.rebase_descendants(user_settings);
     }
 
     /// Writes the transaction to the operation store and publishes it.