Code

History

Commits on ig/vimdiffwarn to cli/src2030+
  1. cli: fix crash on diff stat with long path nameMartin von Zweigbergk committed 3 years ago9395281
  2. merge_tools: create builtin diff editorWaleed Khan committed 3 years ago56c61fd
  3. merge_tools: rename `MergeTool::Internal` -> `MergeTool::Builtin`Waleed Khan committed 3 years agoccd67e8
  4. templates: default placeholders to redVamsi Avula committed 3 years ago32377a1
  5. commit: drop `merged_` prefix from `tree()` and `tree_id()`Martin von Zweigbergk committed 3 years ago145b0b2
  6. merged_tree: take store argument to `write_tree()` instead of `new()`Martin von Zweigbergk committed 3 years ago67832a3
  7. git: remove handling of real remote named "git", always overrideYuya Nishihara committed 3 years ago55c6e90
  8. git: do not import refs from remote named "git"Yuya Nishihara committed 3 years agoce3d28e
  9. git: add constant for pseudo remote name "git"Yuya Nishihara committed 3 years ago0e26ef7
  10. commit: migrate remaining uses of `Commit::tree_id()` and delete itMartin von Zweigbergk committed 3 years agodc06bbc
  11. rewrite: return `MergedTree` from `merge_commit_trees()`Martin von Zweigbergk committed 3 years ago90e78a1
  12. cli: merge trees via `MergedTree` in `rebase_to_dest_parent()`Martin von Zweigbergk committed 3 years ago494026a
  13. cli: merge trees via `MergedTree` in `jj move`Martin von Zweigbergk committed 3 years agobd6098e
  14. commit_builder: take `MergedTreeId` for root id argumentMartin von Zweigbergk committed 3 years ago1674a42
  15. cli: migrate `jj untrack` to `MergedTree` APIMartin von Zweigbergk committed 3 years agob19afb6
  16. cli: migrate `jj restore` to `MergedTree` APIMartin von Zweigbergk committed 3 years ago6d89f0c
  17. cli: migrate `cat`, `files` & `git submodule print` to `MergedTree` APIMartin von Zweigbergk committed 3 years agoa0291e9
  18. cli: migrate most diff-editing functions to `MergedTree` APIMartin von Zweigbergk committed 3 years agod753c85
  19. diff_util: use `MergedTree` throughoutMartin von Zweigbergk committed 3 years ago732e448
  20. diff_util: make `diff_content()` return empty for missing pathMartin von Zweigbergk committed 3 years ago5309335
  21. diff_util: unify handling of unexpected casesMartin von Zweigbergk committed 3 years ago5ef925d
  22. merge_tools: pass `MergedTree` to `run_mergetool()`Martin von Zweigbergk committed 3 years ago6df7db3
  23. merge_tools: pass `MergedTree`s to `edit_diff()`Martin von Zweigbergk committed 3 years ago17fe5e3
  24. merge_tools: pass `MergeTree` to `run_mergetool_external()`Martin von Zweigbergk committed 3 years ago54b9ecc
  25. working_copy: make `old_checkout` argument be `MergedTreeId`Martin von Zweigbergk committed 3 years ago1895a55
  26. working_copy: return `MergedTreeId` on snapshotMartin von Zweigbergk committed 3 years agoabf3853
  27. working_copy: enable storing multiple tree ids in state fileMartin von Zweigbergk committed 3 years ago88e9933
  28. templates: reword signature placeholders to match descriptionYuya Nishihara committed 3 years agoa0ae09f
  29. templater: move empty signature placeholder to user templateYuya Nishihara committed 3 years agof422f13
  30. cli: use `MergedTree` in `jj chmod`Martin von Zweigbergk committed 3 years agoa186b5f
  31. cli: use `MergedTreeBuilder` in `jj chmod`Martin von Zweigbergk committed 3 years agod0fb154
  32. merge: add `Merge::num_sides()`Martin von Zweigbergk committed 3 years agof877610
  33. working_copy: use `MergedTree` for diffing in `reset()`Martin von Zweigbergk committed 3 years ago85bdba5
  34. templater: fix offset of negative substr() index to be char-basedYuya Nishihara committed 3 years ago3f7d884
  35. templater: make .short(negative_len) return 0-length stringYuya Nishihara committed 3 years ago3bf92a0