copies-rust: pre-indent some code to clarify the next changeset

The next changeset will massively rewrite the next function. However having a
clear diff on the core semantic of the function will help making the next
changesets clearer. So we do most of the churn beforehand.

Differential Revision: https://phab.mercurial-scm.org/D9301

rust/hg-core/src/copy_tracing.rs

@@ -203,10 +203,12 b' fn merge_copies_dict('
     for (dest, src_major) in major {
         let overwrite;
         if let Some(src_minor) = minor.get(&dest) {
+            {
             if src_major.path == src_minor.path {
-                // we have the same value, but from other source;
+                    // we have the same value, no need to battle;
                 if src_major.rev == src_minor.rev {
-                    // If the two entry are identical, no need to do anything
+                        // If the two entry are identical, no need to do
+                        // anything
                     overwrite = false;
                 } else if is_ancestor(src_major.rev, src_minor.rev) {
                     overwrite = false;
@@ -220,26 +222,28 b' fn merge_copies_dict('
             } else if src_major.path.is_none()
                 && changes.salvaged.contains(&dest)
             {
-                // If the file is "deleted" in the major side but was salvaged
-                // by the merge, we keep the minor side alive
+                    // If the file is "deleted" in the major side but was
+                    // salvaged by the merge, we keep the minor side alive
                 overwrite = false;
             } else if src_minor.path.is_none()
                 && changes.salvaged.contains(&dest)
             {
-                // If the file is "deleted" in the minor side but was salvaged
-                // by the merge, unconditionnaly preserve the major side.
+                    // If the file is "deleted" in the minor side but was
+                    // salvaged by the merge, unconditionnaly preserve the
+                    // major side.
                 overwrite = true;
             } else if changes.merged.contains(&dest) {
-                // If the file was actively merged, copy information from each
-                // side might conflict. The major side will win such conflict.
+                    // If the file was actively merged, copy information from
+                    // each side might conflict.  The major side will win such
+                    // conflict.
                 overwrite = true;
             } else if is_ancestor(src_major.rev, src_minor.rev) {
-                // If the minor side is strictly newer than the major side, it
-                // should be kept.
+                    // If the minor side is strictly newer than the major side,
+                    // it should be kept.
                 overwrite = false;
             } else if src_major.path.is_some() {
-                // without any special case, the "major" value win other the
-                // "minor" one.
+                    // without any special case, the "major" value win other
+                    // the "minor" one.
                 overwrite = true;
             } else if is_ancestor(src_minor.rev, src_major.rev) {
                 // the "major" rev is a direct ancestors of "minor", any
@@ -247,11 +251,12 b' fn merge_copies_dict('
                 overwrite = true;
             } else {
                 // major version is None (so the file was deleted on that
-                // branch) annd that branch is independant (neither minor nor
-                // major is an ancestors of the other one.) We preserve the new
-                // information about the new file.
+                    // branch) and that branch is independant (neither minor
+                    // nor major is an ancestors of the other one.) We preserve
+                    // the new information about the new file.
                 overwrite = false;
             }
+            }
         } else {
             // minor had no value
             overwrite = true;