Merge branch 'repository-integration'

Author: Byron

.cargo/config.toml

@@ -1,2 +1,5 @@
+[profile.dev]
+debug = false
+
 [build]
 rustflags = "--cfg unsound_local_offset -C target-cpu=native"

.github/workflows/rust.yml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+#     - uses: Swatinem/rust-cache@v1 - todo: figure out why windows doesn't seem to get its own caches, maybe?
     - name: clippy
       run: cargo clippy --all
     - name: fmt
@@ -44,6 +45,7 @@ jobs:
           profile: default
           toolchain: stable
           override: true
+      - uses: Swatinem/rust-cache@v1
       - name: "Check default features build on windows"
         uses: actions-rs/cargo@v1
         with:
@@ -75,4 +77,4 @@ jobs:
     - uses: actions/checkout@v2
     - uses: EmbarkStudios/cargo-deny-action@v1
       with:
-        command: check ${{ matrix.checks }}
+        command: check ${{ matrix.checks }}

Cargo.lock

@@ -50,6 +50,7 @@ pretty-cli = ["clap",
     "prodash/local-time",
     "prodash-render-tui",
     "prodash-render-line",
+    "gitoxide-core/local-time-support",
     "env_logger",
     "futures-lite"]
 lean-cli = ["argh", "prodash/progress-log", "env_logger" ]
