Code

History

Commits on ig/commit-debug to lib/src2520+
  1. conflicts: fix a typo (lossy conflict -> lossy conversion)Martin von Zweigbergk committed 3 years agobbbae2c
  2. tree: don't read file contents on contents/executable "conflict"Martin von Zweigbergk committed 3 years ago02bb3ae
  3. tree: make `try_resolve_file_conflict()` write resolved file to storeMartin von Zweigbergk committed 3 years ago6e6ca16
  4. conflicts: add a `simplify()` method, taken from `tree.rs`Martin von Zweigbergk committed 3 years ago1f1c686
  5. tree: specialize and inline `tree_value_to_conflict()`Martin von Zweigbergk committed 3 years agoe5a2899
  6. tree: remove check for conflict-simplification resulting in deletionMartin von Zweigbergk committed 3 years agoee98d1e
  7. conflicts: remove `ConflictId` from `update_conflict_from_content()`Martin von Zweigbergk committed 3 years ago19fd8a9
  8. revsets: stop `jj` parsing `br` as a git_ref `refs/heads/br`Ilya Grigoriev committed 3 years ago096538b
  9. revset: allow checking out git-tracking (`@git`) branchesIlya Grigoriev committed 3 years agoa483252
  10. cmd: have `jj branch list` report git-tracking (`@git`) branchesIlya Grigoriev committed 3 years ago8df945b
  11. operation: iterate ancestors incrementally with timestamp-based heuristicYuya Nishihara committed 3 years ago7a6f832
  12. dag_walk: add lazy topo-order iterator for chronological dataYuya Nishihara committed 3 years ago5cecdb5
  13. dag_walk: extract topo-order helper that doesn't reverse the resultYuya Nishihara committed 3 years agofb7fff4
  14. dag_walk: flatten nested loops in topo_order_reverse()Yuya Nishihara committed 3 years ago4987c74
  15. dag_walk: add a few more tests for topo_order_reverse(), extract callbacksYuya Nishihara committed 3 years agod9c417d
  16. dag_walk: remove unneeded trait bound on node typeYuya Nishihara committed 3 years ago459e917
  17. conflicts: move conversion to `FileId` conflict to callersMartin von Zweigbergk committed 3 years agode71df2
  18. conflicts: convert `TreeValue` to `FileId` conflict to avoid `panic!`Martin von Zweigbergk committed 3 years agoad667d6
  19. feat(diff): add `ui.diff-instructions` option to suppress `JJ-INSTRUCTIONS` fileWaleed Khan committed 3 years ago74b8468
  20. feat(revset): suggest similar branch namesWaleed Khan committed 3 years ago23a4124
  21. refactor(revset): move `collect_similar` from `cli_util` to `revset`Waleed Khan committed 3 years agof61cbae
  22. cli: in `jj git push`, create transaction in a single placeMartin von Zweigbergk committed 3 years agoac8313f
  23. store: do conversion to/from `backend::Conflict`Martin von Zweigbergk committed 3 years ago29b676f
  24. tree: replace uses of `backend::Conflict`Martin von Zweigbergk committed 3 years ago43c55fc
  25. conflicts: replace remaining uses of `backend::Conflict`Martin von Zweigbergk committed 3 years agoc378503
  26. conflicts: use an early return to reduce indentationMartin von Zweigbergk committed 3 years ago9907ccc
  27. conflicts: fix bug when modifying modify/delete conflictsMartin von Zweigbergk committed 3 years agof4499aa
  28. conflicts: replace `backend::Conflict` in `materialize_conflict()`Martin von Zweigbergk committed 3 years ago1fdc25f
  29. conflicts: introduce generic type for conflictsMartin von Zweigbergk committed 3 years ago5733e3a
  30. dag_walk: rename bfs() to dfs() because it's depth-firstYuya Nishihara committed 3 years ago78a64ed
  31. dag_walk: reorder and adjust signature of neighbors_fn for consistencyYuya Nishihara committed 3 years agod5d1dbc
  32. dag_walk: unbox topo_order_reverse() callbackYuya Nishihara committed 3 years agoa28e672
  33. dag_walk: unbox bfs() callback, use iter::from_fn() to implement iteratorYuya Nishihara committed 3 years ago3ba5444
  34. dag_walk: simply pass callback function by valueYuya Nishihara committed 3 years ago522308b
  35. tree_builder: populate base trees by recursionYuya Nishihara committed 3 years ago6872051

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t