Commit graph

  • d1509ffdd4 index: extract a function for adding all commits from a segment Martin von Zweigbergk 2021-03-06 10:37:57 -0800
  • 3fc35288c0 index: remove dir field from ReadonlyIndex and MutableIndex Martin von Zweigbergk 2021-03-02 23:03:49 -0800
  • 502ba895f5 index: move ReadonlyFile::associate_with_operation() to IndexStore Martin von Zweigbergk 2021-03-02 22:53:20 -0800
  • c4fe7aab10 index: move ReadonlyRepo::load_at_operation() to IndexStore Martin von Zweigbergk 2021-03-02 22:48:08 -0800
  • 12bfbc489c index: move ReadonlyIndex::index() to IndexStore Martin von Zweigbergk 2021-03-02 22:39:38 -0800
  • 2fdf9721c0 index: move load() to IndexStore Martin von Zweigbergk 2021-03-02 22:27:14 -0800
  • 403e86c138 index: introduce IndexStore, which owns ReadonlyIndex files Martin von Zweigbergk 2021-03-02 21:43:13 -0800
  • 0a4ef1030f repo: add support for loading at given operation without loading head op first Martin von Zweigbergk 2021-01-04 09:40:46 -0800
  • df53871daf repo: extract a type for loading the repo in two stages Martin von Zweigbergk 2021-01-04 09:40:46 -0800
  • 5a32118af1 repo: move creation of OpStore out of View Martin von Zweigbergk 2021-02-26 23:37:42 -0800
  • e2e9fe8f0d index: add stats for number of change ids and pruned commits Martin von Zweigbergk 2021-03-02 23:39:10 -0800
  • bc64cf02c7 index: don't use an all-0 change id in tests Martin von Zweigbergk 2021-03-02 23:39:10 -0800
  • 031a39ecba cleanup: fix lots of issues found in the lib crate by clippy Martin von Zweigbergk 2021-02-26 23:00:46 -0800
  • 48b800e5c4 cleanup: fix a few things reported by upgraded rustc and clippy Martin von Zweigbergk 2021-02-26 22:45:28 -0800
  • d961f61623 evolution: calculate state using index Martin von Zweigbergk 2021-02-24 23:01:37 -0800
  • 190899fe76 index: make rev_walk() iterate over IndexEntry instead of CommitId Martin von Zweigbergk 2021-02-24 23:01:37 -0800
  • 8be84c345b index: also index change id Martin von Zweigbergk 2021-02-24 22:26:08 -0800
  • 3a53a187ff index: add flag indicating pruned commit Martin von Zweigbergk 2021-02-24 21:31:20 -0800
  • d80903ce48 index: also index predecessors Martin von Zweigbergk 2021-02-24 15:33:51 -0800
  • afc59a210a index: make tests more focused, and add tests of octopus merge Martin von Zweigbergk 2021-02-25 16:26:07 -0800
  • ab57584281 cli: allow -R and --at-op anywhere in command line Martin von Zweigbergk 2021-02-25 23:34:00 -0800
  • 2a531832d6 rewrite: make merge_commit_trees() use index for finding common ancestors Martin von Zweigbergk 2021-02-21 18:09:54 -0800
  • bb94516175 index: add support for finding common ancestors Martin von Zweigbergk 2021-02-16 00:02:36 -0800
  • 422d333d4b index: make heads() return result in index order instead of hash order Martin von Zweigbergk 2021-02-23 17:19:28 -0800
  • 1481935472 index: extract a function for removing ancestors of set based on positions Martin von Zweigbergk 2021-02-19 19:10:54 -0800
  • def1a2de95 bench: also print time of first iteration, to show effect of caching Martin von Zweigbergk 2021-02-19 11:08:30 -0800
  • 5aadbcf6fc evolve: pass Transaction to listener functions, so they see the updated state Martin von Zweigbergk 2021-02-21 21:47:38 -0800
  • 62ce5782b5 index: when writing incremental index, squash into parent file if smaller Martin von Zweigbergk 2021-02-16 11:50:28 -0800
  • a51543b752 index: make first level in stats be the root index Martin von Zweigbergk 2021-02-15 11:04:06 -0800
  • b122f33312 index: don't write empty incremental index file Martin von Zweigbergk 2021-02-15 10:41:10 -0800
  • a7b6bcfd79 transaction: write incremental index on commit Martin von Zweigbergk 2021-02-07 17:59:30 -0800
  • 86915f0a6f index: fix check for adding existing commit to index Martin von Zweigbergk 2021-02-14 18:53:52 -0800
  • 37cf6a8395 transaction: don't walk to root when adding on top of non-head Martin von Zweigbergk 2021-02-14 18:53:52 -0800
  • 0f56e014b7 tests: some fixups to test_transaction as a result of reordering commits Martin von Zweigbergk 2021-02-15 08:47:51 -0800
  • 3c832cbbbe index: let index structs keep track of the index directory Martin von Zweigbergk 2021-02-07 18:24:16 -0800
  • b77740e58a index: move function for saving MutableIndex onto the struct Martin von Zweigbergk 2021-02-07 17:33:54 -0800
  • 713d32d803 index: keep up to date within transaction Martin von Zweigbergk 2021-01-30 18:50:27 -0800
  • e19a65cf14 transaction: make add_head() use incremental update of evolution in common case Martin von Zweigbergk 2021-02-14 00:11:04 -0800
  • f05a12d301 index: make CompositeIndex non-public and add new IndexRef enum instead Martin von Zweigbergk 2021-02-06 00:40:34 -0800
  • face4d637f index: define methods from CompositeIndex directly on {Readonly,Mutable}Index Martin von Zweigbergk 2021-02-06 00:10:27 -0800
  • 8dda4b05e4 index: add "segment_" prefix to methods in IndexSegment Martin von Zweigbergk 2021-01-30 00:45:43 -0800
  • 3066381d57 transaction: add accessors for view and evolution directly on transaction Martin von Zweigbergk 2021-02-13 13:30:45 -0800
  • 72aebc9da3 view: replace View trait by enum with Readonly and Mutable variants Martin von Zweigbergk 2021-01-31 23:41:59 -0800
  • d1e5f46969 evolution: replace Evolution trait by enum with Readonly and Mutable variants Martin von Zweigbergk 2021-01-31 18:13:37 -0800
  • f1666375bd repo: replace Repo trait by enum with readonly and mutable variants Martin von Zweigbergk 2021-01-30 23:44:31 -0800
  • a1983ebe96 git: add a ref to each commit we create Martin von Zweigbergk 2021-02-07 23:45:14 -0800
  • dd98f0564e git: remove git note pointing to conflicts Martin von Zweigbergk 2021-02-07 23:45:14 -0800
  • fa30cf768f index: rename UnsavedIndexData to MutableIndex Martin von Zweigbergk 2021-01-29 23:01:01 -0800
  • 8170c06573 index: rename IndexFile to ReadonlyIndex Martin von Zweigbergk 2020-12-18 08:32:15 -0800
  • 51373b75ff index: use correct per-level file name in stats (previously always top-level) Martin von Zweigbergk 2020-12-18 16:26:37 -0800
  • 302c66825f working_copy: preserve executable bit on Windows Martin von Zweigbergk 2021-01-04 11:18:16 -0800
  • d4aed83aa6 working_copy: correct comment about stat accuracy Martin von Zweigbergk 2021-01-04 11:18:16 -0800
  • 3d679de022 working_copy: print warning about ignored symlinks instead of failing build Martin von Zweigbergk 2021-02-07 00:44:03 -0800
  • e0112a4be0 transaction: report failure to close transaction only in debug builds Martin von Zweigbergk 2021-02-06 23:33:15 -0800
  • 4ecbd89378 repo: move MutableRepo from transaction module to repo module Martin von Zweigbergk 2021-01-31 18:00:14 -0800
  • 2d03b514fc transaction: move construction of MutableRepo out of Transaction::new() Martin von Zweigbergk 2021-01-31 18:07:37 -0800
  • bf53c6c506 transaction: add factory function to MutableRepo Martin von Zweigbergk 2021-01-31 17:12:40 -0800
  • 5604303954 transaction: avoid direct access to members of MutableRepo Martin von Zweigbergk 2021-01-31 10:03:47 -0800
  • a28fe7b388 transaction: slightly simplify write_commit() by using store() Martin von Zweigbergk 2021-01-30 18:38:46 -0800
  • 49d386931d tests: fix smoke test broken by bad23cda74 Martin von Zweigbergk 2021-01-24 23:00:16 -0800
  • bea399640b commands: don't leave color on after printing error Martin von Zweigbergk 2021-01-23 23:49:14 -0800
  • 37a2fbce65 commands: add -m to jj merge and jj close Martin von Zweigbergk 2021-01-23 23:32:27 -0800
  • c459c61cdb merge: ask user for commit description Martin von Zweigbergk 2021-01-23 22:08:13 -0800
  • bad23cda74 describe: rename --text argument to more standard --message Martin von Zweigbergk 2021-01-23 22:08:13 -0800
  • 9ffd35caf8 transaction: when checking out open commit with conflicts, create child commit Martin von Zweigbergk 2021-01-21 22:11:03 -0800
  • bb730d8a2b merge: rewrite code for 3-way merge of files to handle not just trivial cases Martin von Zweigbergk 2021-01-18 22:00:40 -0800
  • 7957feca49 diff: make tokenization return slices instead of making copies Martin von Zweigbergk 2021-01-18 00:53:44 -0800
  • 2879d817dd readme: some further touch-up, plus a correction about in-tree conflicts Martin von Zweigbergk 2021-01-19 23:55:33 -0800
  • 30939ca686 view: return &HashSet instead of Iterator Martin von Zweigbergk 2021-01-16 12:15:06 -0800
  • 79eecb6119 git: mark imported remote-tracking branches as public Martin von Zweigbergk 2021-01-16 11:48:35 -0800
  • 4db3d8d3a6 view: add tracking of "public" heads (copying Mercurial's phase concept) Martin von Zweigbergk 2021-01-16 10:42:22 -0800
  • 265f90185e tests: simplify transaction tests slightly by using testutils more Martin von Zweigbergk 2021-01-16 10:42:22 -0800
  • f43880381f view: make sure we don't leave a dangling git ref Martin von Zweigbergk 2021-01-15 16:27:16 -0800
  • 1f593a4193 view: create helper for enforcing view's invariants Martin von Zweigbergk 2021-01-15 16:23:33 -0800
  • 1f27a78957 view: make remove_head() not add parents as heads Martin von Zweigbergk 2021-01-14 23:54:11 -0800
  • 315818260f git: slightly simplify a few tests Martin von Zweigbergk 2021-01-11 00:26:03 -0800
  • f4a6732d35 git: import refs after pushing to git remote Martin von Zweigbergk 2021-01-10 23:23:40 -0800
  • 19b542b318 git: simplify error handling by passing git repo into git module functions Martin von Zweigbergk 2021-01-10 20:13:52 -0800
  • b1588afc63 log: include git refs in default templates Martin von Zweigbergk 2021-01-03 00:26:57 -0800
  • da0bbbe637 view: start tracking git refs Martin von Zweigbergk 2021-01-03 00:26:57 -0800
  • 3df6a92df6 view: merge concurrent operations ordered by transaction commit time Martin von Zweigbergk 2021-01-10 01:17:59 -0800
  • c4cd12e93e view: use the Operation wrapper type in merge_op_heads() Martin von Zweigbergk 2021-01-10 00:07:43 -0800
  • 48e664c716 view: make the View types not store concrete OpStore type Martin von Zweigbergk 2021-01-10 00:07:43 -0800
  • 1f53285f64 log: output heads in graph ordered by commit id instead of by hash Martin von Zweigbergk 2021-01-10 19:21:33 -0800
  • 7572a32077 readme: some very minor improvements Martin von Zweigbergk 2021-01-05 22:29:38 -0800
  • a3de39a35a repo: inline init_cycles() now that it's very short Martin von Zweigbergk 2021-01-04 11:13:51 -0800
  • 7494a03081 repo: return error when attempting to load repo where there is none Martin von Zweigbergk 2021-01-03 23:11:22 -0800
  • 86b2c6b464 restore: restore all files by default Martin von Zweigbergk 2021-01-03 10:37:47 -0800
  • 0137acd0a8 cargo: release 0.1.1 Martin von Zweigbergk 2021-01-03 22:55:16 -0800
  • 3e048cd121 commands: change "about" line to match the parenthesis in Cargo.toml Martin von Zweigbergk 2021-01-03 22:53:25 -0800
  • 762a367174 commands: set application version based on Cargo.toml Martin von Zweigbergk 2021-01-03 22:50:39 -0800
  • 19adac7c50 cargo: set binary name to jj, not new crate name jujube Martin von Zweigbergk 2021-01-03 10:37:47 -0800
  • b40a40990b cargo: add version to jujube-lib dependency Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • bb4b028b2b cargo: fill in crates.io metadata Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • abc9dc1733 cargo: rename crates to names available on crates.io Martin von Zweigbergk 2021-01-03 08:45:07 -0800
  • f88e8b6086 evolve: update working copy at end (if applicable) Martin von Zweigbergk 2021-01-02 20:15:21 -0800
  • ba4d2c8a24 commands: respect $EDITOR from environment Martin von Zweigbergk 2021-01-02 19:38:41 -0800
  • d7b9bd55e8 git: remove unnecessary taking of reference (reported by clippy) Martin von Zweigbergk 2021-01-02 19:27:51 -0800
  • e2d6252766 git: on push, check that remote branch was actually updated Martin von Zweigbergk 2021-01-02 10:08:23 -0800
  • 7542c484a8 git: pass ssh credentials from ssh-agent on push Martin von Zweigbergk 2021-01-02 00:24:10 -0800