Code

History

Commits on ig/commit-debug to cli/src/commands/resolve.rs35+
  1. backend: remove `MergedTreeId::Legacy` variantScott Taylor committed 1 year ago1418324
  2. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  3. formatter: move labeled() to extension trait, add owned versionYuya Nishihara committed 2 years ago2c0f65e
  4. cli complete: resolve: only complete mutable conflicting revisionsBenjamin Tan committed 1 year ago6a11634
  5. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  6. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  7. completion: revset expression completerDaniel Luz committed 1 year ago87f6db0
  8. merge_tools: add ":ours" and ":theirs" merge toolsScott Taylor committed 1 year agoa902e63
  9. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  10. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  11. cli: use commit.has_conflict() extensivelyYuya Nishihara committed 1 year ago617e17f
  12. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  13. repo: remove &UserSettings argument from new/rewrite_commit(), use self.settingsYuya Nishihara committed 1 year agocff7384
  14. cli: refer to revset argument using `REVSET(S)` in synopsisMartin von Zweigbergk committed 1 year ago822f016
  15. cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
  16. completion: suggest file paths incrementallyRemo Senekowitsch committed 1 year agoa8c35db
  17. completion: teach commands about filesRemo Senekowitsch committed 1 year ago5fcc549
  18. cli_util: take conflicts by value to `print_conflicted_paths()`Martin von Zweigbergk committed 1 year ago9ec216a
  19. completion: teach commands about revisionsRemo Senekowitsch committed 1 year agodd6479f
  20. cli: pass &Ui to parse fileset/revset/template functionsYuya Nishihara committed 2 years ago4533e81
  21. transaction: rename `mut_repo()` to idiomatic `repo_mut()`Martin von Zweigbergk committed 2 years ago8d09062
  22. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  23. cli: inline matcher_from_values() in favor of parse_file_patterns()Yuya Nishihara committed 2 years ago9b1eb03
  24. Make check_rewritable take an iterator of &CommitId instead of &CommitEvan Mesterhazy committed 2 years agod4a0477
  25. cli: print conflicted paths whenever the working copy is changedBenjamin Tan committed 2 years ago7e46cc1
  26. cli: use RevisionArg type in "resolve -r", "bench", and example commandYuya Nishihara committed 2 years ago311bdbf
  27. resolve: remove `--quiet` flag, rely on global oneMartin von Zweigbergk committed 2 years ago7b3f8e8
  28. ui: make `status()` return a `dyn Write`, add `status_formatter()`Martin von Zweigbergk committed 2 years agoe38e290
  29. cli: add a Ui::status() helper for writing non-error to stderrMartin von Zweigbergk committed 2 years agoaeaab8a
  30. cli: add more CommandError factory functions, consolidate inner typeYuya Nishihara committed 2 years agoc333481
  31. formatter: use write!() or writeln!() thoroughly, remove .write_str()Yuya Nishihara committed 2 years ago00285be
  32. cli: make `*Args::tool` fields non-public, except for `DiffFormatArgs`Martin von Zweigbergk committed 2 years agoea5a208
  33. cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
  34. cli: extract CommandError and helper functions to new moduleYuya Nishihara committed 2 years ago97024e5
  35. merge_tools: move run_mergetool() to MergeEditor::edit_file()Yuya Nishihara committed 2 years agofc4aa36