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

Fix help for file_collision method without block #858

Merged
merged 1 commit into from
Aug 21, 2023
Merged

Fix help for file_collision method without block #858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions lib/thor/shell/basic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def file_collision(destination)

say "Please specify merge tool to `THOR_MERGE` env."
else
say file_collision_help
say file_collision_help(block_given?)
end
end
end
Expand Down Expand Up @@ -384,16 +384,21 @@ def is?(value) #:nodoc:
end
end

def file_collision_help #:nodoc:
<<-HELP
def file_collision_help(block_given) #:nodoc:
help = <<-HELP
Y - yes, overwrite
n - no, do not overwrite
a - all, overwrite this and all others
q - quit, abort
d - diff, show the differences between the old and the new
h - help, show this help
m - merge, run merge tool
HELP
if block_given
help << <<-HELP
d - diff, show the differences between the old and the new
m - merge, run merge tool
HELP
end
help
end

def show_diff(destination, content) #:nodoc:
Expand Down
Loading