cargo: rename crates to names available on crates.io

I'm preparing to publish an early version before someone takes the
name(s) on crates.io. "jj" has been taken by a seemingly useless
project, but "jujube" and "jujube-lib" are still available, so let's
use those.

Cargo.lock

@@ -533,7 +533,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
 
 [[package]]
-name = "jj"
+name = "jobserver"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jujube"
 version = "0.1.0"
 dependencies = [
  "blake2",
@@ -547,7 +565,7 @@ dependencies = [
  "git2",
  "hex",
  "indoc",
- "jj-lib",
+ "jujube-lib",
  "pest",
  "pest_derive",
  "protobuf",
@@ -562,7 +580,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "jj-lib"
+name = "jujube-lib"
 version = "0.1.0"
 dependencies = [
  "backoff",
@@ -588,24 +606,6 @@ dependencies = [
  "zstd",
 ]
 
-[[package]]
-name = "jobserver"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"

Cargo.toml

@@ -1,13 +1,13 @@
-[workspace]
-members = ["lib"]
-
 [package]
-name = "jj"
+name = "jujube"
 version = "0.1.0"
 authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
 edition = "2018"
 
-[dependencies.jj-lib]
+[workspace]
+members = ["lib"]
+
+[dependencies.jujube-lib]
 path = "lib"
 
 [dependencies]

lib/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "jj-lib"
+name = "jujube-lib"
 version = "0.1.0"
 authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
 edition = "2018"

lib/tests/test_bad_locking.rs

@@ -17,8 +17,8 @@ use std::path::PathBuf;
 
 use tempfile::TempDir;
 
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::testutils;
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::testutils;
 use std::sync::Arc;
 use test_case::test_case;
 

lib/tests/test_commit_builder.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::repo_path::FileRepoPath;
-use jj_lib::settings::UserSettings;
-use jj_lib::testutils;
-use jj_lib::tree::DiffSummary;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::repo_path::FileRepoPath;
+use jujube_lib::settings::UserSettings;
+use jujube_lib::testutils;
+use jujube_lib::tree::DiffSummary;
 use test_case::test_case;
 
 #[test_case(false ; "local store")]

lib/tests/test_commit_concurrent.rs

@@ -14,9 +14,9 @@
 
 use std::thread;
 
-use jj_lib::dag_walk;
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::testutils;
+use jujube_lib::dag_walk;
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::testutils;
 use std::sync::Arc;
 use test_case::test_case;
 

lib/tests/test_diff_summary.rs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::repo_path::FileRepoPath;
-use jj_lib::testutils;
-use jj_lib::tree::DiffSummary;
+use jujube_lib::repo_path::FileRepoPath;
+use jujube_lib::testutils;
+use jujube_lib::tree::DiffSummary;
 use test_case::test_case;
 
 #[test_case(false ; "local store")]

lib/tests/test_evolution.rs

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::commit::Commit;
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::evolution::evolve;
-use jj_lib::evolution::EvolveListener;
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::repo_path::FileRepoPath;
-use jj_lib::settings::UserSettings;
-use jj_lib::testutils;
+use jujube_lib::commit::Commit;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::evolution::evolve;
+use jujube_lib::evolution::EvolveListener;
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::repo_path::FileRepoPath;
+use jujube_lib::settings::UserSettings;
+use jujube_lib::testutils;
 use test_case::test_case;
 
 #[must_use]

lib/tests/test_git.rs

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 use git2::Oid;
-use jj_lib::commit::Commit;
-use jj_lib::git;
-use jj_lib::git::{GitFetchError, GitImportError, GitPushError};
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::settings::UserSettings;
-use jj_lib::store::CommitId;
-use jj_lib::testutils;
+use jujube_lib::commit::Commit;
+use jujube_lib::git;
+use jujube_lib::git::{GitFetchError, GitImportError, GitPushError};
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::settings::UserSettings;
+use jujube_lib::store::CommitId;
+use jujube_lib::testutils;
 use maplit::hashset;
 use std::collections::HashSet;
 use std::path::PathBuf;
@@ -68,7 +68,7 @@ fn test_import_refs() {
     let repo = ReadonlyRepo::init_external_git(&settings, jj_repo_dir, git_repo_dir);
     let mut tx = repo.start_transaction("test");
     let heads_before: HashSet<_> = repo.view().heads().cloned().collect();
-    jj_lib::git::import_refs(&mut tx).unwrap_or_default();
+    jujube_lib::git::import_refs(&mut tx).unwrap_or_default();
     let heads_after: HashSet<_> = tx.as_repo().view().heads().cloned().collect();
     let expected_heads: HashSet<_> = heads_before
         .union(&hashset!(commit_id(&commit3), commit_id(&commit4)))
@@ -91,7 +91,7 @@ fn test_import_refs_empty_git_repo() {
     let repo = ReadonlyRepo::init_external_git(&settings, jj_repo_dir, git_repo_dir);
     let heads_before: HashSet<_> = repo.view().heads().cloned().collect();
     let mut tx = repo.start_transaction("test");
-    jj_lib::git::import_refs(&mut tx).unwrap_or_default();
+    jujube_lib::git::import_refs(&mut tx).unwrap_or_default();
     let heads_after: HashSet<_> = tx.as_repo().view().heads().cloned().collect();
     assert_eq!(heads_before, heads_after);
     tx.discard();
@@ -106,7 +106,7 @@ fn test_import_refs_non_git() {
     std::fs::create_dir(&jj_repo_dir).unwrap();
     let repo = ReadonlyRepo::init_local(&settings, jj_repo_dir);
     let mut tx = repo.start_transaction("test");
-    let result = jj_lib::git::import_refs(&mut tx);
+    let result = jujube_lib::git::import_refs(&mut tx);
     assert_eq!(result, Err(GitImportError::NotAGitRepo));
     tx.discard();
 }

lib/tests/test_index.rs

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::commit::Commit;
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::index::CompositeIndex;
-use jj_lib::repo::ReadonlyRepo;
-use jj_lib::settings::UserSettings;
-use jj_lib::store::CommitId;
-use jj_lib::testutils;
+use jujube_lib::commit::Commit;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::index::CompositeIndex;
+use jujube_lib::repo::ReadonlyRepo;
+use jujube_lib::settings::UserSettings;
+use jujube_lib::store::CommitId;
+use jujube_lib::testutils;
 use std::sync::Arc;
 use test_case::test_case;
 

lib/tests/test_init.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::repo::ReadonlyRepo;
-use jj_lib::testutils;
+use jujube_lib::repo::ReadonlyRepo;
+use jujube_lib::testutils;
 
 #[test]
 fn test_init_local() {

lib/tests/test_merge_trees.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::repo_path::{DirRepoPath, FileRepoPath, RepoPath};
-use jj_lib::store::{ConflictPart, TreeValue};
-use jj_lib::testutils;
-use jj_lib::tree::Tree;
-use jj_lib::trees;
+use jujube_lib::repo_path::{DirRepoPath, FileRepoPath, RepoPath};
+use jujube_lib::store::{ConflictPart, TreeValue};
+use jujube_lib::testutils;
+use jujube_lib::tree::Tree;
+use jujube_lib::trees;
 use test_case::test_case;
 
 #[test_case(false ; "local store")]

lib/tests/test_operations.rs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::repo::Repo;
-use jj_lib::store::CommitId;
-use jj_lib::testutils;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::repo::Repo;
+use jujube_lib::store::CommitId;
+use jujube_lib::testutils;
 use std::collections::HashSet;
 use std::path::Path;
 use std::sync::Arc;

lib/tests/test_transaction.rs

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::repo::Repo;
-use jj_lib::repo_path::FileRepoPath;
-use jj_lib::store::{Conflict, ConflictId, ConflictPart, TreeValue};
-use jj_lib::store_wrapper::StoreWrapper;
-use jj_lib::testutils;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::repo::Repo;
+use jujube_lib::repo_path::FileRepoPath;
+use jujube_lib::store::{Conflict, ConflictId, ConflictPart, TreeValue};
+use jujube_lib::store_wrapper::StoreWrapper;
+use jujube_lib::testutils;
 use std::collections::HashSet;
 use std::sync::Arc;
 use test_case::test_case;

lib/tests/test_view.rs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::repo::Repo;
-use jj_lib::store::CommitId;
-use jj_lib::testutils;
+use jujube_lib::repo::Repo;
+use jujube_lib::store::CommitId;
+use jujube_lib::testutils;
 use test_case::test_case;
 
 #[test_case(false ; "local store")]

lib/tests/test_working_copy.rs

@@ -15,13 +15,13 @@
 #[cfg(not(windows))]
 use std::os::unix::fs::PermissionsExt;
 
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::repo_path::{FileRepoPath, RepoPath};
-use jj_lib::settings::UserSettings;
-use jj_lib::store::TreeValue;
-use jj_lib::testutils;
-use jj_lib::tree_builder::TreeBuilder;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::repo_path::{FileRepoPath, RepoPath};
+use jujube_lib::settings::UserSettings;
+use jujube_lib::store::TreeValue;
+use jujube_lib::testutils;
+use jujube_lib::tree_builder::TreeBuilder;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::sync::Arc;

lib/tests/test_working_copy_concurrent.rs

@@ -14,12 +14,12 @@
 
 use std::thread;
 
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::repo::ReadonlyRepo;
-use jj_lib::repo_path::FileRepoPath;
-use jj_lib::store::CommitId;
-use jj_lib::testutils;
-use jj_lib::working_copy::CheckoutError;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::repo::ReadonlyRepo;
+use jujube_lib::repo_path::FileRepoPath;
+use jujube_lib::store::CommitId;
+use jujube_lib::testutils;
+use jujube_lib::working_copy::CheckoutError;
 use std::collections::HashSet;
 use std::sync::Arc;
 use test_case::test_case;

src/commands.rs

@@ -31,25 +31,25 @@ use criterion::Criterion;
 
 use pest::Parser;
 
-use jj_lib::commit::Commit;
-use jj_lib::commit_builder::CommitBuilder;
-use jj_lib::conflicts;
-use jj_lib::dag_walk::{common_ancestor, topo_order_reverse, walk_ancestors};
-use jj_lib::evolution::evolve;
-use jj_lib::evolution::EvolveListener;
-use jj_lib::files;
-use jj_lib::files::DiffLine;
-use jj_lib::git;
-use jj_lib::op_store::{OpStoreError, OperationId};
-use jj_lib::repo::{ReadonlyRepo, Repo};
-use jj_lib::repo_path::RepoPath;
-use jj_lib::rewrite::{back_out_commit, merge_commit_trees, rebase_commit};
-use jj_lib::settings::UserSettings;
-use jj_lib::store::{CommitId, Timestamp};
-use jj_lib::store::{StoreError, TreeValue};
-use jj_lib::tree::Tree;
-use jj_lib::trees::TreeValueDiff;
-use jj_lib::working_copy::{CheckoutStats, WorkingCopy};
+use jujube_lib::commit::Commit;
+use jujube_lib::commit_builder::CommitBuilder;
+use jujube_lib::conflicts;
+use jujube_lib::dag_walk::{common_ancestor, topo_order_reverse, walk_ancestors};
+use jujube_lib::evolution::evolve;
+use jujube_lib::evolution::EvolveListener;
+use jujube_lib::files;
+use jujube_lib::files::DiffLine;
+use jujube_lib::git;
+use jujube_lib::op_store::{OpStoreError, OperationId};
+use jujube_lib::repo::{ReadonlyRepo, Repo};
+use jujube_lib::repo_path::RepoPath;
+use jujube_lib::rewrite::{back_out_commit, merge_commit_trees, rebase_commit};
+use jujube_lib::settings::UserSettings;
+use jujube_lib::store::{CommitId, Timestamp};
+use jujube_lib::store::{StoreError, TreeValue};
+use jujube_lib::tree::Tree;
+use jujube_lib::trees::TreeValueDiff;
+use jujube_lib::working_copy::{CheckoutStats, WorkingCopy};
 
 use self::chrono::{FixedOffset, TimeZone, Utc};
 use crate::commands::CommandError::UserError;
@@ -59,11 +59,11 @@ use crate::styler::{ColorStyler, Styler};
 use crate::template_parser::TemplateParser;
 use crate::templater::Template;
 use crate::ui::Ui;
-use jj_lib::git::{GitFetchError, GitImportError, GitPushError};
-use jj_lib::index::{HexPrefix, PrefixResolution};
-use jj_lib::operation::Operation;
-use jj_lib::transaction::Transaction;
-use jj_lib::view::merge_views;
+use jujube_lib::git::{GitFetchError, GitImportError, GitPushError};
+use jujube_lib::index::{HexPrefix, PrefixResolution};
+use jujube_lib::operation::Operation;
+use jujube_lib::transaction::Transaction;
+use jujube_lib::view::merge_views;
 
 enum CommandError {
     UserError(String),

src/diff_edit.rs

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj_lib::repo_path::{DirRepoPath, RepoPath};
-use jj_lib::store::{StoreError, TreeId, TreeValue};
-use jj_lib::store_wrapper::StoreWrapper;
-use jj_lib::tree::Tree;
-use jj_lib::tree_builder::TreeBuilder;
-use jj_lib::trees::merge_trees;
-use jj_lib::working_copy::{CheckoutError, TreeState};
+use jujube_lib::repo_path::{DirRepoPath, RepoPath};
+use jujube_lib::store::{StoreError, TreeId, TreeValue};
+use jujube_lib::store_wrapper::StoreWrapper;
+use jujube_lib::tree::Tree;
+use jujube_lib::tree_builder::TreeBuilder;
+use jujube_lib::trees::merge_trees;
+use jujube_lib::working_copy::{CheckoutError, TreeState};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::sync::Arc;
@@ -57,7 +57,7 @@ fn add_to_tree(
         TreeValue::Conflict(conflict_id) => {
             let conflict = store.read_conflict(conflict_id)?;
             let materialized_value =
-                jj_lib::conflicts::conflict_to_materialized_value(store, repo_path, &conflict);
+                jujube_lib::conflicts::conflict_to_materialized_value(store, repo_path, &conflict);
             tree_builder.set(repo_path.clone(), materialized_value);
         }
         _ => {

src/main.rs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj::commands::dispatch;
-use jj::ui::Ui;
-use jj_lib::settings::UserSettings;
+use jujube::commands::dispatch;
+use jujube::ui::Ui;
+use jujube_lib::settings::UserSettings;
 
 fn main() {
     // TODO: We need to do some argument parsing here, at least for things like

src/styler.rs

@@ -15,7 +15,7 @@
 use std::collections::HashMap;
 use std::io::{Error, Read, Write};
 
-use jj_lib::settings::UserSettings;
+use jujube_lib::settings::UserSettings;
 
 // Lets the caller label strings and translates the labels to colors
 pub trait Styler: Write {

src/template_parser.rs

@@ -18,8 +18,8 @@ use pest::iterators::Pair;
 use pest::iterators::Pairs;
 use pest::Parser;
 
-use jj_lib::commit::Commit;
-use jj_lib::store::{CommitId, Signature};
+use jujube_lib::commit::Commit;
+use jujube_lib::store::{CommitId, Signature};
 
 use crate::styler::PlainTextStyler;
 use crate::templater::{
@@ -29,7 +29,7 @@ use crate::templater::{
     ObsoleteProperty, OpenProperty, OrphanProperty, PrunedProperty, StringPropertyTemplate,
     Template, TemplateFunction, TemplateProperty,
 };
-use jj_lib::repo::Repo;
+use jujube_lib::repo::Repo;
 
 #[derive(Parser)]
 #[grammar = "template.pest"]

src/templater.rs

@@ -15,9 +15,9 @@
 use std::borrow::BorrowMut;
 use std::ops::Add;
 
-use jj_lib::commit::Commit;
-use jj_lib::repo::Repo;
-use jj_lib::store::{CommitId, Signature};
+use jujube_lib::commit::Commit;
+use jujube_lib::repo::Repo;
+use jujube_lib::store::{CommitId, Signature};
 
 use crate::styler::Styler;
 

src/testutils.rs

@@ -15,7 +15,7 @@
 use std::io::Cursor;
 use std::path::{Path, PathBuf};
 
-use jj_lib::testutils::user_settings;
+use jujube_lib::testutils::user_settings;
 
 use crate::commands;
 use crate::ui::Ui;

src/ui.rs

@@ -18,12 +18,12 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::{Mutex, MutexGuard};
 
-use jj_lib::commit::Commit;
-use jj_lib::settings::UserSettings;
+use jujube_lib::commit::Commit;
+use jujube_lib::settings::UserSettings;
 
 use crate::styler::{ColorStyler, PlainTextStyler, Styler};
 use crate::templater::TemplateFormatter;
-use jj_lib::repo::Repo;
+use jujube_lib::repo::Repo;
 
 pub struct Ui<'a> {
     cwd: PathBuf,

tests/smoke_test.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj::testutils;
+use jujube::testutils;
 use regex::Regex;
 
 #[test]

tests/test_init_command.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use jj::testutils;
+use jujube::testutils;
 
 #[test]
 fn test_init_git_internal() {