@@ -79,8 +80,17 @@ env_logger = { version = "0.9.0", optional = true, default-features = false, fea
 crosstermion = { version = "0.8.0", optional = true, default-features = false }
 futures-lite = { version = "1.12.0", optional = true, default-features = false, features = ["std"] }
 
-[profile.dev]
-incremental = false
+# toml_edit can't parse this :(
+#[profile.dev.package]
+#git-object.opt-level = 3
+#git-ref.opt-level = 3
+#git-pack.opt-level = 3
+#git-hash.opt-level = 3
+#git-actor.opt-level = 3
+#git-config.opt-level = 3
+#miniz_oxide.opt-level = 3
+#sha-1.opt-level = 3
+#sha1.opt-level = 3
 
 [profile.release]
 overflow-checks = false

Cargo.toml

@@ -85,10 +85,12 @@ check: ## Build all code in suitable configurations
 	cargo check --no-default-features --features lean-termion
 	cargo check --no-default-features --features max
 	cargo check --no-default-features --features max-termion
-	cd git-actor && cargo check
+	cd git-actor && cargo check \
+				 && cargo check --features local-time-support
 	cd gitoxide-core && cargo check \
                      && cargo check --features blocking-client \
-                     && cargo check --features async-client
+                     && cargo check --features async-client \
+                     && cargo check --features local-time-support
 	cd gitoxide-core && if cargo check --all-features 2>/dev/null; then false; else true; fi
 	cd git-hash && cargo check --all-features \
 				&& cargo check
@@ -110,6 +112,7 @@ check: ## Build all code in suitable configurations
 			   && cargo check --features rustsha1 \
 			   && cargo check --features fast-sha1 \
 			   && cargo check --features progress \
+			   && cargo check --features time \
 			   && cargo check --features io-pipe \
 			   && cargo check --features crc32 \
 			   && cargo check --features zlib \
@@ -131,6 +134,7 @@ check: ## Build all code in suitable configurations
 	cd git-repository && cargo check --all-features \
 					  && cargo check --no-default-features --features local \
 					  && cargo check --no-default-features --features network \
+					  && cargo check --no-default-features --features one-stop-shop \
 					  && cargo check --no-default-features
 	cd cargo-smart-release && cargo check
 	cd experiments/object-access && cargo check

Makefile

@@ -7,19 +7,19 @@ Please note that this guide isn't stable itself and may be adjusted to fit chang
 
 ## Terminology
 
-* _dependent crate_
+- _dependent crate_
   - A crate which depends on a crate in this workspace directly.
-* _downstream crate_
+- _downstream crate_
   - A crate which directly or indirectly depends on a crate in this workspace.
-* _workspace crate_
+- _workspace crate_
   - A crate which is a member of this workspace and hence is stored in this repository
-* _breaking change_
+- _breaking change_
   - A change in code that requires a `dependent crate` to adjust their code to fix compile errors.
-* _release_
+- _release_
   - A new version of a crate is published to crates.io
-* _development version_ 
+- _development version_
   - A crate version whose _major_ version is 0.
-* _release version_
+- _release version_
   - A crate version whose _major_ version is 1 or higher.
 
 ## Tiers
@@ -56,9 +56,13 @@ The following schematic helps to visualize what follows.
     ║    │ ┌─────────────┐   ┌─────────────┐ │    ║   
     ║    │ │   git-ref   │   │ git-config  │ │    ║  │
     ║    │ └─────────────┘   └─────────────┘ │    ║   
-    ║    └───────────────────────────────────┘    ║  │
-    ║                                             ║   
-    ╚═════════════════════════════════════════════╝  │
+    ║    │ ┌─────────────┐   ┌─────────────┐ │    ║  │
+    ║    │ │ git-object  │   │  git-lock   │ │    ║   
+    ║    │ └─────────────┘   └─────────────┘ │    ║  │
+    ║    └───────────────────────────────────┘    ║   
+    ║                                             ║  │
+    ╚═════════════════════════════════════════════╝   
+                                                     │
     Stability Tier 2 ─────────────────────────────┐   
     │                                             │  │
     │    Plumbing Crates─────────────────────┐    │   
@@ -95,7 +99,7 @@ If there are additional breaking changes without a release, these push back the
 
 ### Tier 1: released apps and application crates
 
-Released apps and application crates are marked with major version number 1 or above, like `2.3.0+21.06` and live in tier 1 _(->ST1)_, 
+Released apps and application crates are marked with major version number 1 or above, like `2.3.0+21.06` and live in tier 1 _(->ST1)_,
 with the build identifiers for year (`21`) and and month `06` appended, based on the actual release year and month.
 
 Breaking changes are collected and may be released no more often than every 6 months by incrementing the major version number. If there are additional breaking changes,

STABILITY.md

@@ -72,6 +72,8 @@ The library powering the command-line interface.
   - **async-client**
     - The client to connect to git servers will be async, while supporting only the 'git' transport itself. It's the most limited and can be seen as example
       on how to use custom transports for custom servers.
+* **local-time-support**
+    - Functions dealing with time may include the local timezone offset, not just UTC with the offset being zero.
 
 [skim]: https://github.com/lotabout/skim
 [git-hours]: https://github.com/kimmobrunfeldt/git-hours
@@ -83,6 +85,11 @@ The library powering the command-line interface.
       for the LRU-cache itself low.
 * **pack-cache-lru-dynamic**
     * Provide a hash-map based LRU cache whose eviction is based a memory cap calculated from object data.
+   
+### git-actor
+
+* **local-time-support**
+   - Make `Signature` initializers using the local time (with UTC offset) available.
 
 ### git-features
 
@@ -185,6 +192,8 @@ be selected.
 * **unstable**
   - Re-export stability tier 2 crates for convenience and make `Repository` struct fields with types from these crates publicly accessible.
   - Doing so is less stable than the stability tier 1 that `git-repository` is a member of.
+* **local-time-support**
+  - Functions dealing with time may include the local timezone offset, not just UTC with the offset being zero.
 
 The following toggles can be used to reduce dependencies.
 

cargo-features.md

@@ -6,7 +6,7 @@ use cargo_metadata::{
     camino::{Utf8Component, Utf8Path},
     Package,
 };
-use git_repository::{easy::object, prelude::ReferenceAccessExt, refs};
+use git_repository::{easy::object, prelude::ReferenceAccessExt, refs, refs::transaction::PreviousValue};
 
 use super::{tag_name_for, utils::will, Context, Oid, Options};
 
@@ -46,8 +46,8 @@ pub(in crate::command::release_impl) fn has_changed_since_last_release(
         .strip_prefix(&ctx.root)
         .expect("workspace members are releative to the root directory");
 
-    let current_commit = ctx.git_easy.find_reference("HEAD")?.peel_to_oid_in_place()?;
-    let released_target = tag_ref.peel_to_oid_in_place()?;
+    let current_commit = ctx.git_easy.find_reference("HEAD")?.peel_to_id_in_place()?;
+    let released_target = tag_ref.peel_to_id_in_place()?;
 
     if repo_relative_crate_dir.as_os_str().is_empty() {
         Ok(current_commit != released_target)
@@ -126,7 +126,7 @@ pub(in crate::command::release_impl) fn commit_changes(
     if !cmd.status()?.success() {
         bail!("Failed to commit changed manifests");
     }
-    Ok(Some(ctx.git_easy.find_reference("HEAD")?.peel_to_oid_in_place()?))
+    Ok(Some(ctx.git_easy.find_reference("HEAD")?.peel_to_id_in_place()?))
 }
 
 pub(in crate::command::release_impl) fn create_version_tag<'repo>(
@@ -155,12 +155,9 @@ pub(in crate::command::release_impl) fn create_version_tag<'repo>(
         }
         Ok(Some(format!("refs/tags/{}", tag_name).try_into()?))
     } else {
-        let edits = ctx.git_easy.tag(
-            tag_name,
-            commit_id.expect("set in --execute mode"),
-            git_lock::acquire::Fail::Immediately,
-            false,
-        )?;
+        let edits = ctx
+            .git_easy
+            .tag(tag_name, commit_id.expect("set in --execute mode"), PreviousValue::Any)?;
         assert_eq!(edits.len(), 1, "We create only one tag and there is no expansion");
         let tag = edits.into_iter().next().expect("the promised tag");
         log::info!("Created tag {}", tag.name.as_bstr());

cargo-smart-release/src/command/release/git.rs

@@ -239,6 +239,7 @@ See its [README.md](https://github.com/Byron/gitoxide/blob/main/git-lock/README.
 
 ### git-repository
 * [x] utilities for applications to make long running operations interruptible gracefully and to support timeouts in servers.
+* [ ] handle `core.repositoryFormatVersion` and extensions
 * [x] discovery
   * [ ] option to not cross file systems
   * [ ] handle git-common-dir

crate-status.md

@@ -15,7 +15,7 @@ function indent () {
 }
 
 echo "in root: gitoxide CLI"
-indent cargo diet -n --package-size-limit 25KB
+#indent cargo diet -n --package-size-limit 25KB - fails right now because of dotted profile.dev.package
 (enter cargo-smart-release && indent cargo diet -n --package-size-limit 15KB)
 (enter git-actor && indent cargo diet -n --package-size-limit 5KB)
 (enter git-tempfile && indent cargo diet -n --package-size-limit 20KB)
@@ -34,6 +34,6 @@ indent cargo diet -n --package-size-limit 25KB
 (enter git-odb && indent cargo diet -n --package-size-limit 15KB)
 (enter git-protocol && indent cargo diet -n --package-size-limit 25KB)
 (enter git-packetline && indent cargo diet -n --package-size-limit 15KB)
-(enter git-repository && indent cargo diet -n --package-size-limit 30KB)
+(enter git-repository && indent cargo diet -n --package-size-limit 35KB)
 (enter git-transport && indent cargo diet -n --package-size-limit 30KB)
 (enter gitoxide-core && indent cargo diet -n --package-size-limit 20KB)

etc/check-package-size.sh

@@ -9,7 +9,7 @@ use git_repository::{
     objs::{bstr::BStr, TreeRefIter},
     odb,
     prelude::*,
-    refs::file::loose::reference::peel,
+    refs::{file::ReferenceExt, peel},
 };
 use rayon::prelude::*;
 
@@ -255,7 +255,7 @@ where
     where
         L: for<'a> FnMut(&oid, &'a mut Vec<u8>) -> Option<odb::data::Object<'a>>,
     {
-        find(id, buf).and_then(|o| o.into_tree_iter())
+        find(id, buf).and_then(|o| o.try_into_tree_iter())
     }
 
     fn tree_iter_by_commit<'b, L>(id: &oid, buf: &'b mut Vec<u8>, mut find: L) -> TreeRefIter<'b>
@@ -264,7 +264,7 @@ where
     {
         let tid = find(id, buf)
             .expect("commit present")
-            .into_commit_iter()
+            .try_into_commit_iter()
             .expect("a commit")
             .tree_id()
             .expect("tree id present and decodable");

etc/crate-structure.monopic

@@ -10,7 +10,7 @@ use git_repository::{
     objs::{bstr::BStr, tree::EntryRef},
     odb,
     prelude::*,
-    refs::file::loose::reference::peel,
+    refs::{file::ReferenceExt, peel},
     traverse::{tree, tree::visit::Action},
 };
 
@@ -209,13 +209,13 @@ where
             for commit in commits {
                 let tree_id = db
                     .try_find(commit, &mut buf, &mut cache)?
-                    .and_then(|o| o.into_commit_iter().and_then(|mut c| c.tree_id()))
+                    .and_then(|o| o.try_into_commit_iter().and_then(|mut c| c.tree_id()))
                     .expect("commit as starting point");
 
                 let mut count = Count { entries: 0, seen };
                 db.find_tree_iter(tree_id, &mut buf2, &mut cache)?.traverse(
                     &mut state,
-                    |oid, buf| db.find(oid, buf, &mut cache).ok().and_then(|o| o.into_tree_iter()),
+                    |oid, buf| db.find(oid, buf, &mut cache).ok().and_then(|o| o.try_into_tree_iter()),
                     &mut count,
                 )?;
                 entries += count.entries as u64;

experiments/diffing/src/main.rs

@@ -13,11 +13,13 @@ doctest = false
 
 [features]
 serde1 = ["serde", "bstr/serde1"]
+local-time-support = ["git-features/time"]
 
 [package.metadata.docs.rs]
 all-features = true
 
 [dependencies]
+git-features = { version = "^0.16.0", path = "../git-features", optional = true }
 quick-error = "2.0.0"
 btoi = "0.4.2"
 bstr = { version = "0.2.13", default-features = false, features = ["std"]}