Code

History

Commits on ig/commit-debug to cli3080+
  1. cli: elide path in snapshot progress in the same wayYuya Nishihara committed 3 years agoe362374
  2. cli: make diff stat calculate path length based on unicode widthYuya Nishihara committed 3 years ago1c7d2b9
  3. cli: include both ascii and non-ascii file names in diff stat testYuya Nishihara committed 3 years ago643b2d4
  4. cli: add helper to elide text from leftYuya Nishihara committed 3 years ago3d54df9
  5. working_copy: in `LockedWorkingCopy::drop()`, discard unsaved changesMartin von Zweigbergk committed 3 years agob8f71a4
  6. cli: add hint when snapshot fails due to large fileMartin von Zweigbergk committed 3 years agof3a16eb
  7. cli: trim path in diff stat if it's long, to give room for statMartin von Zweigbergk committed 3 years agob18c97a
  8. cli: fix indentation of two insta snapshotsMartin von Zweigbergk committed 3 years ago497f4a9
  9. cli: make diff stat determine path length in chars, not bytesMartin von Zweigbergk committed 3 years ago5ecc95a
  10. cli: use non-ascii chars in diff stat testMartin von Zweigbergk committed 3 years ago0493e2b
  11. cli: don't crash diffstat on very narrow terminalsMartin von Zweigbergk committed 3 years ago4377c08
  12. cli: reuse `number_padding` instead of calculating twice in diff statMartin von Zweigbergk committed 3 years ago5a054fc
  13. cli: allow diff stat bar to be one character longerMartin von Zweigbergk committed 3 years ago5ce4ed4
  14. cli: fix crash on diff stat with long path nameMartin von Zweigbergk committed 3 years ago9395281
  15. merged_trees: consider conflict-format-change-only commits emptyMartin von Zweigbergk committed 3 years ago61501db
  16. merged_tree: add config option to write trees using new formatMartin von Zweigbergk committed 3 years ago8e47d2d
  17. merge_tools: create builtin diff editorWaleed Khan committed 3 years ago56c61fd
  18. merge_tools: rename `MergeTool::Internal` -> `MergeTool::Builtin`Waleed Khan committed 3 years agoccd67e8
  19. templates: default placeholders to redVamsi Avula committed 3 years ago32377a1
  20. tests: add test for log builtin templates with colorsVamsi Avula committed 3 years agodbf13a5
  21. commit: drop `merged_` prefix from `tree()` and `tree_id()`Martin von Zweigbergk committed 3 years ago145b0b2
  22. merged_tree: take store argument to `write_tree()` instead of `new()`Martin von Zweigbergk committed 3 years ago67832a3
  23. git: remove handling of real remote named "git", always overrideYuya Nishihara committed 3 years ago55c6e90
  24. git: do not import refs from remote named "git"Yuya Nishihara committed 3 years agoce3d28e
  25. git: prohibit creation of remote named "git"Yuya Nishihara committed 3 years ago35a596f
  26. git: add constant for pseudo remote name "git"Yuya Nishihara committed 3 years ago0e26ef7
  27. commit: migrate remaining uses of `Commit::tree_id()` and delete itMartin von Zweigbergk committed 3 years agodc06bbc
  28. rewrite: return `MergedTree` from `merge_commit_trees()`Martin von Zweigbergk committed 3 years ago90e78a1
  29. cli: merge trees via `MergedTree` in `rebase_to_dest_parent()`Martin von Zweigbergk committed 3 years ago494026a
  30. cli: merge trees via `MergedTree` in `jj move`Martin von Zweigbergk committed 3 years agobd6098e
  31. commit_builder: take `MergedTreeId` for root id argumentMartin von Zweigbergk committed 3 years ago1674a42
  32. cli: migrate `jj untrack` to `MergedTree` APIMartin von Zweigbergk committed 3 years agob19afb6
  33. cli: migrate `jj restore` to `MergedTree` APIMartin von Zweigbergk committed 3 years ago6d89f0c
  34. cli: migrate `cat`, `files` & `git submodule print` to `MergedTree` APIMartin von Zweigbergk committed 3 years agoa0291e9
  35. cli: migrate most diff-editing functions to `MergedTree` APIMartin von Zweigbergk committed 3 years agod753c85