History

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

cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
rewrite: Rename CommitToSquash to CommitWithSelectionEvan Mesterhazy committed 1 year ago707680b
cli: update "only_path" warnings to say fileset expression instead of pathYuya Nishihara committed 2 years ago5396138
cli: squash: use draft description template to generate editor contentYuya Nishihara committed 1 year ago832e7b3
rewrite: move description handling from squash_commits() to callerYuya Nishihara committed 1 year agoe85a5c4
cli: replace run_ui_editor() and edit_temp_file() with editor typeYuya Nishihara committed 1 year ago641ec52
cli: squash: use indoc::formatdoc! to indent formatted instructions nicelyYuya Nishihara committed 1 year ago2304db6
cli: squash: inline move_diff() to address "too many arguments" linter warningYuya Nishihara committed 1 year ago5adeb63
cli: squash: extract first half of move_diff() to separate functionYuya Nishihara committed 1 year ago3cdd571
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: delete the deprecated `jj move` commandMartin von Zweigbergk committed 1 year ago7323c2e
completion: teach commands about revisionsRemo Senekowitsch committed 2 years agodd6479f
squash: add -f/-t shorthands for --from/--[in]toVamsi Avula committed 2 years ago93a4fcf
squash: move the core functionality to jj_libdploch committed 2 years ago4f15ca4
description_util: remove dependency on WorkspaceCommandHelperdploch committed 2 years ago85f1ac3
cli: pass &Ui to parse fileset/revset/template functionsYuya Nishihara committed 2 years ago4533e81
squash doc: --keep-emptied let the description unchangedSamuel Tardieu committed 2 years agoc1a032f
squash: accept -k as a shorthand for --keep-emptiedSamuel Tardieu committed 2 years agoa7f32d3
cli: get repo path from `WorkspaceCommandHelper`, not from `ReadonlyRepo`Martin von Zweigbergk committed 2 years agobfb16a4
transaction: rename `mut_repo()` to idiomatic `repo_mut()`Martin von Zweigbergk committed 2 years ago8d09062
cleanup: avoid some unnecessary uses of mutable repo referenceMartin von Zweigbergk committed 2 years ago5fbc819
cli squash: explain --into in error message for merge commitsIlya Grigoriev committed 2 years ago6f44ed4
formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
feat(squash): Add `--keep-emptied` flagMatt Stark committed 2 years agoca4eb60
cleanup: propagate errors from `Commit::parents()`Martin von Zweigbergk committed 2 years ago0a758e7
cli: use command helper to check if path argument is parsable as revsetYuya Nishihara committed 2 years agoba73acc
commit: add a helper for returning parent tree of `Commit`Martin von Zweigbergk committed 2 years agodbba2ed
squash: don't use unchanged source commit as predecessorMartin von Zweigbergk committed 2 years ago7093d5d
squash: don't rewrite commits that didn't changeMartin von Zweigbergk committed 2 years ago09b9605
squash: move updating of source commits out of diff-editing loopMartin von Zweigbergk committed 2 years ago2bd2358