Code

History

Commits on patch-1 to cli/src/commands/diffedit.rs35+
  1. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  2. rewrite: make merge_commit_trees() asyncMartin von Zweigbergk committed 1 year ago48ac617
  3. diffedit: add support for filesetsGeorge Christou committed 1 year agof7377bd
  4. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  5. cli: diffedit: remove confusing/redundant documentationWinter committed 1 year agobece25c
  6. completion: revset expression completerDaniel Luz committed 1 year ago87f6db0
  7. restore, diffedit: do not output "Created ..." message, which dates back to before we couldn't lookup by change id.Steve Fink committed 1 year ago0eceed9
  8. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  9. repo: remove &UserSettings argument from new/rewrite_commit(), use self.settingsYuya Nishihara committed 1 year agocff7384
  10. cli: refer to revset argument using `REVSET(S)` in synopsisMartin von Zweigbergk committed 1 year ago822f016
  11. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  12. cli: provide short flags for rev rangesRemo Senekowitsch committed 1 year agoac0e531
  13. completion: teach commands about revisionsRemo Senekowitsch committed 1 year agodd6479f
  14. unsquash: deprecate in favor of squash and diffeditSamuel Tardieu committed 2 years agobaf25ba
  15. diffedit: add --restore-descendants flagSamuel Tardieu committed 2 years agof76ee18
  16. cli: pass &Ui to parse fileset/revset/template functionsYuya Nishihara committed 2 years ago4533e81
  17. diffedit: separate extra help information in its own paragraphSamuel Tardieu committed 2 years ago726cbbd
  18. transaction: rename `mut_repo()` to idiomatic `repo_mut()`Martin von Zweigbergk committed 2 years ago8d09062
  19. cleanup: inline some short single-use `mut_repo` variablesMartin von Zweigbergk committed 2 years agoe5e9522
  20. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  21. cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
  22. cleanup: propagate errors from `Commit::parents()`Martin von Zweigbergk committed 2 years ago0a758e7
  23. docs: stop mentioning `meld` as the default diff editorIlya Grigoriev committed 2 years ago82c85ba
  24. Make check_rewritable take an iterator of &CommitId instead of &CommitEvan Mesterhazy committed 2 years agod4a0477
  25. cli: preserve RevisionArg type as much as possibleYuya Nishihara committed 2 years agoae91adb
  26. ui: make `status()` return a `dyn Write`, add `status_formatter()`Martin von Zweigbergk committed 2 years agoe38e290
  27. cli: add a Ui::status() helper for writing non-error to stderrMartin von Zweigbergk committed 2 years agoaeaab8a
  28. cli: make `*Args::tool` fields non-public, except for `DiffFormatArgs`Martin von Zweigbergk committed 2 years agoea5a208
  29. cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
  30. cli: extract CommandError and helper functions to new moduleYuya Nishihara committed 2 years ago97024e5
  31. merge_tools: capture base_ignores and "ui.diff-instructions" by DiffEditorYuya Nishihara committed 2 years ago5cc89dd
  32. merge_tools: load diff/merge editor settings by callerYuya Nishihara committed 2 years ago003b40d
  33. merge_tools: take diff editor instruction as Option<&str>Yuya Nishihara committed 2 years agofbabd0c
  34. cli: drop handling of legacy revset dag range operatorYuya Nishihara committed 2 years agoc73a092
  35. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407