History

Commits on ig/vimdiffwarn to cli/src/commands/resolve.rs35+

cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
cli: use commit.has_conflict() extensivelyYuya Nishihara committed 1 year ago617e17f
resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
repo: remove &UserSettings argument from new/rewrite_commit(), use self.settingsYuya Nishihara committed 1 year agocff7384
cli: refer to revset argument using `REVSET(S)` in synopsisMartin von Zweigbergk committed 1 year ago822f016
cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
completion: suggest file paths incrementallyRemo Senekowitsch committed 1 year agoa8c35db
completion: teach commands about filesRemo Senekowitsch committed 1 year ago5fcc549
cli_util: take conflicts by value to `print_conflicted_paths()`Martin von Zweigbergk committed 1 year ago9ec216a
completion: teach commands about revisionsRemo Senekowitsch committed 1 year agodd6479f
cli: pass &Ui to parse fileset/revset/template functionsYuya Nishihara committed 2 years ago4533e81
transaction: rename `mut_repo()` to idiomatic `repo_mut()`Martin von Zweigbergk committed 2 years ago8d09062
formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
cli: inline matcher_from_values() in favor of parse_file_patterns()Yuya Nishihara committed 2 years ago9b1eb03
Make check_rewritable take an iterator of &CommitId instead of &CommitEvan Mesterhazy committed 2 years agod4a0477
cli: print conflicted paths whenever the working copy is changedBenjamin Tan committed 2 years ago7e46cc1
cli: use RevisionArg type in "resolve -r", "bench", and example commandYuya Nishihara committed 2 years ago311bdbf
resolve: remove `--quiet` flag, rely on global oneMartin von Zweigbergk committed 2 years ago7b3f8e8
ui: make `status()` return a `dyn Write`, add `status_formatter()`Martin von Zweigbergk committed 2 years agoe38e290
cli: add a Ui::status() helper for writing non-error to stderrMartin von Zweigbergk committed 2 years agoaeaab8a
cli: add more CommandError factory functions, consolidate inner typeYuya Nishihara committed 2 years agoc333481
formatter: use write!() or writeln!() thoroughly, remove .write_str()Yuya Nishihara committed 2 years ago00285be
cli: make `*Args::tool` fields non-public, except for `DiffFormatArgs`Martin von Zweigbergk committed 2 years agoea5a208
cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
cli: extract CommandError and helper functions to new moduleYuya Nishihara committed 2 years ago97024e5
merge_tools: move run_mergetool() to MergeEditor::edit_file()Yuya Nishihara committed 2 years agofc4aa36
merge_tools: load diff/merge editor settings by callerYuya Nishihara committed 2 years ago003b40d
cli: drop handling of legacy revset dag range operatorYuya Nishihara committed 2 years agoc73a092
cli: display which file's conflicts are being resolvedStephen Jennings committed 2 years ago57d5aba
object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
transaction: take description at end instead of startMartin von Zweigbergk committed 2 years ago60fae31
repo_path: add stub RepoPathBuf type, update callersYuya Nishihara committed 2 years ago0a1bc2b
merge: have Merge::adds()/removes() return iteratorYuya Nishihara committed 3 years agod9fbf21
clippy: run `cargo clippy --fix --workspace` with recent nightlyIlya Grigoriev committed 3 years ago2571169