History

Commits on ig/commit-debug6615+

git: on import_refs(), avoid loading git commit object if it's knownYuya Nishihara committed 3 years agod1701a5
cargo: bump itertools from 0.10.5 to 0.11.0dependabot[bot] committed 3 years agoe6ab3f1
cargo: bump insta from 1.29.0 to 1.30.0dependabot[bot] committed 3 years ago8aa8d84
backend: drop deprecated fields from `local_store.proto`Martin von Zweigbergk committed 3 years agoea2d5fd
backend: split up `store.proto` in git and local versionsMartin von Zweigbergk committed 3 years agoda5db27
cargo: upgrade pest and pest_derive to 2.7.0Martin von Zweigbergk committed 3 years agoc33062e
cargo: bump clap from 4.3.4 to 4.3.5dependabot[bot] committed 3 years ago083548e
conflicts: preserve diffs when simplfying a conflictMartin von Zweigbergk committed 3 years agodee5dff
conflicts: add test of higher-arity conflict simplificaton changing diffsMartin von Zweigbergk committed 3 years ago8f75a82
github: bump dtolnay/rust-toolchaindependabot[bot] committed 3 years agoe1b4fde
cargo: bump pest_derive from 2.6.0 to 2.6.1dependabot[bot] committed 3 years ago2bf65bd
docs: describe how to configure `scm-diff-editor`Martin von Zweigbergk committed 3 years agod858964
Fix `jj init --git-repo` fails and leaves broken .jj folderKevin Liao committed 3 years ago86b6a11
chore(nix): run 'nix flake update'Austin Seipp committed 3 years agod9f661e
README: rewrite sections about the working-copy commit and repo-first designMartin von Zweigbergk committed 3 years ago033b287
README: put `jj debug completion` (jj<=0.7.0) close to `jj debug` versionMartin von Zweigbergk committed 3 years agodc98a56
cargo: bump pest from 2.6.0 to 2.6.1dependabot[bot] committed 3 years ago8a8b96a
github: bump cachix/install-nix-action from 21 to 22dependabot[bot] committed 3 years agocb7d96d
repo: add submodule_store, default implGlen Choo committed 3 years ago6621f26
conflicts: add `resolve_trivial()` and test invariantsMartin von Zweigbergk committed 3 years ago038b64d
conflicts: resolve trivial merge of `A+A-B+C-C` to `A`Martin von Zweigbergk committed 3 years ago3f95daf
conflicts: move `describe_conflict()` etc. onto `Conflict`Martin von Zweigbergk committed 3 years ago82883e6
conflicts: remove unused `Conflict::set_{add,remove}()`Martin von Zweigbergk committed 3 years ago7a8caba
cargo: bump serde_json from 1.0.96 to 1.0.97dependabot[bot] committed 3 years agod67f41e
index: turn CompositeIndex::walk_revs() into position-based APIYuya Nishihara committed 3 years agoa67d8b5
git: return early from import_refs() if no commits to abandonYuya Nishihara committed 3 years ago8b0c01d
git: unify loop that consumes stale/excluded git refsYuya Nishihara committed 3 years ago5fda093
git: rename new_git_heads to pinned_git_heads as it isn't always "new"Yuya Nishihara committed 3 years agoaa2359f
git: remove uninteresting old refs from list of heads to abandonYuya Nishihara committed 3 years agoc8eb1a3
git: on import_refs(), don't clobber view's heads with known HEAD@gitYuya Nishihara committed 3 years agocf2c142
cargo: bump clap from 4.3.3 to 4.3.4dependabot[bot] committed 3 years ago5e3913b
tree: reuse caller-provided path in known_sub_tree(), mark it as privateYuya Nishihara committed 3 years ago55f93bf
tree: rewrite sub_tree_recursive() to not use known_sub_tree()Yuya Nishihara committed 3 years agodb7facb
repo_path: micro-optimize .join() to not reallocate cloned VecYuya Nishihara committed 3 years ago589917a
docs: note how our `heads()` and `roots()` revsets differ from hg'sMartin von Zweigbergk committed 3 years agob01d6cd