ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Commit graph

  • 1be955ea4e diff: simplify conditions whether to emit color-words context lines Yuya Nishihara 2024-08-16 00:18:31 +0900
  • 9beb57018a diff: split color-words diffing to line-based and refinement stages Yuya Nishihara 2024-08-15 23:49:30 +0900
  • 59745fb67f files: allow DiffLineIterator users to specify and retrieve line numbers Yuya Nishihara 2024-08-15 13:11:29 +0900
  • 2be8e596e2 diff: extract Diff::by_word() function Yuya Nishihara 2024-08-16 16:02:36 +0900
  • 8a4441ebd0 Deployed f258664 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-17 15:28:17 +0000
  • f258664a2f rewrite: move_commits: do not remove parents of target commits which are outside the target set Benjamin Tan 2024-04-30 03:18:03 +0800
  • e5493e0fc0 rebase: modify tests to include commit's parent branch in log output Benjamin Tan 2024-08-17 16:03:00 +0800
  • 749a284354 working_copy: delete path() method from trait Martin von Zweigbergk 2024-08-16 11:51:13 -0700
  • 237b41e738 next/prev: refactor movement utilities into cli/src/movement_utils.rs Essien Ita Essien 2024-08-15 16:51:27 +0100
  • 7f91da2088 github: add action to check dotslash files aseipp/push-vzypxsolopto Austin Seipp 2024-08-16 16:03:13 -0500
  • 0b8ef2bfa0 tools: initialize useful dotslash tools Austin Seipp 2023-08-06 17:03:24 -0500
  • c6335ca655 next/prev: Add jj log output to more prev_next tests. Essien Ita Essien 2024-08-14 13:55:55 +0100
  • 0bbad88ac0 editor: initialize .vscode settings directory aseipp/push-xsvrkxwlmmzq Austin Seipp 2023-08-06 17:03:24 -0500
  • 5eab5c8d75 github: build on macos-13 for x86_64 Austin Seipp 2024-08-08 19:27:13 -0500
  • 62095894d3 cargo: bump the cargo-dependencies group across 1 directory with 4 updates dependabot[bot] 2024-08-16 15:13:42 +0000
  • be35ab164c tests: restore snapshots of line/word-oriented diff hunks Yuya Nishihara 2024-08-16 09:38:44 +0900
  • 2f2e5fb72a copy-tracking: implement copy tracking for external tools Matt Kulukundis 2024-08-15 11:22:34 -0400
  • 7baf6675e7 github: bump github/codeql-action in the github-dependencies group dependabot[bot] 2024-08-15 15:13:56 +0000
  • 7e5bdd5fe8
         Fix macOS x86_64 release builds fix-macos-x86_64-release Cretezy 2024-08-15 22:42:48 -0400
  • 4e763a3c25 Deployed 085e17e to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-16 00:31:05 +0000
  • 085e17e1cc files: micro-optimzie DiffLine::reset_line() to not clone hunks Yuya Nishihara 2024-08-14 23:59:27 +0900
  • a973c7b0ea files: replace precomputed has_left/right_content flags with functions Yuya Nishihara 2024-08-14 23:52:02 +0900
  • cca5277184 diff: clarify that DiffLine hunk doesn't have [left, right] diff pair Yuya Nishihara 2024-08-14 22:32:27 +0900
  • ac27365290 files: ensure that DiffLineIterator hunk has exactly two inputs Yuya Nishihara 2024-08-15 12:35:59 +0900
  • 95e8dd51eb copy-tracking: add support for diff --git Matt Kulukundis 2024-08-14 10:20:17 -0400
  • 5694f235dd github: bump github/codeql-action in the github-dependencies group dependabot[bot] 2024-08-14 15:44:37 +0000
  • 78c0128ec3 files: make DiffLineIterator accept generic DiffLine iterator Yuya Nishihara 2024-08-14 14:20:19 +0900
  • f85792288f files: replace Vec + index access with iterator in DiffLineIterator Yuya Nishihara 2024-08-14 14:12:56 +0900
  • 54f5c01eae files: use imported DiffHunk type in DiffLineIterator Yuya Nishihara 2024-08-14 14:05:30 +0900
  • a62c8776e8 diff: move empty content optimization from diff() to Diff::for_tokenizer() Yuya Nishihara 2024-08-14 15:01:56 +0900
  • 73e4daf5ce tests: add more empty content diff samples Yuya Nishihara 2024-08-14 15:01:56 +0900
  • 8b222e4038 cli: propagate BackendError from tree diffs Yuya Nishihara 2024-08-15 10:29:13 +0900
  • ab604b4ecd rewrite::move_commits(): preserve order of parent commits Benjamin Tan 2024-08-14 19:24:30 +0800
  • 4a17b9fbe4 rebase: modify tests to avoid printing commit and change IDs Benjamin Tan 2024-08-14 19:24:29 +0800
  • 9bd9c780be Deployed 0b179dc to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-15 00:49:18 +0000
  • 0b179dcbde copy-tracking: implement copy-tracking for --types Matt Kulukundis 2024-08-14 09:30:31 -0400
  • eccc3e235d copy-tracking: diff --name-only is a no-op Matt Kulukundis 2024-08-14 09:55:36 -0400
  • 49577f7f75 cargo: bump indexmap from 2.3.0 to 2.4.0 in the cargo-dependencies group dependabot[bot] 2024-08-14 15:43:05 +0000
  • 41e99ccdbf diff_util: add copy records tracking to DiffRenderer::show_patch Benjamin Tan 2024-08-14 16:54:49 +0800
  • f983021814 cli: add basic tests for show command Benjamin Tan 2024-08-14 16:54:49 +0800
  • b67b774ba7 fix: small clippy warning Matt Kulukundis 2024-08-14 09:30:31 -0400
  • 86c3d93301 Deployed a6d8009 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-14 10:32:46 +0000
  • a6d8009097 Define builtin_immutable_heads() as a default revset alias. Essien Ita Essien 2024-08-01 20:17:16 +0100
  • b2114eaae8 Deployed ec99a17 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-14 01:38:47 +0000
  • ec99a17ae8 copy-tracking: improve --summary and add --stat Matt Kulukundis 2024-08-08 20:00:50 -0400
  • f5a25d7805 cargo: bump the cargo-dependencies group with 2 updates dependabot[bot] 2024-08-13 15:13:35 +0000
  • ded971a2c2 Deployed e803bed to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-13 15:07:19 +0000
  • e803bed845 config: expand tilde in ssh key filepaths Aaron Bull Schaefer 2024-08-12 09:39:35 -0700
  • a609580204 revset: avoid merging whole parent trees by file()/diff_contains() query Yuya Nishihara 2024-08-09 19:44:42 +0900
  • 13f0a2f008 revset: inline materialized_diff_stream() in diff_contains() evaluation function Yuya Nishihara 2024-08-12 13:06:21 +0900
  • c651930e9a revset: pass valid file paths to diff_contains() error Yuya Nishihara 2024-08-12 13:07:26 +0900
  • 145f942d99 merged_tree: add function that resolves file conflicts non-recursively Yuya Nishihara 2024-08-12 12:51:41 +0900
  • a6566832c2 merged_tree: extract file-conflict resolution from merge_tree_values() Yuya Nishihara 2024-08-12 12:42:02 +0900
  • f6ec1b9263 Deployed 38f6ee8 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-13 03:47:51 +0000
  • 38f6ee8918 cargo: bump git2 to 0.19.0 Benjamin Tan 2024-07-13 20:29:13 +0800
  • 2c9311bccf cargo: bump the cargo-dependencies group with 5 updates dependabot[bot] 2024-08-12 15:23:45 +0000
  • f7377fbbcd merged_tree: replace MergedTreeVal<'_> by Merge<Option<&TreeValue>> Yuya Nishihara 2024-08-11 21:39:13 +0900
  • 2977900482 merge: move non-consuming Merge<Option<TreeValue>> methods to generic type Yuya Nishihara 2024-08-11 22:07:20 +0900
  • 8268af9b4f merge: add helper function to match Option<impl Borrow<TreeValue>> Yuya Nishihara 2024-08-11 22:01:17 +0900
  • accd1e337a merge: add .cloned() method that maps inner Option<&T> to Option<T> Yuya Nishihara 2024-08-11 22:47:02 +0900
  • e2ab6d4f42 rewrite: migrate move_commits function from rebase command Benjamin Tan 2024-08-12 19:08:10 +0800
  • 9c1b627f9b jj_lib: include indexmap as dependency Benjamin Tan 2024-08-12 19:08:10 +0800
  • 3ceef40b1e Deployed 206c0cf to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-12 03:11:08 +0000
  • 206c0cf830 docs: document how to compile a statically linked binary on Mac Ilya Grigoriev 2024-07-25 19:25:02 -0700
  • 4103306f17 Deployed fd52efa to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-12 01:21:05 +0000
  • fd52efa0ba merged_tree: leverage Merge<Tree> entries iterator in all_tree_entries() Yuya Nishihara 2024-08-11 13:18:56 +0900
  • 88018e84fc merged_tree: micro-optimize Merge<Tree> entries iterator to return &TreeValue Yuya Nishihara 2024-08-11 13:06:15 +0900
  • 6d6f5990de merged_tree: add merge-join iterator over Merge<Tree> entries Yuya Nishihara 2024-08-11 12:57:32 +0900
  • 5911e5c9b2 copy-tracking: Add copy tracking as a post iteration step Matt Kulukundis 2024-08-06 14:04:58 -0400
  • 0349d9ead3 copy-tracking: extract next_impl from next in diff iter/stream Matt Kulukundis 2024-08-06 14:04:58 -0400
  • 34b0f87584 copy-tracking: plumb CopyRecordMap through diff method Matt Kulukundis 2024-08-02 12:48:07 -0400
  • 6bae5eaf9d copy-tracking: create a MaterializedTreeDiffEntry type Matt Kulukundis 2024-07-26 13:21:21 -0400
  • e123eb21b9 copy-tracking: add source field to TreeDiffEntry Matt Kulukundis 2024-07-26 12:49:27 -0400
  • 8e84c60157 copy-tracking: create an explicit TreeDiffEntry struct Matt Kulukundis 2024-07-25 14:57:43 -0400
  • ee6b922144 copy-tracking: create CopyRecordMap and add it to diff summaries Matt Kulukundis 2024-07-15 16:55:44 -0400
  • e667a2b403 copy-tracking: adjust backend signature Matt Kulukundis 2024-07-15 16:55:44 -0400
  • 15987f2dfe Deployed c9e147c to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-11 09:23:57 +0000
  • c9e147c425 merged_tree: allow to postpone resolution of intermediate trees Yuya Nishihara 2024-08-09 01:36:57 +0900
  • 5d141befc2 tests: evaluate file()/diff_contains() revset against merged parents Yuya Nishihara 2024-08-09 01:36:57 +0900
  • dac04960f0 rewrite: remove redundant commit_id.clone() from merge_commit_trees*() Yuya Nishihara 2024-08-10 21:42:43 +0900
  • ed1c07e73e tree: fill in valid id to null tree, rename function to empty() Yuya Nishihara 2024-08-08 23:42:47 +0900
  • bf2cb55ea7 cargo: bump the cargo-dependencies group with 2 updates dependabot[bot] 2024-08-09 16:14:35 +0000
  • 6c28ca6436 cli: op show: remove visible alias for positional arg tinger 2024-08-09 13:55:46 +0200
  • 963a9d1545 Deployed 9a4cb9e to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-09 13:40:09 +0000
  • 9a4cb9e6e8 config: do not parse TOML value expression by write_config_value_to_file() Yuya Nishihara 2024-08-09 10:12:12 +0900
  • 34bcda651f wip: git status-based fsmonitor arxanas/wip/git-status-fsmonitor Waleed Khan 2024-06-15 13:12:48 -0700
  • 205334098a cargo: bump serde in the cargo-dependencies group dependabot[bot] 2024-08-08 15:27:11 +0000
  • 2cb7e91dc7 merged_tree: do not re-look up non-conflicting tree values by name Yuya Nishihara 2024-08-08 19:35:46 +0900
  • 9fb9e732c1 git: resolve relative core.excludesFile path at workspace root Yuya Nishihara 2024-08-07 18:50:13 +0900
  • 19b62d29ba merged_tree: leverage .to_tree_merge() in TreeDiffIterator Yuya Nishihara 2024-08-08 19:10:24 +0900
  • 6fc7cec4a5 merged_tree: make TreeDiffIterator accept trees as &Merge<Tree> Yuya Nishihara 2024-08-08 18:59:38 +0900
  • 9378adedb7 merged_tree: hold store globally by TreeDiffIterator Yuya Nishihara 2024-08-08 18:29:52 +0900
  • 37c41d0eaf tests: do not pass in commit objects loaded from different store Yuya Nishihara 2024-08-08 18:52:51 +0900
  • 8b72dad095 merged_tree: replace explicit .is_tree() call in TreeEntriesIterator Yuya Nishihara 2024-08-08 18:23:22 +0900
  • 12434b49b8 merged_tree: make TreeEntriesIterator accept trees as &Merge<Tree> Yuya Nishihara 2024-08-08 18:16:48 +0900
  • 8a3e4ad966 merged_tree: hold store globally by TreeEntriesIterator Yuya Nishihara 2024-08-08 18:08:51 +0900
  • ec7725064b merged_tree: make MergedTree a struct Martin von Zweigbergk 2024-07-24 02:24:02 -0700
  • 7596935285 merged_tree: make ConflictIterator a struct Martin von Zweigbergk 2024-07-24 01:11:43 -0700
  • 109391f9c7 merged_tree: delete MergedTree::Legacy Martin von Zweigbergk 2024-07-23 01:30:31 -0700
  • 10aab1bdc3 conflicts: always promote legacy trees to merged trees Martin von Zweigbergk 2024-07-23 01:34:15 -0700