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.

Sign up for GitHub

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

Jump to bottom

ConsoleInteraction: Revalidate actions when something happens #1626

Merged
merged 4 commits into from Feb 21, 2016
Merged

ConsoleInteraction: Revalidate actions when something happens #1626

merged 4 commits into from Feb 21, 2016

Conversation

AbdealiLoKo
Copy link
Contributor

Fixes #1064

@AbdealiLoKo AbdealiLoKo added process/approved The PR is approved and will be merged soon process/wip and removed process/pending review process/approved The PR is approved and will be merged soon labels Feb 21, 2016
@AbdealiLoKo
ConsoleInteraction: Add arg cli_actions
136f1b4 
cli_actions as an arguments helps when testing the function.
This doesn't affect the rest of the workflow at all, as it
has a default None value.
@AbdealiLoKo
ConsoleInteraction: Revalidate actions
fb1f3d3 
Recheck if the actions can be applied after every action is
applied.

Fixes #1064
@AbdealiLoKo
ShowPatchAction: Change is_applicable() to static
9bce5fd
@AbdealiLoKo
ShowPatchAction: Correct is_applicable()
04baa48 
Earlier, is_applicable() was not very smart and just checked
if the diff existed. Now, we check if the diff has a conflict.
If there is a conflict, this action is not applicable.
We use a similar condition to ApplyPatchAction, as when the
patch is viewable, it should also be applicable.

Fixes #1235
@AbdealiLoKo
Copy link
Contributor Author

reack fb1f3d3 136f1b4 9bce5fd

@sils sils added process/approved The PR is approved and will be merged soon and removed process/pending review labels Feb 21, 2016
@sils
Copy link
Member

sils commented Feb 21, 2016

@rultor merge

@rultor
Copy link
Contributor

rultor commented Feb 21, 2016

@rultor merge

@sils1297 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit 04baa48 into master Feb 21, 2016
@rultor
Copy link
Contributor

rultor commented Feb 21, 2016

@rultor merge

@sils1297 Done! FYI, the full log is here (took me 1min)

@AbdealiLoKo AbdealiLoKo deleted the ajk/actions branch February 22, 2016 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
process/approved The PR is approved and will be merged soon size/L
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@AbdealiLoKo @sils @rultor @gitmate-bot