Commit graph

  • f4a41f3880 trees: make tree diff return an iterator instead of taking a callback Martin von Zweigbergk 2021-04-07 11:27:40 -0700
  • 8b2ce18254 trees: make diff_entries() return an iterator instead of taking a callback Martin von Zweigbergk 2021-04-07 14:28:50 -0700
  • 5c10c93e64 diff: fix tests broken by the previous commit Martin von Zweigbergk 2021-04-07 10:38:40 -0700
  • 0dd000d236 diff: do final refinement at byte-level for non-word bytes Martin von Zweigbergk 2021-04-07 10:07:37 -0700
  • f634ff0e3f files: make diff() return an iterator instead of using a callback Martin von Zweigbergk 2021-04-06 23:33:38 -0700
  • f22514f7bb cli: terminate gracefully on broken pipe while drawing graph Martin von Zweigbergk 2021-04-06 22:53:04 -0700
  • 659393bec2 graphlog: propagate error from failure to write output Martin von Zweigbergk 2021-04-06 22:27:34 -0700
  • e1ccdcffb7 cli: don't lose short runs of context lines in diffs Martin von Zweigbergk 2021-04-07 08:50:24 -0700
  • d7395cc34a diff: add copyright header Martin von Zweigbergk 2021-04-04 22:56:10 -0700
  • f4722fa91b unsquash: add new unsquash command for moving changes from parent to child Martin von Zweigbergk 2021-04-04 22:19:15 -0700
  • 8502aaffd1 squash: add --interactive for moving only part a commit into its parent Martin von Zweigbergk 2021-04-04 21:32:08 -0700
  • 7e4e43f358 diff: first diff lines, then refine to words, producing better diffs Martin von Zweigbergk 2021-04-03 15:37:55 -0700
  • cc4b1e9230 test: fix merge tests to expect line-based merging Martin von Zweigbergk 2021-04-01 08:15:38 -0700
  • c071d412af diff: use new diff algorithm for content diff Martin von Zweigbergk 2021-03-26 09:52:05 -0700
  • 3c35dbace6 merge: use new diff algorithm for finding sync regions Martin von Zweigbergk 2021-03-26 08:44:18 -0700
  • 1e657c5331 diff: add a histogram(-like?) diff algorithm Martin von Zweigbergk 2021-03-20 14:44:00 -0700
  • ec68842a59 diff: also show diff of executable files if executableness unchanged Martin von Zweigbergk 2021-03-31 22:09:25 -0700
  • 69659ec490 cargo: update lexical-core to 0.7.5 Martin von Zweigbergk 2021-03-31 16:36:36 -0700
  • c03be2e035 commands: make skip_uninteresting_heads() work on CommitIds Martin von Zweigbergk 2021-03-31 14:07:53 -0700
  • 998e23db3c index: add IndexEntry::parents() and predecessors() returning Vec<IndexEntry> Martin von Zweigbergk 2021-03-31 14:07:53 -0700
  • 7e012ad84f log: use index for walking revisions Martin von Zweigbergk 2021-02-07 23:45:14 -0800
  • 4c5dd740fd templater: remove an unnecessary trait bound Martin von Zweigbergk 2021-03-29 15:56:01 -0700
  • 72195f3261 prune: default argument to "@", fixing regression Martin von Zweigbergk 2021-03-25 23:47:12 -0700
  • 1941801055 github: add Clippy check to CI Martin von Zweigbergk 2021-03-23 10:30:05 -0700
  • 53d1757994 dag_walk: remove unused TopoIter Martin von Zweigbergk 2021-03-18 16:29:43 -0700
  • db4e8bc458 cargo: upgrade to protobuf 2.22.1 to avoid workaround for rustfmt::skip Martin von Zweigbergk 2021-03-18 13:04:30 -0700
  • 07c2b2316f repo: remove obsolete part of a TODO (we use the index to filter out non-heads) Martin von Zweigbergk 2021-03-16 23:55:20 -0700
  • 30cd94f842 dag_walk: rename unreachable() to heads() to match name we use in index module Martin von Zweigbergk 2021-03-16 23:39:22 -0700
  • 5aec8b9d77 evolution: use index for filtering out ancestors of candidates in new_parent() Martin von Zweigbergk 2021-03-16 22:51:05 -0700
  • 985e5b030f prune: make revision argument a positional argument (no -r) Martin von Zweigbergk 2021-03-16 22:46:42 -0700
  • 8980f1acbe split: add missing newline in output Martin von Zweigbergk 2021-03-16 22:45:58 -0700
  • 73f20c8696 transaction: delete write_commit() and as_repo_ref() helpers Martin von Zweigbergk 2021-03-16 22:27:12 -0700
  • f9873c49ec transaction: remove add_head(), remove_head(), and set_view() helpers Martin von Zweigbergk 2021-03-16 22:23:23 -0700
  • 06df609482 transaction: delete check_out() and set_checkout() helpers Martin von Zweigbergk 2021-03-16 22:20:42 -0700
  • 808d0af66d transaction: remove evolution() and store() helpers Martin von Zweigbergk 2021-03-16 16:32:51 -0700
  • 16d97ef8c0 transaction: remove index() and view() helpers Martin von Zweigbergk 2021-03-16 16:21:31 -0700
  • 5ed14185a0 git: take a MutableRepo instead of a Transaction Martin von Zweigbergk 2021-03-16 16:08:40 -0700
  • 769f88bbae tests: rename test_transaction to test_mut_repo Martin von Zweigbergk 2021-03-16 15:57:47 -0700
  • 2c2b5fb3b7 evolution: take a MutableRepo instead of a Transaction Martin von Zweigbergk 2021-03-16 15:40:57 -0700
  • c3b9d1cd13 rewrite: take a MutableRepo instead of a Transaction Martin von Zweigbergk 2021-03-16 15:47:16 -0700
  • ddee2e04b1 commands: use MutableRepo directly more, starting with update_checkout_after_rewrite() Martin von Zweigbergk 2021-03-16 15:22:49 -0700
  • ee8423a69e MutableRepo: rename repo to base_repo to clarify its role Martin von Zweigbergk 2021-03-16 11:36:21 -0700
  • 69de4698ac tests: set $HOME in a few tests to avoid depending in developer's ~/.gitignore Martin von Zweigbergk 2021-03-16 17:09:33 -0700
  • 67e11e0fc3 git_store: wait 1 minute for lock on refs to help tests Martin von Zweigbergk 2021-03-15 17:09:29 -0700
  • 81a0e0bd2a protobuf: upgrade to version 2.22.0 Martin von Zweigbergk 2021-03-14 20:43:02 -0700
  • 1ebdd4ecf0 MutableRepo: use index when enforcing view invariants Martin von Zweigbergk 2021-03-14 13:39:45 -0700
  • 3ecb4ec16b MutableRepo: in fast-path for adding head, simply remove parent heads Martin von Zweigbergk 2021-03-15 15:26:09 -0700
  • 2c92fca75a MutableView: don't require whole Commit when CommitId is enough Martin von Zweigbergk 2021-03-15 15:29:34 -0700
  • b4b1de3ddc view: let MutableRepo enforce view invariants Martin von Zweigbergk 2021-03-14 11:08:31 -0700
  • b9fe944e76 view: remove unnecessary removing of parents in add_head() Martin von Zweigbergk 2021-03-14 11:08:31 -0700
  • 12a47bd6ed MutableRepo: don't calculate evolution state only to update it Martin von Zweigbergk 2021-03-15 14:42:07 -0700
  • f0619c07ac MutableEvolution: make MutableRepo responsible for lazy calculation Martin von Zweigbergk 2021-03-15 04:15:35 -0700
  • 61acee52f4 ReadonlyEvolution: make ReadonlyRepo responsible for lazy calculation Martin von Zweigbergk 2021-03-14 23:04:04 -0700
  • 43315bc9d2 git: fix bad formatting from commit 1e9d428406 Martin von Zweigbergk 2021-03-14 22:27:17 -0700
  • 91117f36b6 cargo: work around warning in generated protobuf code with new nightly rustc Martin von Zweigbergk 2021-03-14 22:04:38 -0700
  • 1e9d428406 git: skip tags pointing to GPG keys and similar when importing refs Martin von Zweigbergk 2021-03-14 13:39:45 -0700
  • 429a1ad7ab git: set authentication callback on fetch as well Martin von Zweigbergk 2021-03-14 17:11:54 -0700
  • 6a2bb466ac
    Merge pull request #6 from quark-zju/windows Martin von Zweigbergk 2021-03-14 17:09:22 -0700
  • 0fb59a5155 github: setup CI Jun Wu 2021-03-10 23:02:24 -0800
  • d1d502c062 tests: disable tests failing on Windows Jun Wu 2021-03-10 23:08:22 -0800
  • 935da3e13f lock: treat PermissionDenied on Windows as transient error Jun Wu 2021-03-10 22:59:52 -0800
  • 2f93ebd42c commands: do not use debug print for path Jun Wu 2021-03-10 22:35:16 -0800
  • eacab648b0 working_copy: clean up ".git" automatically Jun Wu 2021-03-10 22:28:39 -0800
  • 4cd29a2130 working_copy: avoid std::os::unix on Windows Jun Wu 2021-03-10 22:13:52 -0800
  • 5631e85502 view: don't enforce invariants in merge_views() Martin von Zweigbergk 2021-03-14 10:58:20 -0700
  • 8048d9641e commands: rewrite jj op undo using new MutableRepo::merge() Martin von Zweigbergk 2021-03-14 10:54:34 -0700
  • a7f4f4cf5b rustfmt: configure to merge imports by module Martin von Zweigbergk 2021-03-14 10:46:35 -0700
  • 4b8484e561 rustfmt: configure to group imports Martin von Zweigbergk 2021-03-14 10:37:28 -0700
  • ac9fb1832d OpHeadsStore: move logic for merging repos to MutableRepo Martin von Zweigbergk 2021-03-13 09:12:05 -0800
  • e9ddfdd8bc Repo: repurpose ReadonlyRepo::loader() to return loader for existing repo Martin von Zweigbergk 2021-03-13 09:12:05 -0800
  • 82c683bf63 Transaction: rename as_repo_mut() to mut_repo() Martin von Zweigbergk 2021-03-13 23:31:00 -0800
  • 7ea0c6a868 View: move op_id/base_op_id to Repo Martin von Zweigbergk 2021-03-13 21:38:37 -0800
  • c1de8b0f3a View: move creation of Operation to Transaction Martin von Zweigbergk 2021-03-13 21:23:30 -0800
  • cf2baf58a7 OpHeadsStore: simplify by returning Operation from get_single_op_head() Martin von Zweigbergk 2021-03-13 16:40:06 -0800
  • f6488e2e9f OpHeadsStore: check for fast-forward merge before calling merge_op_heads() Martin von Zweigbergk 2021-03-13 16:33:31 -0800
  • 9452d17b75 OpHeadsStore: pass around RepoLoader instead of various stores Martin von Zweigbergk 2021-03-11 22:12:49 -0800
  • eac0c9f579 OpHeadsStore: when merging ops, also remove ancestor op from disk early Martin von Zweigbergk 2021-03-11 23:30:06 -0800
  • d4c39d399f OpHeadsStore: read operation objects before calling merge_op_heads() Martin von Zweigbergk 2021-03-11 23:07:47 -0800
  • 27293829d6 Transaction: allow writing a transaction to the OpStore without publishing it Martin von Zweigbergk 2021-03-12 15:46:06 -0800
  • 337b15c98d cleanup: replace #[cfg(not(windows))] by $[cfg(unix)] Martin von Zweigbergk 2021-03-11 17:36:55 -0800
  • f79874d612 view: let repo get current operation from OpHeadsStore and pass in Martin von Zweigbergk 2021-03-11 21:45:04 -0800
  • 82a3ff6ef8 repo: make OpHeadsStore accessible directly on ReadonlyRepo Martin von Zweigbergk 2021-03-10 23:14:00 -0800
  • 212dd35d01 view: let repo create OpHeadsStore and pass in to view Martin von Zweigbergk 2021-03-10 22:59:11 -0800
  • ec07104126 view: move creation of initial operation to OpHeadsStore Martin von Zweigbergk 2021-03-10 22:45:56 -0800
  • 2590e127f7 view: move get_single_op_head() onto OpHeadsStore Martin von Zweigbergk 2021-03-10 21:36:08 -0800
  • b4d4cd143a view: move locking of .jj/view/op_heads/ to OpHeadsStore Martin von Zweigbergk 2021-03-10 21:24:54 -0800
  • 4bd121dab5 view: split out separate type for keeping track of op heads Martin von Zweigbergk 2021-03-10 15:39:16 -0800
  • 2955bc4a29 repo: let repo types directly have an OpStore Martin von Zweigbergk 2021-03-10 15:48:32 -0800
  • 48d7903925 repo: simplify and clarify name of base_op_head_id() functions Martin von Zweigbergk 2021-03-10 15:22:04 -0800
  • 9ee521d9d3 transaction: fix (mostly harmless) race where index can get re-calculated Martin von Zweigbergk 2021-03-10 15:07:59 -0800
  • 47a7cf7101 view: extract function for updating operation heads Martin von Zweigbergk 2021-03-10 14:43:40 -0800
  • fc73ef8d6e view: delete an incorrect comment about a race Martin von Zweigbergk 2021-03-10 14:19:19 -0800
  • a715fd0ae7 view: drop stale comment about resolving concurrent operations Martin von Zweigbergk 2021-03-08 23:13:56 -0800
  • e6aa2402a6 view: drop redundant filtering of ancestors of public heads Martin von Zweigbergk 2021-03-08 23:10:18 -0800
  • f755c3f740 cleanup: access integer types' MAX constants directly on the type Martin von Zweigbergk 2021-03-08 23:07:19 -0800
  • 02e6420606 repo: inline MutableRepo's {view,index,evolution}_mut() methods Martin von Zweigbergk 2021-03-07 23:49:52 -0800
  • 9f7854f02c repo: stop wrapping view and index in Option in MutableRepo Martin von Zweigbergk 2021-03-08 00:04:26 -0800
  • ef16d102e2 transaction: move most functionality to MutableRepo Martin von Zweigbergk 2021-03-07 15:11:34 -0800
  • 1e623bd019 index: update in memory and on disk while resolving operation conflicts Martin von Zweigbergk 2021-03-06 10:37:57 -0800
  • 779db67f8f index_store: avoid passing whole repo into get_index_at_op() Martin von Zweigbergk 2021-03-06 10:37:57 -0800