Commit Graph

  • 9be80ddb68
    Merge 79bc5bcbe3 into 085e17e1cc Matt 2024-08-16 14:35:13 +0900
  • 3f6c668625
    Merge c25a9f67f2 into 085e17e1cc Martin von Zweigbergk 2024-08-16 05:18:21 +0000
  • c25a9f67f2
    cli: rename obslog to evolution-log/evolog push-pnvwlqzwuwwr Martin von Zweigbergk 2024-07-24 06:49:18 -0700
  • 7688da852a
    Merge 93e1c2fcc5 into 085e17e1cc Alec Snyder 2024-08-15 21:50:14 -0700
  • 6c56a6b082
    Merge 2dea059199 into 085e17e1cc Marie 2024-08-15 21:27:40 -0700
  • 9437b0106e
    Merge 2f30a18e33 into 085e17e1cc Ilya Grigoriev 2024-08-16 03:05:16 +0000
  • ed3f68b61b
    Merge b40bc420bd into 085e17e1cc Ilya Grigoriev 2024-08-16 03:05:15 +0000
  • faca11e634
    Merge 7fc0f29361 into 085e17e1cc Ilya Grigoriev 2024-08-16 03:05:15 +0000
  • 7fc0f29361 Omit trivial diffs Ilya Grigoriev 2024-08-07 14:35:03 -0700
  • c1c24a7c1c Show simple conflicts simply Ilya Grigoriev 2024-08-07 14:26:18 -0700
  • bf8259e97c diff_util: tried to make conflict diff headers clearer Ilya Grigoriev 2024-08-10 14:30:47 -0700
  • 50ce4d70a5 indent added/removed diffs with +| or -| Ilya Grigoriev 2024-08-06 19:59:14 -0700
  • e56e6eb7be cli diff-util: implement diff --structured-conflicts Ilya Grigoriev 2024-08-06 22:33:44 -0700
  • f13ae36db8 diff_util: extract show_unified_diff_hunk to show single hunk Ilya Grigoriev 2024-08-06 18:48:35 -0700
  • 69315f0753 lib file: Refactor merge of file hunks Ilya Grigoriev 2024-08-04 18:06:24 -0700
  • b40bc420bd cli split: add experimental --restore-from AKA --from argument Ilya Grigoriev 2024-07-14 18:20:30 -0700
  • 2f30a18e33 lib merge: the key explain_diff_of_merges function and data structure Ilya Grigoriev 2024-08-05 15:05:42 -0700
  • ceaf42a2da lib merge: function to optimize diffs of merges wrt a distance function Ilya Grigoriev 2024-08-01 22:18:48 -0700
  • 6088c75e22 lib merge: add DiffOfMerge type Ilya Grigoriev 2024-08-05 15:05:42 -0700
  • e52fc920ca lib get_simplified_mapping: change algorithm slightly Ilya Grigoriev 2024-08-01 17:21:57 -0700
  • cb515db083 lib merge: extract get_simplified_mapping and co. Ilya Grigoriev 2024-07-31 21:09:11 -0700
  • 1e73c7b4c1
    Merge ccde80a542 into 085e17e1cc dependabot[bot] 2024-08-15 19:58:36 -0700
  • adeb2e2cf2
    Merge 2d17a2b408 into 085e17e1cc Austin Seipp 2024-08-15 19:49:34 -0700
  • 2133beab6e
    Merge 7e5bdd5fe8 into 085e17e1cc Cretezy 2024-08-16 02:43:20 +0000
  • 7e5bdd5fe8
    Fix macOS x86_64 release builds fix-macos-x86_64-release Cretezy 2024-08-15 22:42:48 -0400
  • 113dd8ac42
    Merge 9fc674131f into 085e17e1cc Bobbe 2024-08-16 03:21:48 +0100
  • 7ab65822bd
    Merge d875b39cb6 into 085e17e1cc Matt Fowles Kulukundis 2024-08-15 22:11:06 -0400
  • 4e763a3c25 Deployed 085e17e to prerelease with MkDocs 1.6.0 and mike 2.1.1 gh-pages jj-docs[bot] 2024-08-16 00:31:05 +0000
  • 085e17e1cc files: micro-optimzie DiffLine::reset_line() to not clone hunks main 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
  • 756579b23d
    Merge 2cce1503a3 into 6ecc2dac81 Essien Ita Essien 2024-08-16 01:28:18 +0100
  • a9acca8973
    Merge 9cf51e4b8c into 95e8dd51eb Benjamin Tan 2024-08-15 20:14:35 -0400
  • 2cce1503a3 Fetch descendants more correctly. essiene/push-pouxyprmpnro Essien Ita Essien 2024-08-16 01:10:44 +0100
  • 4ee79549fa
    Merge 6ecc2dac81 into 1a73a47d93 Essien Ita Essien 2024-08-15 23:58:06 +0000
  • 6ecc2dac81 Update error message when no movement targets are found. essiene/push-psqruoxnkoyy Essien Ita Essien 2024-08-15 17:24:54 +0100
  • 65ec29ff64
    Merge 1a73a47d93 into 05d46b0fa6 Essien Ita Essien 2024-08-15 20:46:15 +0000
  • 1a73a47d93 Add config flag to control prev/next edit behaviour. essiene/push-utlmxzpwopxr Essien Ita Essien 2024-08-13 19:09:58 +0100
  • 6f8fe2d327
    Merge 05d46b0fa6 into da56062d30 Essien Ita Essien 2024-08-15 19:41:10 +0000
  • 061ecc748f
    Merge da56062d30 into 95e8dd51eb Essien Ita Essien 2024-08-15 20:39:53 +0100
  • 05d46b0fa6 no-op: Refactor movement utilities into cli/src/movement_utils.rs essiene/push-lkzyxpuyumyq Essien Ita Essien 2024-08-15 16:51:27 +0100
  • da56062d30 no-op: Add jj log output to more prev_next tests. essiene/push-uxmkksrpywlq Essien Ita Essien 2024-08-14 13:55:55 +0100
  • d875b39cb6 copy-tracking: implement copy tracking for external tools Matt Kulukundis 2024-08-15 11:22:34 -0400
  • ccde80a542
    cargo: bump the cargo-dependencies group with 2 updates dependabot/cargo/cargo-dependencies-3f5a40bdb3 dependabot[bot] 2024-08-15 15:49:18 +0000
  • fa5e148eed
    Merge 72e28f3dea into 95e8dd51eb Marijan Smetko 2024-08-15 17:37:03 +0200
  • eaba6a7f13
    Merge 1f24f9d18d into 95e8dd51eb dependabot[bot] 2024-08-15 15:13:57 +0000
  • 1f24f9d18d
    github: bump github/codeql-action in the github-dependencies group dependabot/github_actions/github-dependencies-392b9cf7da dependabot[bot] 2024-08-15 15:13:56 +0000
  • 95e8dd51eb copy-tracking: add support for diff --git Matt Kulukundis 2024-08-14 10:20:17 -0400
  • 661434605b 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
  • 790f5f8603
    Merge 3154e5edec into 78c0128ec3 Vladimir 2024-08-15 15:01:47 +0100
  • 78b42ba5bb files: micro-optimzie DiffLine::reset_line() to not clone hunks Yuya Nishihara 2024-08-14 23:59:27 +0900
  • 25649541e4 files: replace precomputed has_left/right_content flags with functions Yuya Nishihara 2024-08-14 23:52:02 +0900
  • e1e8381690 diff: clarify that DiffLine hunk doesn't have [left, right] diff pair Yuya Nishihara 2024-08-14 22:32:27 +0900
  • e5eb53d5b8 files: ensure that DiffLineIterator hunk has exactly two inputs Yuya Nishihara 2024-08-15 12:35:59 +0900
  • 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
  • 72e28f3dea Warn user about the working copy when configuring the author Marijan Smetko 2024-07-21 00:48:56 +0200
  • 4fa6690db2
    Merge 4404889f92 into 0b179dcbde Ilya Grigoriev 2024-08-14 22:32:39 -0700
  • 7b4f309ef0 cli: propagate BackendError from tree diffs Yuya Nishihara 2024-08-15 10:29:13 +0900
  • 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
  • ac41aa56b5 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
  • 5e6d76c99f
    Merge df6e3d2306 into 49577f7f75 Austin Seipp 2024-08-14 23:13:26 +0200
  • 9ea3ef32b1
    Merge 042d76eb7a into 49577f7f75 Philip Metzger 2024-08-14 23:13:26 +0200
  • 7da004d623
    Merge c69f104ed8 into 49577f7f75 Ilya Grigoriev 2024-08-14 23:13:26 +0200
  • b9143c3faf
    Merge bed1ca1019 into 49577f7f75 Ilya Grigoriev 2024-08-14 23:13:26 +0200
  • 2c690b4747 copy-tracking: diff --name-only is a no-op Matt Kulukundis 2024-08-14 09:55:36 -0400
  • 9cf51e4b8c
    git: enable libgit2's OpenSSH feature Benjamin Tan 2024-03-02 00:43:48 +0800
  • dc567a2277
    git: vendor custom prerelease version of libgit2 Benjamin Tan 2024-03-02 00:43:48 +0800
  • 109fab3d1b
    rewrite::move_commits(): preserve order of parent commits Benjamin Tan 2024-08-14 19:24:30 +0800
  • e324ffe0d7
    rebase: modify tests to avoid printing commit and change IDs Benjamin Tan 2024-08-14 19:24:29 +0800
  • 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
  • fba1730fb1
    github: bump github/codeql-action in the github-dependencies group dependabot[bot] 2024-08-14 15:44:37 +0000
  • 2d9a654c32
    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
  • a27df5fb8a fix: small clippy warning Matt Kulukundis 2024-08-14 09:30:31 -0400
  • fd0584bc2c files: make DiffLineIterator accept generic DiffLine iterator Yuya Nishihara 2024-08-14 14:20:19 +0900
  • 90ce6b91d8
    Merge 32f2e22c1c into a6d8009097 Matt Fowles Kulukundis 2024-08-14 13:42:43 +0200
  • 0da906d1f7 files: replace Vec + index access with iterator in DiffLineIterator Yuya Nishihara 2024-08-14 14:12:56 +0900
  • ea0ced2bbb files: use imported DiffHunk type in DiffLineIterator Yuya Nishihara 2024-08-14 14:05:30 +0900
  • 3d4ea8db50 diff: move empty content optimization from diff() to Diff::for_tokenizer() Yuya Nishihara 2024-08-14 15:01:56 +0900
  • d0435c535e tests: add more empty content diff samples Yuya Nishihara 2024-08-14 15:01:56 +0900
  • 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
  • b4b8e38b2f Define builtin_immutable_heads() as a default revset alias. Essien Ita Essien 2024-08-01 20:17:16 +0100
  • 64969f8c1f
    diff_util: add copy records tracking to DiffRenderer::show_patch Benjamin Tan 2024-08-14 16:54:49 +0800
  • b878b04284
    cli: add basic tests for show command Benjamin Tan 2024-08-14 16:54:49 +0800
  • 3f3fd24333
    Merge 39917982c6 into ec99a17ae8 Ilya Grigoriev 2024-08-13 23:08:16 -0700
  • 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