lintrunner 0.12.0__tar.gz → 0.12.2__tar.gz

{lintrunner-0.12.0 → lintrunner-0.12.2}/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.1] - 2024-02-10
+
+### Bug Fixes
+
+- Properly filter ignored files in sapling all-files ([34dd8b2](https://github.com/suo/lintrunner/commit/34dd8b295c58b1055916f18dd55272fffc64e705))
+- Make rage command robust to missing data ([a96ceec](https://github.com/suo/lintrunner/commit/a96ceec6ce3f8ae798f08d34c5f6de133814363b))
+
 ## [0.12.0] - 2024-02-10
 
 ### Bug Fixes

{lintrunner-0.12.0 → lintrunner-0.12.2}/Cargo.lock

@@ -327,9 +327,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "encode_unicode"
@@ -586,7 +586,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "lintrunner"
-version = "0.12.0"
+version = "0.12.2"
 dependencies = [
  "anyhow",
  "assert_cmd",

{lintrunner-0.12.0 → lintrunner-0.12.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lintrunner"
-version = "0.12.0"
+version = "0.12.2"
 authors = ["Michael Suo <suo@fb.com>"]
 edition = "2021"
 description = "A lint running tool and framework."

{lintrunner-0.12.0 → lintrunner-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lintrunner
-Version: 0.12.0
+Version: 0.12.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/git.rs

@@ -3,7 +3,7 @@ use std::{collections::HashSet, convert::TryFrom, process::Command};
 use crate::{
     log_utils::{ensure_output, log_files},
     path::AbsPath,
-    version_control,
+    version_control::VersionControl,
 };
 use anyhow::{ensure, Context, Result};
 use log::debug;
@@ -13,7 +13,7 @@ pub struct Repo {
     root: AbsPath,
 }
 
-impl version_control::System for Repo {
+impl VersionControl for Repo {
     fn new() -> Result<Repo> {
         // Retrieve the git root based on the current working directory.
         let output = Command::new("git")

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/lib.rs

@@ -13,6 +13,7 @@ use std::convert::TryFrom;
 use std::fs::OpenOptions;
 use std::sync::{Arc, Mutex};
 use std::thread;
+use version_control::VersionControl;
 
 pub mod git;
 pub mod init;
@@ -150,8 +151,16 @@ pub enum RenderOpt {
     Oneline,
 }
 
+pub fn get_version_control() -> Result<Box<dyn VersionControl>> {
+    let repo = git::Repo::new();
+    if let Ok(repo) = repo {
+        return Ok(Box::new(repo));
+    }
+
+    Ok(Box::new(sapling::Repo::new()?))
+}
+
 pub fn do_lint(
-    repo: &version_control::Repo,
     linters: Vec<Linter>,
     paths_opt: PathsOpt,
     should_apply_patches: bool,
@@ -165,6 +174,7 @@ pub fn do_lint(
         "Running linters: {:?}",
         linters.iter().map(|l| &l.code).collect::<Vec<_>>()
     );
+    let repo = get_version_control()?;
     let mut stdout = Term::stdout();
     if linters.is_empty() {
         stdout.write_line("No linters ran.")?;

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/main.rs

@@ -190,8 +190,6 @@ fn do_main() -> Result<i32> {
     debug!("Version: {VERSION}");
     debug!("Passed args: {:?}", std::env::args());
     debug!("Computed args: {:?}", args);
-    let repo = version_control::Repo::new()?;
-    debug!("Current rev: {}", repo.get_head()?);
 
     // report config paths which do not exist
     for path in &config_paths {
@@ -293,7 +291,6 @@ fn do_main() -> Result<i32> {
         SubCommand::Format => {
             check_init_changed(&persistent_data_store, &lint_runner_config)?;
             do_lint(
-                &repo,
                 linters,
                 paths_opt,
                 true, // always apply patches when we use the format command
@@ -308,7 +305,6 @@ fn do_main() -> Result<i32> {
             // Default command is to just lint.
             check_init_changed(&persistent_data_store, &lint_runner_config)?;
             do_lint(
-                &repo,
                 linters,
                 paths_opt,
                 args.apply_patches,

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/persistent_data.rs

@@ -175,7 +175,7 @@ impl PersistentDataStore {
             .collect::<Result<Vec<_>, std::io::Error>>()?;
 
         run_dirs.sort_unstable();
-        run_dirs.pop(); // Don't include the current run.
+        run_dirs.pop();  // pop most recent job as it won't have a report yet.
         run_dirs.reverse();
 
         debug!("Found past runs: {:?}", run_dirs);
@@ -209,14 +209,19 @@ impl PersistentDataStore {
 
         let mut ret = Vec::new();
 
-        // Skip the first one as it is the current run.
         for dir in run_dirs.into_iter() {
             debug!("Reading run info from {}", dir.display());
+            let run_data = std::fs::read_to_string(dir.join("run_info.json"));
+            let exit_data = std::fs::read_to_string(dir.join("exit_info.json"));
+            if run_data.is_err() || exit_data.is_err() {
+                // If we couldn't find one of the runfiles, just skip it. We can
+                // fail to write it for a variety of reasons, including a simple
+                // sigterm.
+                continue;
+            }
 
-            let run_info: RunInfo =
-                serde_json::from_str(&std::fs::read_to_string(dir.join("run_info.json"))?)?;
-            let exit_info: ExitInfo =
-                serde_json::from_str(&std::fs::read_to_string(dir.join("exit_info.json"))?)?;
+            let run_info: RunInfo = serde_json::from_str(&run_data?)?;
+            let exit_info: ExitInfo = serde_json::from_str(&exit_data?)?;
             ret.push((run_info, exit_info));
         }
         Ok(ret)

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/sapling.rs

@@ -1,7 +1,7 @@
 use crate::{
     log_utils,
     path::{self, AbsPath},
-    version_control,
+    version_control::VersionControl,
 };
 
 use anyhow;
@@ -10,7 +10,7 @@ pub struct Repo {
     root: path::AbsPath,
 }
 
-impl version_control::System for Repo {
+impl VersionControl for Repo {
     fn new() -> anyhow::Result<Self> {
         let output = std::process::Command::new("sl").arg("root").output()?;
         anyhow::ensure!(output.status.success(), "Failed to determine Sapling root");
@@ -59,16 +59,16 @@ impl version_control::System for Repo {
         cmd.current_dir(&self.root);
         let output = cmd.output()?;
         log_utils::ensure_output(&format!("{:?}", cmd), &output)?;
-        let commit_files_str = std::str::from_utf8(&output.stdout)?;
-        let commit_files: std::collections::HashSet<String> = commit_files_str
+        let all_files_str = std::str::from_utf8(&output.stdout)?;
+        let all_files: std::collections::HashSet<String> = all_files_str
             .split('\n')
             .map(|x| x.to_string())
+            .filter(|line| !line.starts_with('I'))
             .map(|line| re.replace(&line, "").to_string())
             .filter(|line| !line.is_empty())
-            .filter(|line| !line.starts_with('I'))
             .collect();
 
-        let filtered_commit_files = commit_files
+        let filtered_all_files = all_files
             .into_iter()
             .map(|f| format!("{}", self.root.join(f).display()))
             .filter_map(|f| match path::AbsPath::try_from(&f) {
@@ -80,7 +80,7 @@ impl version_control::System for Repo {
             })
             .collect::<Vec<path::AbsPath>>();
 
-        Ok(filtered_commit_files)
+        Ok(filtered_all_files)
     }
 
     fn get_changed_files(&self, relative_to: Option<&str>) -> anyhow::Result<Vec<path::AbsPath>> {
@@ -134,7 +134,7 @@ mod tests {
     use std::{fs::OpenOptions, io::Write, sync::Mutex}; // 1.4.0
 
     static SL_GLOBAL_MUTEX: Lazy<Mutex<()>> = Lazy::new(Mutex::default);
-    use crate::{testing, version_control::System};
+    use crate::testing;
 
     use super::*;
     use anyhow::Result;

{lintrunner-0.12.0 → lintrunner-0.12.2}/src/testing.rs

@@ -1,6 +1,6 @@
 use std::{fs::OpenOptions, io::Write, process::Command};
 
-use crate::version_control;
+use crate::get_version_control;
 
 use anyhow::Result;
 use tempfile::TempDir;
@@ -82,7 +82,7 @@ impl GitCheckout {
 
     pub fn changed_files(&self, relative_to: Option<&str>) -> Result<Vec<String>> {
         std::env::set_current_dir(self.root())?;
-        let repo = version_control::Repo::new()?;
+        let repo = get_version_control()?;
         let files = repo.get_changed_files(relative_to)?;
         let files = files
             .into_iter()
@@ -93,7 +93,7 @@ impl GitCheckout {
 
     pub fn merge_base_with(&self, merge_base_with: &str) -> Result<String> {
         std::env::set_current_dir(self.root())?;
-        let repo = version_control::Repo::new()?;
+        let repo = get_version_control()?;
         repo.get_merge_base_with(merge_base_with)
     }
 

lintrunner-0.12.2/src/version_control.rs

@@ -0,0 +1,26 @@
+use anyhow;
+
+use crate::path::AbsPath;
+
+// Trait describing the operations we need in lintrunner for a version
+// control system.
+pub trait VersionControl {
+    // Creates a new instance, trying the different implementations we
+    // have available.
+    fn new() -> anyhow::Result<Self>
+    where
+        Self: Sized;
+
+    // Gets the tip of the repository.
+    fn get_head(&self) -> anyhow::Result<String>;
+
+    // Gets the most recent common ancestor between the tip and the
+    // given commit.
+    fn get_merge_base_with(&self, merge_base_with: &str) -> anyhow::Result<String>;
+
+    // Gets the files that have changed relative to the given commit.
+    fn get_changed_files(&self, relative_to: Option<&str>) -> anyhow::Result<Vec<AbsPath>>;
+
+    // Get all files in the repo.
+    fn get_all_files(&self, under: Option<&AbsPath>) -> anyhow::Result<Vec<AbsPath>>;
+}

lintrunner-0.12.0/src/version_control.rs

@@ -1,71 +0,0 @@
-use crate::{
-    git,
-    path::{self, AbsPath},
-    sapling,
-};
-
-use anyhow;
-
-pub struct Repo(RepoImpl);
-
-enum RepoImpl {
-    Git(git::Repo),
-    Sapling(sapling::Repo),
-}
-
-// Trait describing the operations we need in lintrunner for a version
-// control system.
-pub trait System {
-    // Creates a new instance, trying the different implementations we
-    // have available.
-    fn new() -> anyhow::Result<Self>
-    where
-        Self: Sized;
-
-    // Gets the tip of the repository.
-    fn get_head(&self) -> anyhow::Result<String>;
-
-    // Gets the most recent common ancestor between the tip and the
-    // given commit.
-    fn get_merge_base_with(&self, merge_base_with: &str) -> anyhow::Result<String>;
-
-    // Gets the files that have changed relative to the given commit.
-    fn get_changed_files(&self, relative_to: Option<&str>) -> anyhow::Result<Vec<path::AbsPath>>;
-
-    // Get all files in the repo.
-    fn get_all_files(&self, under: Option<&AbsPath>) -> anyhow::Result<Vec<AbsPath>>;
-}
-
-impl Repo {
-    pub fn new() -> anyhow::Result<Self> {
-        git::Repo::new()
-            .and_then(|repo| Ok(Repo(RepoImpl::Git(repo))))
-            .or_else(|_| sapling::Repo::new().and_then(|repo| Ok(Repo(RepoImpl::Sapling(repo)))))
-    }
-
-    pub fn get_head(&self) -> anyhow::Result<String> {
-        self.get_system().get_head()
-    }
-
-    pub fn get_merge_base_with(&self, merge_base_with: &str) -> anyhow::Result<String> {
-        self.get_system().get_merge_base_with(merge_base_with)
-    }
-
-    pub fn get_changed_files(
-        &self,
-        relative_to: Option<&str>,
-    ) -> anyhow::Result<Vec<path::AbsPath>> {
-        self.get_system().get_changed_files(relative_to)
-    }
-
-    fn get_system<'a>(&'a self) -> Box<&'a dyn System> {
-        match &self.0 {
-            RepoImpl::Git(git) => Box::new(git as &dyn System),
-            RepoImpl::Sapling(sapling) => Box::new(sapling as &dyn System),
-        }
-    }
-
-    pub fn get_all_files(&self, under: Option<&AbsPath>) -> anyhow::Result<Vec<AbsPath>> {
-        self.get_system().get_all_files(under)
-    }
-}