extend -p

Author: christso

src/cli.rs

@@ -13,74 +13,83 @@ pub struct Args {
     #[arg(short, long)]
     pub output_file: Option<String>,
 
-    /// The first commit hash
-    #[arg(short = 'c', long = "commit1")]
-    pub commit1: Option<String>,
-
-    /// The second commit hash
-    #[arg(short = 'd', long = "commit2")]
-    pub commit2: Option<String>,
+    /// The commit hash to compare (the 'newer' commit)
+    #[arg(short = 'c', long = "commit")]
+    pub commit: Option<String>,
 
     /// Compare the latest commit on the current branch to the latest common commit with another branch
-    #[arg(short, long)]
+    #[arg(short, long, conflicts_with_all = ["commit", "previous"])]
     pub branch: Option<String>,
 
-    /// Compare the specified commit with its parent (previous) commit
-    #[arg(short = 'p', long = "previous", requires = "commit1", conflicts_with_all = ["commit2", "branch"])]
-    pub use_previous: bool,
+    /// Compare the specified commit (--commit) with a previous commit.
+    /// If a hash is provided, compare with that specific hash.
+    /// If no hash is provided, compare with the parent of the commit specified by --commit.
+    #[arg(short = 'p', long = "previous", value_name = "PREVIOUS_COMMIT_HASH", num_args = 0..=1, requires = "commit", conflicts_with = "branch")]
+    pub previous: Option<Option<String>>,
 }
 
 /// Main entry point for the CLI
 pub fn run() -> Result<()> {
     let args = Args::parse();
 
-    // Initialize the RepoDiff tool
+    // Initialize the RepoDiff tool and GitOperations
     let mut repodiff = RepoDiff::new("config.json")?;
     let git_ops = GitOperations::new();
 
-    // Determine the commit hashes
+    // Determine the commit hashes based on provided arguments
     let (commit1, commit2) = if let Some(branch) = args.branch {
+        // Branch comparison logic
         let commit1 = git_ops.get_latest_common_commit_with_branch(&branch)?;
         let commit2 = git_ops.get_latest_commit()?;
 
-        // Print the commits being used for the comparison
         println!(
             "Comparing latest common commit with branch '{}' ({}) and the latest commit on the current branch ({}).",
             branch,
             &commit1[..12.min(commit1.len())],
             &commit2[..12.min(commit2.len())]
         );
-        
-        (commit1, commit2)
-    } else if args.use_previous && args.commit1.is_some() {
-        let commit2 = args.commit1.clone().unwrap();
-        let commit1 = git_ops.get_previous_commit(&commit2)?;
-        
-        // Print the commits being used for the comparison
-        println!(
-            "Comparing commit {} with its parent commit {}.",
-            &commit2[..12.min(commit2.len())],
-            &commit1[..12.min(commit1.len())]
-        );
-        
         (commit1, commit2)
-    } else {
-        if args.commit1.is_none() || args.commit2.is_none() {
-            eprintln!("You must either provide two commit hashes using --commit1 and --commit2, or use the -b option to compare against another branch, or use -p with -c to compare with the previous commit.");
-            process::exit(1);
+
+    } else if let Some(commit_to_compare) = args.commit {
+        // Commit comparison logic (using --commit and --previous)
+        match args.previous {
+            Some(Some(prev_commit_hash)) => {
+                // -p <hash> provided: Compare commit_to_compare with prev_commit_hash
+                let commit1 = prev_commit_hash;
+                let commit2 = commit_to_compare;
+                println!(
+                    "Comparing specified commit {} with previous commit {}.",
+                    &commit2[..12.min(commit2.len())],
+                    &commit1[..12.min(commit1.len())]
+                );
+                (commit1, commit2)
+            }
+            Some(None) => {
+                // -p flag provided without value: Compare commit_to_compare with its parent
+                let commit2 = commit_to_compare;
+                let commit1 = git_ops.get_previous_commit(&commit2)?;
+                println!(
+                    "Comparing specified commit {} with its parent commit {}.",
+                    &commit2[..12.min(commit2.len())],
+                    &commit1[..12.min(commit1.len())]
+                );
+                (commit1, commit2)
+            }
+            None => {
+                // Only -c provided, which is not enough for comparison.
+                eprintln!("Missing comparison target. Use --previous (-p) to compare with a parent or specific commit when using --commit, or use --branch (-b) to compare with another branch.");
+                process::exit(1);
+            }
         }
-        
-        (args.commit1.unwrap(), args.commit2.unwrap())
-    };
-    
-    // Set output file or default to the user's temporary directory
-    let output_file = if let Some(output_file) = args.output_file {
-        output_file
     } else {
-        let default_output = "repodiff_output.txt".to_string(); // Default filename in the working directory
-        default_output
+        // Neither --branch nor --commit specified.
+        eprintln!("You must specify either a branch to compare (--branch) or a commit to compare (--commit) along with a comparison target (--previous).");
+        process::exit(1);
     };
 
+    // Set output file or default
+    let output_file = args.output_file.unwrap_or_else(|| "repodiff_output.txt".to_string());
+    
     // Process the diff and get the token count
     let token_count = repodiff.process_diff(&commit1, &commit2, &output_file)?;
 
@@ -89,4 +98,4 @@ pub fn run() -> Result<()> {
     println!("Total number of tokens: {}", token_count);
 
     Ok(())
-} 
+}