Merge branch 'main' into git-sec

Byron · Byron · commit 2fe70f96cfb6 · 2022-04-17T20:48:54.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -147,6 +147,8 @@ members = [
     "git-mailmap",
     "git-note",
     "git-sec",
+    "git-lfs",
+    "git-rebase",
     "git-submodule",
     "git-transport",
     "git-credentials",
diff --git a/README.md b/README.md
@@ -125,6 +125,8 @@ Crates that seem feature complete and need to see some more use before they can
   * [git-sec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-sec)
   * [git-note](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-note)
   * [git-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-date)
+  * [git-lfs](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-lfs)
+  * [git-rebase](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-rebase)
   * [git-pathspec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-pathspec)
   * [git-subomdule](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-submodule)
   * [git-tui](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-tui)
diff --git a/crate-status.md b/crate-status.md
@@ -241,6 +241,15 @@ A mechanism to associate metadata with any object, and keep revisions of it usin
 
 Provides a trust model to share across gitoxide crates. It helps configuring how to interact with external processes, among other things.
 
+### git-rebase
+* [ ] obtain rebase status
+* [ ] drive a rebase operation
+
+### git-lfs
+
+Implement git large file support using the process protocol and make it flexible enough to handle a variety of cases.
+Make it the best-performing implementation and the most convenient one.
+
 ### git-glob
 * [x] parse pattern
 * [x] a type for pattern matching of paths and non-paths, optionally case-insensitively.
diff --git a/git-lfs/CHANGELOG.md b/git-lfs/CHANGELOG.md
@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.0.0 (2022-04-17)
+
+An empty crate without any content to reserve the name for the gitoxide project.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 1 commit contributed to the release.
+ - 0 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#382](https://github.com/Byron/gitoxide/issues/382)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#382](https://github.com/Byron/gitoxide/issues/382)**
+    - add dummy crates for git-rebase and git-lfs ([`94c8122`](https://github.com/Byron/gitoxide/commit/94c81226e2713c869462241429df608e04c4418d))
+</details>
+
diff --git a/git-lfs/Cargo.toml b/git-lfs/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "git-lfs"
+version = "0.0.0"
+repository = "https://github.com/Byron/gitoxide"
+license = "MIT/Apache-2.0"
+description = "A WIP crate of the gitoxide project dealing with handling git large file support"
+authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
+edition = "2018"
+
+[lib]
+doctest = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/git-lfs/src/lib.rs b/git-lfs/src/lib.rs
@@ -0,0 +1 @@
+#![forbid(unsafe_code, rust_2018_idioms)]
diff --git a/git-lock/src/acquire.rs b/git-lock/src/acquire.rs
@@ -121,6 +121,12 @@ fn lock_with_mode<T>(
                 attempts += 1;
                 match try_lock(&lock_path, directory, cleanup.clone()) {
                     Ok(v) => return Ok((lock_path, v)),
+                    #[cfg(windows)]
+                    Err(err) if err.kind() == AlreadyExists || err.kind() == PermissionDenied => {
+                        std::thread::sleep(wait);
+                        continue;
+                    }
+                    #[cfg(not(windows))]
                     Err(err) if err.kind() == AlreadyExists => {
                         std::thread::sleep(wait);
                         continue;
diff --git a/git-rebase/CHANGELOG.md b/git-rebase/CHANGELOG.md
@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.0.0 (2022-04-17)
+
+An empty crate without any content to reserve the name for the gitoxide project.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 1 commit contributed to the release.
+ - 0 commits where understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#382](https://github.com/Byron/gitoxide/issues/382)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#382](https://github.com/Byron/gitoxide/issues/382)**
+    - add dummy crates for git-rebase and git-lfs ([`94c8122`](https://github.com/Byron/gitoxide/commit/94c81226e2713c869462241429df608e04c4418d))
+</details>
+
diff --git a/git-rebase/Cargo.toml b/git-rebase/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "git-rebase"
+version = "0.0.0"
+repository = "https://github.com/Byron/gitoxide"
+license = "MIT/Apache-2.0"
+description = "A WIP crate of the gitoxide project dealing rebases"
+authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
+edition = "2018"
+
+[lib]
+doctest = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/git-rebase/src/lib.rs b/git-rebase/src/lib.rs
@@ -0,0 +1 @@
+#![forbid(unsafe_code, rust_2018_idioms)]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#![forbid(unsafe_code, rust_2018_idioms)]`