Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some improvements #846

Merged
merged 7 commits into from
Oct 8, 2018
Merged

Some improvements #846

merged 7 commits into from
Oct 8, 2018

Conversation

scorphus
Copy link
Collaborator

@scorphus scorphus commented Oct 2, 2018

Please don't merge yet. I'd like these changes to be reviewed. Once it's all good I'll push to master. Thanks!

@scorphus scorphus requested review from nvbn and josephfrazier October 2, 2018 19:51
Copy link
Collaborator

@josephfrazier josephfrazier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much context for most of these issues, but the changes seem fine! Is the plan to "Rebase and merge" this using github, or were you just thinking of pushing directly to master? I'd prefer the former if that's ok with you.

@@ -420,7 +422,8 @@ rule with lower `priority` will be matched first;
* `THEFUCK_HISTORY_LIMIT` – how many history commands will be scanned, like `2000`;
* `THEFUCK_ALTER_HISTORY` – push fixed command to history `true/false`;
* `THEFUCK_WAIT_SLOW_COMMAND` – max amount of time in seconds for getting previous command output if it in `slow_commands` list;
* `THEFUCK_SLOW_COMMANDS` – list of slow commands, like `lein:gradle`.
* `THEFUCK_SLOW_COMMANDS` – list of slow commands, like `lein:gradle`;
* `THEFUCK_NUM_CLOSE_MATCHES` – maximum number of close matches to suggest, like `5`.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just switch to putting a ; on the last line (instead of .), so the diff can be smaller going forward?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had the exact same thought. But the next thought was "Wait. It's text, not code". Perhaps it makes sense to have a period there. For me it will look like an unfinished list.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah, that makes sense too. Alternatively, since we already have the bullet points, maybe it makes sense to remove the semicolon/period entirely? Obviously this would be a separate change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that's a good one, reasonable change. 👍

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I'll wait until this is closed to make that change (if I remember)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@josephfrazier I think it should be ok to remove ;, as it's not required by grammar rules

@scorphus
Copy link
Collaborator Author

scorphus commented Oct 2, 2018

Thanks for the review, @josephfrazier! "Rebase and merge", absolutely! I also prefer it :-)

@scorphus
Copy link
Collaborator Author

scorphus commented Oct 2, 2018

Oh, let me add some tests to thefuck/output_readers/rerun.py.

@scorphus scorphus changed the title Some improvements WIP - Some improvements Oct 3, 2018
@scorphus scorphus changed the title WIP - Some improvements Some improvements Oct 5, 2018
Copy link
Owner

@nvbn nvbn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@nvbn
Copy link
Owner

nvbn commented Oct 8, 2018

Diff is huge, thanks 😀!

@nvbn nvbn merged commit 25142f8 into nvbn:master Oct 8, 2018
@scorphus scorphus deleted the sudoless-build branch October 25, 2018 17:39
riley-martine pushed a commit to riley-martine/thefuck that referenced this pull request Dec 7, 2023
* nvbn#833: do not require sudo on TravisCI

* #N/A: Add Python dev releases to TravisCI pipeline

Inspired by Brett Cannon's advise [1].

    1: https://snarky.ca/how-to-use-your-project-travis-to-help-test-python-itself/

* nvbn#837: try and kill proc and its children

* #N/A: show shell information on `thefuck --version`

* #N/A: omit default arguments to get_close_matches

* nvbn#842: add settings var to control number of close matches

* #N/A: remove `n` from the list of `get_closest`'s args
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants