Ævar Arnfjörð Bjarmason | 3328ace | 2010-09-24 20:00:53 +0000 | [diff] [blame] | 1 | #!/usr/bin/perl |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 2 | |
Ævar Arnfjörð Bjarmason | d48b284 | 2010-09-24 20:00:52 +0000 | [diff] [blame] | 3 | use 5.008; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 4 | use strict; |
Ævar Arnfjörð Bjarmason | 3328ace | 2010-09-24 20:00:53 +0000 | [diff] [blame] | 5 | use warnings; |
Phillip Wood | 1d542a5 | 2017-06-30 10:49:09 +0100 | [diff] [blame] | 6 | use Git qw(unquote_path); |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 7 | use Git::I18N; |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 8 | |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 9 | binmode(STDOUT, ":raw"); |
| 10 | |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 11 | my $repo = Git->repository(); |
| 12 | |
Jeff King | f87e310 | 2008-01-04 03:35:21 -0500 | [diff] [blame] | 13 | my $menu_use_color = $repo->get_colorbool('color.interactive'); |
| 14 | my ($prompt_color, $header_color, $help_color) = |
| 15 | $menu_use_color ? ( |
| 16 | $repo->get_color('color.interactive.prompt', 'bold blue'), |
| 17 | $repo->get_color('color.interactive.header', 'bold'), |
| 18 | $repo->get_color('color.interactive.help', 'red bold'), |
| 19 | ) : (); |
Thomas Rast | a301973 | 2009-02-05 09:28:27 +0100 | [diff] [blame] | 20 | my $error_color = (); |
| 21 | if ($menu_use_color) { |
Stephan Beyer | 9aad6cb | 2009-02-08 18:40:39 +0100 | [diff] [blame] | 22 | my $help_color_spec = ($repo->config('color.interactive.help') or |
| 23 | 'red bold'); |
Thomas Rast | a301973 | 2009-02-05 09:28:27 +0100 | [diff] [blame] | 24 | $error_color = $repo->get_color('color.interactive.error', |
| 25 | $help_color_spec); |
| 26 | } |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 27 | |
Jeff King | f87e310 | 2008-01-04 03:35:21 -0500 | [diff] [blame] | 28 | my $diff_use_color = $repo->get_colorbool('color.diff'); |
| 29 | my ($fraginfo_color) = |
| 30 | $diff_use_color ? ( |
| 31 | $repo->get_color('color.diff.frag', 'cyan'), |
| 32 | ) : (); |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 33 | my ($diff_plain_color) = |
| 34 | $diff_use_color ? ( |
| 35 | $repo->get_color('color.diff.plain', ''), |
| 36 | ) : (); |
| 37 | my ($diff_old_color) = |
| 38 | $diff_use_color ? ( |
| 39 | $repo->get_color('color.diff.old', 'red'), |
| 40 | ) : (); |
| 41 | my ($diff_new_color) = |
| 42 | $diff_use_color ? ( |
| 43 | $repo->get_color('color.diff.new', 'green'), |
| 44 | ) : (); |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 45 | |
Jeff King | f87e310 | 2008-01-04 03:35:21 -0500 | [diff] [blame] | 46 | my $normal_color = $repo->get_color("", "reset"); |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 47 | |
John Keeping | 2cc0f53 | 2013-06-12 19:44:10 +0100 | [diff] [blame] | 48 | my $diff_algorithm = $repo->config('diff.algorithm'); |
Jeff King | 0114384 | 2016-02-27 00:37:06 -0500 | [diff] [blame] | 49 | my $diff_filter = $repo->config('interactive.difffilter'); |
John Keeping | 2cc0f53 | 2013-06-12 19:44:10 +0100 | [diff] [blame] | 50 | |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 51 | my $use_readkey = 0; |
Thomas Rast | b5cc003 | 2011-05-17 17:19:08 +0200 | [diff] [blame] | 52 | my $use_termcap = 0; |
| 53 | my %term_escapes; |
| 54 | |
Thomas Rast | 748aa68 | 2009-02-06 20:30:01 +0100 | [diff] [blame] | 55 | sub ReadMode; |
| 56 | sub ReadKey; |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 57 | if ($repo->config_bool("interactive.singlekey")) { |
| 58 | eval { |
Thomas Rast | 748aa68 | 2009-02-06 20:30:01 +0100 | [diff] [blame] | 59 | require Term::ReadKey; |
| 60 | Term::ReadKey->import; |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 61 | $use_readkey = 1; |
| 62 | }; |
Simon Ruderich | b294097 | 2014-03-03 22:16:12 +0100 | [diff] [blame] | 63 | if (!$use_readkey) { |
| 64 | print STDERR "missing Term::ReadKey, disabling interactive.singlekey\n"; |
| 65 | } |
Thomas Rast | b5cc003 | 2011-05-17 17:19:08 +0200 | [diff] [blame] | 66 | eval { |
| 67 | require Term::Cap; |
| 68 | my $termcap = Term::Cap->Tgetent; |
| 69 | foreach (values %$termcap) { |
| 70 | $term_escapes{$_} = 1 if /^\e/; |
| 71 | } |
| 72 | $use_termcap = 1; |
| 73 | }; |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 74 | } |
| 75 | |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 76 | sub colored { |
| 77 | my $color = shift; |
| 78 | my $string = join("", @_); |
| 79 | |
Jeff King | f87e310 | 2008-01-04 03:35:21 -0500 | [diff] [blame] | 80 | if (defined $color) { |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 81 | # Put a color code at the beginning of each line, a reset at the end |
| 82 | # color after newlines that are not at the end of the string |
| 83 | $string =~ s/(\n+)(.)/$1$color$2/g; |
| 84 | # reset before newlines |
| 85 | $string =~ s/(\n+)/$normal_color$1/g; |
| 86 | # codes at beginning and end (if necessary): |
| 87 | $string =~ s/^/$color/; |
| 88 | $string =~ s/$/$normal_color/ unless $string =~ /\n$/; |
| 89 | } |
| 90 | return $string; |
| 91 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 92 | |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 93 | # command line options |
Jeff King | c852bd5 | 2017-03-02 04:48:22 -0500 | [diff] [blame] | 94 | my $patch_mode_only; |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 95 | my $patch_mode; |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 96 | my $patch_mode_revision; |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 97 | |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 98 | sub apply_patch; |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 99 | sub apply_patch_for_checkout_commit; |
Thomas Rast | dda1f2a | 2009-08-13 14:29:44 +0200 | [diff] [blame] | 100 | sub apply_patch_for_stash; |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 101 | |
| 102 | my %patch_modes = ( |
| 103 | 'stage' => { |
| 104 | DIFF => 'diff-files -p', |
| 105 | APPLY => sub { apply_patch 'apply --cached', @_; }, |
| 106 | APPLY_CHECK => 'apply --cached', |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 107 | FILTER => 'file-only', |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 108 | IS_REVERSE => 0, |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 109 | }, |
Thomas Rast | dda1f2a | 2009-08-13 14:29:44 +0200 | [diff] [blame] | 110 | 'stash' => { |
| 111 | DIFF => 'diff-index -p HEAD', |
| 112 | APPLY => sub { apply_patch 'apply --cached', @_; }, |
| 113 | APPLY_CHECK => 'apply --cached', |
Thomas Rast | dda1f2a | 2009-08-13 14:29:44 +0200 | [diff] [blame] | 114 | FILTER => undef, |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 115 | IS_REVERSE => 0, |
Thomas Rast | dda1f2a | 2009-08-13 14:29:44 +0200 | [diff] [blame] | 116 | }, |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 117 | 'reset_head' => { |
| 118 | DIFF => 'diff-index -p --cached', |
| 119 | APPLY => sub { apply_patch 'apply -R --cached', @_; }, |
| 120 | APPLY_CHECK => 'apply -R --cached', |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 121 | FILTER => 'index-only', |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 122 | IS_REVERSE => 1, |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 123 | }, |
| 124 | 'reset_nothead' => { |
| 125 | DIFF => 'diff-index -R -p --cached', |
| 126 | APPLY => sub { apply_patch 'apply --cached', @_; }, |
| 127 | APPLY_CHECK => 'apply --cached', |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 128 | FILTER => 'index-only', |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 129 | IS_REVERSE => 0, |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 130 | }, |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 131 | 'checkout_index' => { |
| 132 | DIFF => 'diff-files -p', |
| 133 | APPLY => sub { apply_patch 'apply -R', @_; }, |
| 134 | APPLY_CHECK => 'apply -R', |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 135 | FILTER => 'file-only', |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 136 | IS_REVERSE => 1, |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 137 | }, |
| 138 | 'checkout_head' => { |
| 139 | DIFF => 'diff-index -p', |
| 140 | APPLY => sub { apply_patch_for_checkout_commit '-R', @_ }, |
| 141 | APPLY_CHECK => 'apply -R', |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 142 | FILTER => undef, |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 143 | IS_REVERSE => 1, |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 144 | }, |
| 145 | 'checkout_nothead' => { |
| 146 | DIFF => 'diff-index -R -p', |
| 147 | APPLY => sub { apply_patch_for_checkout_commit '', @_ }, |
| 148 | APPLY_CHECK => 'apply', |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 149 | FILTER => undef, |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 150 | IS_REVERSE => 0, |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 151 | }, |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 152 | ); |
| 153 | |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 154 | $patch_mode = 'stage'; |
| 155 | my %patch_mode_flavour = %{$patch_modes{$patch_mode}}; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 156 | |
| 157 | sub run_cmd_pipe { |
Johannes Sixt | df17e77 | 2013-09-04 09:24:47 +0200 | [diff] [blame] | 158 | if ($^O eq 'MSWin32') { |
Alex Riesen | 21e9757 | 2007-08-01 14:57:43 +0200 | [diff] [blame] | 159 | my @invalid = grep {m/[":*]/} @_; |
| 160 | die "$^O does not support: @invalid\n" if @invalid; |
| 161 | my @args = map { m/ /o ? "\"$_\"": $_ } @_; |
| 162 | return qx{@args}; |
| 163 | } else { |
| 164 | my $fh = undef; |
| 165 | open($fh, '-|', @_) or die; |
| 166 | return <$fh>; |
| 167 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 168 | } |
| 169 | |
| 170 | my ($GIT_DIR) = run_cmd_pipe(qw(git rev-parse --git-dir)); |
| 171 | |
| 172 | if (!defined $GIT_DIR) { |
| 173 | exit(1); # rev-parse would have already said "not a git repo" |
| 174 | } |
| 175 | chomp($GIT_DIR); |
| 176 | |
| 177 | sub refresh { |
| 178 | my $fh; |
Alex Riesen | 21e9757 | 2007-08-01 14:57:43 +0200 | [diff] [blame] | 179 | open $fh, 'git update-index --refresh |' |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 180 | or die; |
| 181 | while (<$fh>) { |
| 182 | ;# ignore 'needs update' |
| 183 | } |
| 184 | close $fh; |
| 185 | } |
| 186 | |
| 187 | sub list_untracked { |
| 188 | map { |
| 189 | chomp $_; |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 190 | unquote_path($_); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 191 | } |
Wincent Colaiuta | 4c84168 | 2007-11-22 02:36:24 +0100 | [diff] [blame] | 192 | run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 193 | } |
| 194 | |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 195 | # TRANSLATORS: you can adjust this to align "git add -i" status menu |
| 196 | my $status_fmt = __('%12s %12s %s'); |
| 197 | my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path')); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 198 | |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 199 | { |
| 200 | my $initial; |
| 201 | sub is_initial_commit { |
| 202 | $initial = system('git rev-parse HEAD -- >/dev/null 2>&1') != 0 |
| 203 | unless defined $initial; |
| 204 | return $initial; |
| 205 | } |
| 206 | } |
| 207 | |
| 208 | sub get_empty_tree { |
| 209 | return '4b825dc642cb6eb9a060e54bf8d69288fbee4904'; |
| 210 | } |
| 211 | |
Jeff King | 954312a | 2013-10-25 02:52:30 -0400 | [diff] [blame] | 212 | sub get_diff_reference { |
| 213 | my $ref = shift; |
| 214 | if (defined $ref and $ref ne 'HEAD') { |
| 215 | return $ref; |
| 216 | } elsif (is_initial_commit()) { |
| 217 | return get_empty_tree(); |
| 218 | } else { |
| 219 | return 'HEAD'; |
| 220 | } |
| 221 | } |
| 222 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 223 | # Returns list of hashes, contents of each of which are: |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 224 | # VALUE: pathname |
| 225 | # BINARY: is a binary path |
| 226 | # INDEX: is index different from HEAD? |
| 227 | # FILE: is file different from index? |
| 228 | # INDEX_ADDDEL: is it add/delete between HEAD and index? |
| 229 | # FILE_ADDDEL: is it add/delete between index and file? |
Jeff King | 4066bd6 | 2012-04-05 08:30:08 -0400 | [diff] [blame] | 230 | # UNMERGED: is the path unmerged |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 231 | |
| 232 | sub list_modified { |
| 233 | my ($only) = @_; |
| 234 | my (%data, @return); |
| 235 | my ($add, $del, $adddel, $file); |
| 236 | |
Jeff King | 954312a | 2013-10-25 02:52:30 -0400 | [diff] [blame] | 237 | my $reference = get_diff_reference($patch_mode_revision); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 238 | for (run_cmd_pipe(qw(git diff-index --cached |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 239 | --numstat --summary), $reference, |
Jeff King | 7288e12 | 2017-03-14 12:30:24 -0400 | [diff] [blame] | 240 | '--', @ARGV)) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 241 | if (($add, $del, $file) = |
| 242 | /^([-\d]+) ([-\d]+) (.*)/) { |
| 243 | my ($change, $bin); |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 244 | $file = unquote_path($file); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 245 | if ($add eq '-' && $del eq '-') { |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 246 | $change = __('binary'); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 247 | $bin = 1; |
| 248 | } |
| 249 | else { |
| 250 | $change = "+$add/-$del"; |
| 251 | } |
| 252 | $data{$file} = { |
| 253 | INDEX => $change, |
| 254 | BINARY => $bin, |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 255 | FILE => __('nothing'), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 256 | } |
| 257 | } |
| 258 | elsif (($adddel, $file) = |
| 259 | /^ (create|delete) mode [0-7]+ (.*)$/) { |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 260 | $file = unquote_path($file); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 261 | $data{$file}{INDEX_ADDDEL} = $adddel; |
| 262 | } |
| 263 | } |
| 264 | |
Nguyễn Thái Ngọc Duy | 12434ef | 2018-01-13 19:10:38 +0700 | [diff] [blame] | 265 | for (run_cmd_pipe(qw(git diff-files --ignore-submodules=dirty --numstat --summary --raw --), @ARGV)) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 266 | if (($add, $del, $file) = |
| 267 | /^([-\d]+) ([-\d]+) (.*)/) { |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 268 | $file = unquote_path($file); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 269 | my ($change, $bin); |
| 270 | if ($add eq '-' && $del eq '-') { |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 271 | $change = __('binary'); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 272 | $bin = 1; |
| 273 | } |
| 274 | else { |
| 275 | $change = "+$add/-$del"; |
| 276 | } |
| 277 | $data{$file}{FILE} = $change; |
| 278 | if ($bin) { |
| 279 | $data{$file}{BINARY} = 1; |
| 280 | } |
| 281 | } |
| 282 | elsif (($adddel, $file) = |
| 283 | /^ (create|delete) mode [0-7]+ (.*)$/) { |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 284 | $file = unquote_path($file); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 285 | $data{$file}{FILE_ADDDEL} = $adddel; |
| 286 | } |
Jeff King | 4066bd6 | 2012-04-05 08:30:08 -0400 | [diff] [blame] | 287 | elsif (/^:[0-7]+ [0-7]+ [0-9a-f]+ [0-9a-f]+ (.) (.*)$/) { |
| 288 | $file = unquote_path($2); |
| 289 | if (!exists $data{$file}) { |
| 290 | $data{$file} = +{ |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 291 | INDEX => __('unchanged'), |
Jeff King | 4066bd6 | 2012-04-05 08:30:08 -0400 | [diff] [blame] | 292 | BINARY => 0, |
| 293 | }; |
| 294 | } |
| 295 | if ($1 eq 'U') { |
| 296 | $data{$file}{UNMERGED} = 1; |
| 297 | } |
| 298 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 299 | } |
| 300 | |
| 301 | for (sort keys %data) { |
| 302 | my $it = $data{$_}; |
| 303 | |
| 304 | if ($only) { |
| 305 | if ($only eq 'index-only') { |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 306 | next if ($it->{INDEX} eq __('unchanged')); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 307 | } |
| 308 | if ($only eq 'file-only') { |
Vasco Almeida | 55aa044 | 2016-12-14 11:54:34 -0100 | [diff] [blame] | 309 | next if ($it->{FILE} eq __('nothing')); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 310 | } |
| 311 | } |
| 312 | push @return, +{ |
| 313 | VALUE => $_, |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 314 | %$it, |
| 315 | }; |
| 316 | } |
| 317 | return @return; |
| 318 | } |
| 319 | |
| 320 | sub find_unique { |
| 321 | my ($string, @stuff) = @_; |
| 322 | my $found = undef; |
| 323 | for (my $i = 0; $i < @stuff; $i++) { |
| 324 | my $it = $stuff[$i]; |
| 325 | my $hit = undef; |
| 326 | if (ref $it) { |
| 327 | if ((ref $it) eq 'ARRAY') { |
| 328 | $it = $it->[0]; |
| 329 | } |
| 330 | else { |
| 331 | $it = $it->{VALUE}; |
| 332 | } |
| 333 | } |
| 334 | eval { |
| 335 | if ($it =~ /^$string/) { |
| 336 | $hit = 1; |
| 337 | }; |
| 338 | }; |
| 339 | if (defined $hit && defined $found) { |
| 340 | return undef; |
| 341 | } |
| 342 | if ($hit) { |
| 343 | $found = $i + 1; |
| 344 | } |
| 345 | } |
| 346 | return $found; |
| 347 | } |
| 348 | |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 349 | # inserts string into trie and updates count for each character |
| 350 | sub update_trie { |
| 351 | my ($trie, $string) = @_; |
| 352 | foreach (split //, $string) { |
| 353 | $trie = $trie->{$_} ||= {COUNT => 0}; |
| 354 | $trie->{COUNT}++; |
| 355 | } |
| 356 | } |
| 357 | |
| 358 | # returns an array of tuples (prefix, remainder) |
| 359 | sub find_unique_prefixes { |
| 360 | my @stuff = @_; |
| 361 | my @return = (); |
| 362 | |
| 363 | # any single prefix exceeding the soft limit is omitted |
| 364 | # if any prefix exceeds the hard limit all are omitted |
| 365 | # 0 indicates no limit |
| 366 | my $soft_limit = 0; |
| 367 | my $hard_limit = 3; |
| 368 | |
| 369 | # build a trie modelling all possible options |
| 370 | my %trie; |
| 371 | foreach my $print (@stuff) { |
| 372 | if ((ref $print) eq 'ARRAY') { |
| 373 | $print = $print->[0]; |
| 374 | } |
Wincent Colaiuta | 6332098 | 2007-12-02 14:44:11 +0100 | [diff] [blame] | 375 | elsif ((ref $print) eq 'HASH') { |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 376 | $print = $print->{VALUE}; |
| 377 | } |
| 378 | update_trie(\%trie, $print); |
| 379 | push @return, $print; |
| 380 | } |
| 381 | |
| 382 | # use the trie to find the unique prefixes |
| 383 | for (my $i = 0; $i < @return; $i++) { |
| 384 | my $ret = $return[$i]; |
| 385 | my @letters = split //, $ret; |
| 386 | my %search = %trie; |
| 387 | my ($prefix, $remainder); |
| 388 | my $j; |
| 389 | for ($j = 0; $j < @letters; $j++) { |
| 390 | my $letter = $letters[$j]; |
| 391 | if ($search{$letter}{COUNT} == 1) { |
| 392 | $prefix = substr $ret, 0, $j + 1; |
| 393 | $remainder = substr $ret, $j + 1; |
| 394 | last; |
| 395 | } |
| 396 | else { |
| 397 | my $prefix = substr $ret, 0, $j; |
| 398 | return () |
| 399 | if ($hard_limit && $j + 1 > $hard_limit); |
| 400 | } |
| 401 | %search = %{$search{$letter}}; |
| 402 | } |
Junio C Hamano | 8851f48 | 2009-02-16 22:43:43 -0800 | [diff] [blame] | 403 | if (ord($letters[0]) > 127 || |
| 404 | ($soft_limit && $j + 1 > $soft_limit)) { |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 405 | $prefix = undef; |
| 406 | $remainder = $ret; |
| 407 | } |
| 408 | $return[$i] = [$prefix, $remainder]; |
| 409 | } |
| 410 | return @return; |
| 411 | } |
| 412 | |
Wincent Colaiuta | 6332098 | 2007-12-02 14:44:11 +0100 | [diff] [blame] | 413 | # filters out prefixes which have special meaning to list_and_choose() |
| 414 | sub is_valid_prefix { |
| 415 | my $prefix = shift; |
| 416 | return (defined $prefix) && |
| 417 | !($prefix =~ /[\s,]/) && # separators |
| 418 | !($prefix =~ /^-/) && # deselection |
| 419 | !($prefix =~ /^\d+/) && # selection |
Wincent Colaiuta | 7e018be | 2007-12-03 09:09:43 +0100 | [diff] [blame] | 420 | ($prefix ne '*') && # "all" wildcard |
| 421 | ($prefix ne '?'); # prompt help |
Wincent Colaiuta | 6332098 | 2007-12-02 14:44:11 +0100 | [diff] [blame] | 422 | } |
| 423 | |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 424 | # given a prefix/remainder tuple return a string with the prefix highlighted |
| 425 | # for now use square brackets; later might use ANSI colors (underline, bold) |
| 426 | sub highlight_prefix { |
| 427 | my $prefix = shift; |
| 428 | my $remainder = shift; |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 429 | |
| 430 | if (!defined $prefix) { |
| 431 | return $remainder; |
| 432 | } |
| 433 | |
| 434 | if (!is_valid_prefix($prefix)) { |
| 435 | return "$prefix$remainder"; |
| 436 | } |
| 437 | |
Jeff King | f87e310 | 2008-01-04 03:35:21 -0500 | [diff] [blame] | 438 | if (!$menu_use_color) { |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 439 | return "[$prefix]$remainder"; |
| 440 | } |
| 441 | |
| 442 | return "$prompt_color$prefix$normal_color$remainder"; |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 443 | } |
| 444 | |
Thomas Rast | a301973 | 2009-02-05 09:28:27 +0100 | [diff] [blame] | 445 | sub error_msg { |
| 446 | print STDERR colored $error_color, @_; |
| 447 | } |
| 448 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 449 | sub list_and_choose { |
| 450 | my ($opts, @stuff) = @_; |
| 451 | my (@chosen, @return); |
Alexander Kuleshov | a9c4641 | 2015-01-22 14:39:44 +0600 | [diff] [blame] | 452 | if (!@stuff) { |
| 453 | return @return; |
| 454 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 455 | my $i; |
Wincent Colaiuta | 14cb503 | 2007-11-29 13:00:38 +0100 | [diff] [blame] | 456 | my @prefixes = find_unique_prefixes(@stuff) unless $opts->{LIST_ONLY}; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 457 | |
| 458 | TOPLOOP: |
| 459 | while (1) { |
| 460 | my $last_lf = 0; |
| 461 | |
| 462 | if ($opts->{HEADER}) { |
| 463 | if (!$opts->{LIST_FLAT}) { |
| 464 | print " "; |
| 465 | } |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 466 | print colored $header_color, "$opts->{HEADER}\n"; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 467 | } |
| 468 | for ($i = 0; $i < @stuff; $i++) { |
| 469 | my $chosen = $chosen[$i] ? '*' : ' '; |
| 470 | my $print = $stuff[$i]; |
Wincent Colaiuta | 6332098 | 2007-12-02 14:44:11 +0100 | [diff] [blame] | 471 | my $ref = ref $print; |
| 472 | my $highlighted = highlight_prefix(@{$prefixes[$i]}) |
| 473 | if @prefixes; |
| 474 | if ($ref eq 'ARRAY') { |
| 475 | $print = $highlighted || $print->[0]; |
| 476 | } |
| 477 | elsif ($ref eq 'HASH') { |
| 478 | my $value = $highlighted || $print->{VALUE}; |
| 479 | $print = sprintf($status_fmt, |
| 480 | $print->{INDEX}, |
| 481 | $print->{FILE}, |
| 482 | $value); |
| 483 | } |
| 484 | else { |
| 485 | $print = $highlighted || $print; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 486 | } |
| 487 | printf("%s%2d: %s", $chosen, $i+1, $print); |
| 488 | if (($opts->{LIST_FLAT}) && |
| 489 | (($i + 1) % ($opts->{LIST_FLAT}))) { |
| 490 | print "\t"; |
| 491 | $last_lf = 0; |
| 492 | } |
| 493 | else { |
| 494 | print "\n"; |
| 495 | $last_lf = 1; |
| 496 | } |
| 497 | } |
| 498 | if (!$last_lf) { |
| 499 | print "\n"; |
| 500 | } |
| 501 | |
| 502 | return if ($opts->{LIST_ONLY}); |
| 503 | |
Junio C Hamano | b4c61ed | 2007-12-05 00:50:23 -0800 | [diff] [blame] | 504 | print colored $prompt_color, $opts->{PROMPT}; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 505 | if ($opts->{SINGLETON}) { |
| 506 | print "> "; |
| 507 | } |
| 508 | else { |
| 509 | print ">> "; |
| 510 | } |
| 511 | my $line = <STDIN>; |
Jean-Luc Herren | c95c024 | 2007-09-26 15:56:19 +0200 | [diff] [blame] | 512 | if (!$line) { |
| 513 | print "\n"; |
| 514 | $opts->{ON_EOF}->() if $opts->{ON_EOF}; |
| 515 | last; |
| 516 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 517 | chomp $line; |
Jean-Luc Herren | 6a6eb3d | 2007-09-26 16:05:01 +0200 | [diff] [blame] | 518 | last if $line eq ''; |
Wincent Colaiuta | 7e018be | 2007-12-03 09:09:43 +0100 | [diff] [blame] | 519 | if ($line eq '?') { |
| 520 | $opts->{SINGLETON} ? |
| 521 | singleton_prompt_help_cmd() : |
| 522 | prompt_help_cmd(); |
| 523 | next TOPLOOP; |
| 524 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 525 | for my $choice (split(/[\s,]+/, $line)) { |
| 526 | my $choose = 1; |
| 527 | my ($bottom, $top); |
| 528 | |
| 529 | # Input that begins with '-'; unchoose |
| 530 | if ($choice =~ s/^-//) { |
| 531 | $choose = 0; |
| 532 | } |
Ciaran McCreesh | 1e5aaa6 | 2008-07-14 19:29:37 +0100 | [diff] [blame] | 533 | # A range can be specified like 5-7 or 5-. |
| 534 | if ($choice =~ /^(\d+)-(\d*)$/) { |
| 535 | ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 536 | } |
| 537 | elsif ($choice =~ /^\d+$/) { |
| 538 | $bottom = $top = $choice; |
| 539 | } |
| 540 | elsif ($choice eq '*') { |
| 541 | $bottom = 1; |
| 542 | $top = 1 + @stuff; |
| 543 | } |
| 544 | else { |
| 545 | $bottom = $top = find_unique($choice, @stuff); |
| 546 | if (!defined $bottom) { |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 547 | error_msg sprintf(__("Huh (%s)?\n"), $choice); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 548 | next TOPLOOP; |
| 549 | } |
| 550 | } |
| 551 | if ($opts->{SINGLETON} && $bottom != $top) { |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 552 | error_msg sprintf(__("Huh (%s)?\n"), $choice); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 553 | next TOPLOOP; |
| 554 | } |
| 555 | for ($i = $bottom-1; $i <= $top-1; $i++) { |
Jean-Luc Herren | 6a6eb3d | 2007-09-26 16:05:01 +0200 | [diff] [blame] | 556 | next if (@stuff <= $i || $i < 0); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 557 | $chosen[$i] = $choose; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 558 | } |
| 559 | } |
Junio C Hamano | 12db334 | 2007-11-22 01:47:13 -0800 | [diff] [blame] | 560 | last if ($opts->{IMMEDIATE} || $line eq '*'); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 561 | } |
| 562 | for ($i = 0; $i < @stuff; $i++) { |
| 563 | if ($chosen[$i]) { |
| 564 | push @return, $stuff[$i]; |
| 565 | } |
| 566 | } |
| 567 | return @return; |
| 568 | } |
| 569 | |
Wincent Colaiuta | 7e018be | 2007-12-03 09:09:43 +0100 | [diff] [blame] | 570 | sub singleton_prompt_help_cmd { |
Vasco Almeida | 5fa8326 | 2016-12-14 11:54:26 -0100 | [diff] [blame] | 571 | print colored $help_color, __ <<'EOF' ; |
Wincent Colaiuta | 7e018be | 2007-12-03 09:09:43 +0100 | [diff] [blame] | 572 | Prompt help: |
| 573 | 1 - select a numbered item |
| 574 | foo - select item based on unique prefix |
| 575 | - (empty) select nothing |
| 576 | EOF |
| 577 | } |
| 578 | |
| 579 | sub prompt_help_cmd { |
Vasco Almeida | 5fa8326 | 2016-12-14 11:54:26 -0100 | [diff] [blame] | 580 | print colored $help_color, __ <<'EOF' ; |
Wincent Colaiuta | 7e018be | 2007-12-03 09:09:43 +0100 | [diff] [blame] | 581 | Prompt help: |
| 582 | 1 - select a single item |
| 583 | 3-5 - select a range of items |
| 584 | 2-3,6-9 - select multiple ranges |
| 585 | foo - select item based on unique prefix |
| 586 | -... - unselect specified items |
| 587 | * - choose all items |
| 588 | - (empty) finish selecting |
| 589 | EOF |
| 590 | } |
| 591 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 592 | sub status_cmd { |
| 593 | list_and_choose({ LIST_ONLY => 1, HEADER => $status_head }, |
| 594 | list_modified()); |
| 595 | print "\n"; |
| 596 | } |
| 597 | |
| 598 | sub say_n_paths { |
| 599 | my $did = shift @_; |
| 600 | my $cnt = scalar @_; |
Vasco Almeida | c4a85c3 | 2016-12-14 11:54:29 -0100 | [diff] [blame] | 601 | if ($did eq 'added') { |
| 602 | printf(__n("added %d path\n", "added %d paths\n", |
| 603 | $cnt), $cnt); |
| 604 | } elsif ($did eq 'updated') { |
| 605 | printf(__n("updated %d path\n", "updated %d paths\n", |
| 606 | $cnt), $cnt); |
| 607 | } elsif ($did eq 'reverted') { |
| 608 | printf(__n("reverted %d path\n", "reverted %d paths\n", |
| 609 | $cnt), $cnt); |
| 610 | } else { |
| 611 | printf(__n("touched %d path\n", "touched %d paths\n", |
| 612 | $cnt), $cnt); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 613 | } |
| 614 | } |
| 615 | |
| 616 | sub update_cmd { |
| 617 | my @mods = list_modified('file-only'); |
| 618 | return if (!@mods); |
| 619 | |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 620 | my @update = list_and_choose({ PROMPT => __('Update'), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 621 | HEADER => $status_head, }, |
| 622 | @mods); |
| 623 | if (@update) { |
Junio C Hamano | a4f7112 | 2007-02-07 10:56:38 -0800 | [diff] [blame] | 624 | system(qw(git update-index --add --remove --), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 625 | map { $_->{VALUE} } @update); |
| 626 | say_n_paths('updated', @update); |
| 627 | } |
| 628 | print "\n"; |
| 629 | } |
| 630 | |
| 631 | sub revert_cmd { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 632 | my @update = list_and_choose({ PROMPT => __('Revert'), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 633 | HEADER => $status_head, }, |
| 634 | list_modified()); |
| 635 | if (@update) { |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 636 | if (is_initial_commit()) { |
| 637 | system(qw(git rm --cached), |
| 638 | map { $_->{VALUE} } @update); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 639 | } |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 640 | else { |
| 641 | my @lines = run_cmd_pipe(qw(git ls-tree HEAD --), |
| 642 | map { $_->{VALUE} } @update); |
| 643 | my $fh; |
| 644 | open $fh, '| git update-index --index-info' |
| 645 | or die; |
| 646 | for (@lines) { |
| 647 | print $fh $_; |
| 648 | } |
| 649 | close($fh); |
| 650 | for (@update) { |
| 651 | if ($_->{INDEX_ADDDEL} && |
| 652 | $_->{INDEX_ADDDEL} eq 'create') { |
| 653 | system(qw(git update-index --force-remove --), |
| 654 | $_->{VALUE}); |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 655 | printf(__("note: %s is untracked now.\n"), $_->{VALUE}); |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 656 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 657 | } |
| 658 | } |
| 659 | refresh(); |
| 660 | say_n_paths('reverted', @update); |
| 661 | } |
| 662 | print "\n"; |
| 663 | } |
| 664 | |
| 665 | sub add_untracked_cmd { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 666 | my @add = list_and_choose({ PROMPT => __('Add untracked') }, |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 667 | list_untracked()); |
| 668 | if (@add) { |
| 669 | system(qw(git update-index --add --), @add); |
| 670 | say_n_paths('added', @add); |
Alexander Kuleshov | a9c4641 | 2015-01-22 14:39:44 +0600 | [diff] [blame] | 671 | } else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 672 | print __("No untracked files.\n"); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 673 | } |
| 674 | print "\n"; |
| 675 | } |
| 676 | |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 677 | sub run_git_apply { |
| 678 | my $cmd = shift; |
| 679 | my $fh; |
Phillip Wood | 3a8522f | 2018-03-05 10:56:30 +0000 | [diff] [blame] | 680 | open $fh, '| git ' . $cmd . " --allow-overlap"; |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 681 | print $fh @_; |
| 682 | return close $fh; |
| 683 | } |
| 684 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 685 | sub parse_diff { |
| 686 | my ($path) = @_; |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 687 | my @diff_cmd = split(" ", $patch_mode_flavour{DIFF}); |
John Keeping | 2cc0f53 | 2013-06-12 19:44:10 +0100 | [diff] [blame] | 688 | if (defined $diff_algorithm) { |
Junio C Hamano | e5c2909 | 2013-06-23 12:19:05 -0700 | [diff] [blame] | 689 | splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}"; |
John Keeping | 2cc0f53 | 2013-06-12 19:44:10 +0100 | [diff] [blame] | 690 | } |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 691 | if (defined $patch_mode_revision) { |
Jeff King | 954312a | 2013-10-25 02:52:30 -0400 | [diff] [blame] | 692 | push @diff_cmd, get_diff_reference($patch_mode_revision); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 693 | } |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 694 | my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path); |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 695 | my @colored = (); |
| 696 | if ($diff_use_color) { |
Jeff King | 0114384 | 2016-02-27 00:37:06 -0500 | [diff] [blame] | 697 | my @display_cmd = ("git", @diff_cmd, qw(--color --), $path); |
| 698 | if (defined $diff_filter) { |
| 699 | # quotemeta is overkill, but sufficient for shell-quoting |
| 700 | my $diff = join(' ', map { quotemeta } @display_cmd); |
| 701 | @display_cmd = ("$diff | $diff_filter"); |
| 702 | } |
| 703 | |
| 704 | @colored = run_cmd_pipe(@display_cmd); |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 705 | } |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 706 | my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' }; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 707 | |
Jeff King | 42f7d45 | 2018-03-03 00:58:49 -0500 | [diff] [blame] | 708 | if (@colored && @colored != @diff) { |
| 709 | print STDERR |
| 710 | "fatal: mismatched output from interactive.diffFilter\n", |
| 711 | "hint: Your filter must maintain a one-to-one correspondence\n", |
| 712 | "hint: between its input and output lines.\n"; |
| 713 | exit 1; |
| 714 | } |
| 715 | |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 716 | for (my $i = 0; $i < @diff; $i++) { |
| 717 | if ($diff[$i] =~ /^@@ /) { |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 718 | push @hunk, { TEXT => [], DISPLAY => [], |
| 719 | TYPE => 'hunk' }; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 720 | } |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 721 | push @{$hunk[-1]{TEXT}}, $diff[$i]; |
| 722 | push @{$hunk[-1]{DISPLAY}}, |
Jeff King | 0114384 | 2016-02-27 00:37:06 -0500 | [diff] [blame] | 723 | (@colored ? $colored[$i] : $diff[$i]); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 724 | } |
| 725 | return @hunk; |
| 726 | } |
| 727 | |
Jeff King | b717a62 | 2008-03-27 03:30:43 -0400 | [diff] [blame] | 728 | sub parse_diff_header { |
| 729 | my $src = shift; |
| 730 | |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 731 | my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' }; |
| 732 | my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' }; |
Jeff King | 24ab81a | 2009-10-27 20:52:57 -0400 | [diff] [blame] | 733 | my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' }; |
Jeff King | b717a62 | 2008-03-27 03:30:43 -0400 | [diff] [blame] | 734 | |
| 735 | for (my $i = 0; $i < @{$src->{TEXT}}; $i++) { |
Jeff King | 24ab81a | 2009-10-27 20:52:57 -0400 | [diff] [blame] | 736 | my $dest = |
| 737 | $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode : |
| 738 | $src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion : |
| 739 | $head; |
Jeff King | b717a62 | 2008-03-27 03:30:43 -0400 | [diff] [blame] | 740 | push @{$dest->{TEXT}}, $src->{TEXT}->[$i]; |
| 741 | push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i]; |
| 742 | } |
Jeff King | 24ab81a | 2009-10-27 20:52:57 -0400 | [diff] [blame] | 743 | return ($head, $mode, $deletion); |
Jeff King | b717a62 | 2008-03-27 03:30:43 -0400 | [diff] [blame] | 744 | } |
| 745 | |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 746 | sub hunk_splittable { |
| 747 | my ($text) = @_; |
| 748 | |
| 749 | my @s = split_hunk($text); |
| 750 | return (1 < @s); |
| 751 | } |
| 752 | |
| 753 | sub parse_hunk_header { |
| 754 | my ($line) = @_; |
| 755 | my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = |
Jean-Luc Herren | 7288ed8 | 2007-10-09 21:29:26 +0200 | [diff] [blame] | 756 | $line =~ /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/; |
| 757 | $o_cnt = 1 unless defined $o_cnt; |
| 758 | $n_cnt = 1 unless defined $n_cnt; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 759 | return ($o_ofs, $o_cnt, $n_ofs, $n_cnt); |
| 760 | } |
| 761 | |
Phillip Wood | 492e60c | 2018-02-19 11:29:02 +0000 | [diff] [blame] | 762 | sub format_hunk_header { |
| 763 | my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = @_; |
| 764 | return ("@@ -$o_ofs" . |
| 765 | (($o_cnt != 1) ? ",$o_cnt" : '') . |
| 766 | " +$n_ofs" . |
| 767 | (($n_cnt != 1) ? ",$n_cnt" : '') . |
| 768 | " @@\n"); |
| 769 | } |
| 770 | |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 771 | sub split_hunk { |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 772 | my ($text, $display) = @_; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 773 | my @split = (); |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 774 | if (!defined $display) { |
| 775 | $display = $text; |
| 776 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 777 | # If there are context lines in the middle of a hunk, |
| 778 | # it can be split, but we would need to take care of |
| 779 | # overlaps later. |
| 780 | |
Jean-Luc Herren | 7b40a45 | 2007-10-09 21:34:17 +0200 | [diff] [blame] | 781 | my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]); |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 782 | my $hunk_start = 1; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 783 | |
| 784 | OUTER: |
| 785 | while (1) { |
| 786 | my $next_hunk_start = undef; |
| 787 | my $i = $hunk_start - 1; |
| 788 | my $this = +{ |
| 789 | TEXT => [], |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 790 | DISPLAY => [], |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 791 | TYPE => 'hunk', |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 792 | OLD => $o_ofs, |
| 793 | NEW => $n_ofs, |
| 794 | OCNT => 0, |
| 795 | NCNT => 0, |
| 796 | ADDDEL => 0, |
| 797 | POSTCTX => 0, |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 798 | USE => undef, |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 799 | }; |
| 800 | |
| 801 | while (++$i < @$text) { |
| 802 | my $line = $text->[$i]; |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 803 | my $display = $display->[$i]; |
Phillip Wood | b3e0fcf | 2018-03-05 10:56:29 +0000 | [diff] [blame] | 804 | if ($line =~ /^\\/) { |
| 805 | push @{$this->{TEXT}}, $line; |
| 806 | push @{$this->{DISPLAY}}, $display; |
| 807 | next; |
| 808 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 809 | if ($line =~ /^ /) { |
| 810 | if ($this->{ADDDEL} && |
| 811 | !defined $next_hunk_start) { |
| 812 | # We have seen leading context and |
| 813 | # adds/dels and then here is another |
| 814 | # context, which is trailing for this |
| 815 | # split hunk and leading for the next |
| 816 | # one. |
| 817 | $next_hunk_start = $i; |
| 818 | } |
| 819 | push @{$this->{TEXT}}, $line; |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 820 | push @{$this->{DISPLAY}}, $display; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 821 | $this->{OCNT}++; |
| 822 | $this->{NCNT}++; |
| 823 | if (defined $next_hunk_start) { |
| 824 | $this->{POSTCTX}++; |
| 825 | } |
| 826 | next; |
| 827 | } |
| 828 | |
| 829 | # add/del |
| 830 | if (defined $next_hunk_start) { |
| 831 | # We are done with the current hunk and |
| 832 | # this is the first real change for the |
| 833 | # next split one. |
| 834 | $hunk_start = $next_hunk_start; |
| 835 | $o_ofs = $this->{OLD} + $this->{OCNT}; |
| 836 | $n_ofs = $this->{NEW} + $this->{NCNT}; |
| 837 | $o_ofs -= $this->{POSTCTX}; |
| 838 | $n_ofs -= $this->{POSTCTX}; |
| 839 | push @split, $this; |
| 840 | redo OUTER; |
| 841 | } |
| 842 | push @{$this->{TEXT}}, $line; |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 843 | push @{$this->{DISPLAY}}, $display; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 844 | $this->{ADDDEL}++; |
| 845 | if ($line =~ /^-/) { |
| 846 | $this->{OCNT}++; |
| 847 | } |
| 848 | else { |
| 849 | $this->{NCNT}++; |
| 850 | } |
| 851 | } |
| 852 | |
| 853 | push @split, $this; |
| 854 | last; |
| 855 | } |
| 856 | |
| 857 | for my $hunk (@split) { |
| 858 | $o_ofs = $hunk->{OLD}; |
| 859 | $n_ofs = $hunk->{NEW}; |
Jean-Luc Herren | 7b40a45 | 2007-10-09 21:34:17 +0200 | [diff] [blame] | 860 | my $o_cnt = $hunk->{OCNT}; |
| 861 | my $n_cnt = $hunk->{NCNT}; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 862 | |
Phillip Wood | 492e60c | 2018-02-19 11:29:02 +0000 | [diff] [blame] | 863 | my $head = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt); |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 864 | my $display_head = $head; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 865 | unshift @{$hunk->{TEXT}}, $head; |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 866 | if ($diff_use_color) { |
| 867 | $display_head = colored($fraginfo_color, $head); |
| 868 | } |
| 869 | unshift @{$hunk->{DISPLAY}}, $display_head; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 870 | } |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 871 | return @split; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 872 | } |
| 873 | |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 874 | sub find_last_o_ctx { |
| 875 | my ($it) = @_; |
| 876 | my $text = $it->{TEXT}; |
| 877 | my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]); |
| 878 | my $i = @{$text}; |
| 879 | my $last_o_ctx = $o_ofs + $o_cnt; |
| 880 | while (0 < --$i) { |
| 881 | my $line = $text->[$i]; |
| 882 | if ($line =~ /^ /) { |
| 883 | $last_o_ctx--; |
| 884 | next; |
| 885 | } |
| 886 | last; |
| 887 | } |
| 888 | return $last_o_ctx; |
| 889 | } |
| 890 | |
| 891 | sub merge_hunk { |
| 892 | my ($prev, $this) = @_; |
| 893 | my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) = |
| 894 | parse_hunk_header($prev->{TEXT}[0]); |
| 895 | my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) = |
| 896 | parse_hunk_header($this->{TEXT}[0]); |
| 897 | |
| 898 | my (@line, $i, $ofs, $o_cnt, $n_cnt); |
| 899 | $ofs = $o0_ofs; |
| 900 | $o_cnt = $n_cnt = 0; |
| 901 | for ($i = 1; $i < @{$prev->{TEXT}}; $i++) { |
| 902 | my $line = $prev->{TEXT}[$i]; |
| 903 | if ($line =~ /^\+/) { |
| 904 | $n_cnt++; |
| 905 | push @line, $line; |
| 906 | next; |
Phillip Wood | b3e0fcf | 2018-03-05 10:56:29 +0000 | [diff] [blame] | 907 | } elsif ($line =~ /^\\/) { |
| 908 | push @line, $line; |
| 909 | next; |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 910 | } |
| 911 | |
| 912 | last if ($o1_ofs <= $ofs); |
| 913 | |
| 914 | $o_cnt++; |
| 915 | $ofs++; |
| 916 | if ($line =~ /^ /) { |
| 917 | $n_cnt++; |
| 918 | } |
| 919 | push @line, $line; |
| 920 | } |
| 921 | |
| 922 | for ($i = 1; $i < @{$this->{TEXT}}; $i++) { |
| 923 | my $line = $this->{TEXT}[$i]; |
| 924 | if ($line =~ /^\+/) { |
| 925 | $n_cnt++; |
| 926 | push @line, $line; |
| 927 | next; |
Phillip Wood | b3e0fcf | 2018-03-05 10:56:29 +0000 | [diff] [blame] | 928 | } elsif ($line =~ /^\\/) { |
| 929 | push @line, $line; |
| 930 | next; |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 931 | } |
| 932 | $ofs++; |
| 933 | $o_cnt++; |
| 934 | if ($line =~ /^ /) { |
| 935 | $n_cnt++; |
| 936 | } |
| 937 | push @line, $line; |
| 938 | } |
Phillip Wood | 492e60c | 2018-02-19 11:29:02 +0000 | [diff] [blame] | 939 | my $head = format_hunk_header($o0_ofs, $o_cnt, $n0_ofs, $n_cnt); |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 940 | @{$prev->{TEXT}} = ($head, @line); |
| 941 | } |
| 942 | |
| 943 | sub coalesce_overlapping_hunks { |
| 944 | my (@in) = @_; |
| 945 | my @out = (); |
| 946 | |
| 947 | my ($last_o_ctx, $last_was_dirty); |
Phillip Wood | fecc6f3 | 2018-03-01 10:51:00 +0000 | [diff] [blame] | 948 | my $ofs_delta = 0; |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 949 | |
Phillip Wood | fecc6f3 | 2018-03-01 10:51:00 +0000 | [diff] [blame] | 950 | for (@in) { |
Thomas Rast | 3d79216 | 2009-08-15 15:56:39 +0200 | [diff] [blame] | 951 | if ($_->{TYPE} ne 'hunk') { |
| 952 | push @out, $_; |
| 953 | next; |
| 954 | } |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 955 | my $text = $_->{TEXT}; |
Phillip Wood | fecc6f3 | 2018-03-01 10:51:00 +0000 | [diff] [blame] | 956 | my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = |
| 957 | parse_hunk_header($text->[0]); |
| 958 | unless ($_->{USE}) { |
| 959 | $ofs_delta += $o_cnt - $n_cnt; |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 960 | # If this hunk has been edited then subtract |
| 961 | # the delta that is due to the edit. |
| 962 | if ($_->{OFS_DELTA}) { |
| 963 | $ofs_delta -= $_->{OFS_DELTA}; |
| 964 | } |
Phillip Wood | fecc6f3 | 2018-03-01 10:51:00 +0000 | [diff] [blame] | 965 | next; |
| 966 | } |
| 967 | if ($ofs_delta) { |
| 968 | $n_ofs += $ofs_delta; |
| 969 | $_->{TEXT}->[0] = format_hunk_header($o_ofs, $o_cnt, |
| 970 | $n_ofs, $n_cnt); |
| 971 | } |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 972 | # If this hunk was edited then adjust the offset delta |
| 973 | # to reflect the edit. |
| 974 | if ($_->{OFS_DELTA}) { |
| 975 | $ofs_delta += $_->{OFS_DELTA}; |
| 976 | } |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 977 | if (defined $last_o_ctx && |
| 978 | $o_ofs <= $last_o_ctx && |
| 979 | !$_->{DIRTY} && |
| 980 | !$last_was_dirty) { |
| 981 | merge_hunk($out[-1], $_); |
| 982 | } |
| 983 | else { |
| 984 | push @out, $_; |
| 985 | } |
| 986 | $last_o_ctx = find_last_o_ctx($out[-1]); |
| 987 | $last_was_dirty = $_->{DIRTY}; |
| 988 | } |
| 989 | return @out; |
| 990 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 991 | |
Jeff King | e1327ed | 2010-02-22 20:05:44 -0500 | [diff] [blame] | 992 | sub reassemble_patch { |
| 993 | my $head = shift; |
| 994 | my @patch; |
| 995 | |
| 996 | # Include everything in the header except the beginning of the diff. |
| 997 | push @patch, (grep { !/^[-+]{3}/ } @$head); |
| 998 | |
| 999 | # Then include any headers from the hunk lines, which must |
| 1000 | # come before any actual hunk. |
| 1001 | while (@_ && $_[0] !~ /^@/) { |
| 1002 | push @patch, shift; |
| 1003 | } |
| 1004 | |
| 1005 | # Then begin the diff. |
| 1006 | push @patch, grep { /^[-+]{3}/ } @$head; |
| 1007 | |
| 1008 | # And then the actual hunks. |
| 1009 | push @patch, @_; |
| 1010 | |
| 1011 | return @patch; |
| 1012 | } |
| 1013 | |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1014 | sub color_diff { |
| 1015 | return map { |
| 1016 | colored((/^@/ ? $fraginfo_color : |
| 1017 | /^\+/ ? $diff_new_color : |
| 1018 | /^-/ ? $diff_old_color : |
| 1019 | $diff_plain_color), |
| 1020 | $_); |
| 1021 | } @_; |
| 1022 | } |
| 1023 | |
Vasco Almeida | c9d9616 | 2016-12-14 11:54:32 -0100 | [diff] [blame] | 1024 | my %edit_hunk_manually_modes = ( |
| 1025 | stage => N__( |
| 1026 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1027 | marked for staging."), |
| 1028 | stash => N__( |
| 1029 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1030 | marked for stashing."), |
| 1031 | reset_head => N__( |
| 1032 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1033 | marked for unstaging."), |
| 1034 | reset_nothead => N__( |
| 1035 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1036 | marked for applying."), |
| 1037 | checkout_index => N__( |
| 1038 | "If the patch applies cleanly, the edited hunk will immediately be |
Ralf Thielow | 0301f1f | 2017-04-13 18:41:12 +0200 | [diff] [blame] | 1039 | marked for discarding."), |
Vasco Almeida | c9d9616 | 2016-12-14 11:54:32 -0100 | [diff] [blame] | 1040 | checkout_head => N__( |
| 1041 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1042 | marked for discarding."), |
| 1043 | checkout_nothead => N__( |
| 1044 | "If the patch applies cleanly, the edited hunk will immediately be |
| 1045 | marked for applying."), |
| 1046 | ); |
| 1047 | |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1048 | sub recount_edited_hunk { |
| 1049 | local $_; |
| 1050 | my ($oldtext, $newtext) = @_; |
| 1051 | my ($o_cnt, $n_cnt) = (0, 0); |
| 1052 | for (@{$newtext}[1..$#{$newtext}]) { |
| 1053 | my $mode = substr($_, 0, 1); |
| 1054 | if ($mode eq '-') { |
| 1055 | $o_cnt++; |
| 1056 | } elsif ($mode eq '+') { |
| 1057 | $n_cnt++; |
| 1058 | } elsif ($mode eq ' ') { |
| 1059 | $o_cnt++; |
| 1060 | $n_cnt++; |
| 1061 | } |
| 1062 | } |
| 1063 | my ($o_ofs, undef, $n_ofs, undef) = |
| 1064 | parse_hunk_header($newtext->[0]); |
| 1065 | $newtext->[0] = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt); |
| 1066 | my (undef, $orig_o_cnt, undef, $orig_n_cnt) = |
| 1067 | parse_hunk_header($oldtext->[0]); |
| 1068 | # Return the change in the number of lines inserted by this hunk |
| 1069 | return $orig_o_cnt - $orig_n_cnt - $o_cnt + $n_cnt; |
| 1070 | } |
| 1071 | |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1072 | sub edit_hunk_manually { |
| 1073 | my ($oldtext) = @_; |
| 1074 | |
| 1075 | my $hunkfile = $repo->repo_path . "/addp-hunk-edit.diff"; |
| 1076 | my $fh; |
| 1077 | open $fh, '>', $hunkfile |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1078 | or die sprintf(__("failed to open hunk edit file for writing: %s"), $!); |
Vasco Almeida | c9d9616 | 2016-12-14 11:54:32 -0100 | [diff] [blame] | 1079 | print $fh Git::comment_lines __("Manual hunk edit mode -- see bottom for a quick guide.\n"); |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1080 | print $fh @$oldtext; |
Jonathan "Duke" Leto | 7b8c705 | 2010-10-27 17:49:20 -0700 | [diff] [blame] | 1081 | my $is_reverse = $patch_mode_flavour{IS_REVERSE}; |
| 1082 | my ($remove_plus, $remove_minus) = $is_reverse ? ('-', '+') : ('+', '-'); |
Vasco Almeida | c9d9616 | 2016-12-14 11:54:32 -0100 | [diff] [blame] | 1083 | my $comment_line_char = Git::get_comment_line_char; |
| 1084 | print $fh Git::comment_lines sprintf(__ <<EOF, $remove_minus, $remove_plus, $comment_line_char), |
| 1085 | --- |
| 1086 | To remove '%s' lines, make them ' ' lines (context). |
| 1087 | To remove '%s' lines, delete them. |
| 1088 | Lines starting with %s will be removed. |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1089 | EOF |
Vasco Almeida | c9d9616 | 2016-12-14 11:54:32 -0100 | [diff] [blame] | 1090 | __($edit_hunk_manually_modes{$patch_mode}), |
| 1091 | # TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. |
| 1092 | __ <<EOF2 ; |
| 1093 | If it does not apply cleanly, you will be given an opportunity to |
| 1094 | edit again. If all lines of the hunk are removed, then the edit is |
| 1095 | aborted and the hunk is left unchanged. |
| 1096 | EOF2 |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1097 | close $fh; |
| 1098 | |
Jonathan Nieder | b4479f0 | 2009-10-30 20:42:34 -0500 | [diff] [blame] | 1099 | chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR))); |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1100 | system('sh', '-c', $editor.' "$@"', $editor, $hunkfile); |
| 1101 | |
Deskin Miller | 1d398a0 | 2009-02-12 00:19:41 -0500 | [diff] [blame] | 1102 | if ($? != 0) { |
| 1103 | return undef; |
| 1104 | } |
| 1105 | |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1106 | open $fh, '<', $hunkfile |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1107 | or die sprintf(__("failed to open hunk edit file for reading: %s"), $!); |
Jeff King | d85d7ec | 2017-06-21 15:28:59 -0400 | [diff] [blame] | 1108 | my @newtext = grep { !/^\Q$comment_line_char\E/ } <$fh>; |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1109 | close $fh; |
| 1110 | unlink $hunkfile; |
| 1111 | |
| 1112 | # Abort if nothing remains |
| 1113 | if (!grep { /\S/ } @newtext) { |
| 1114 | return undef; |
| 1115 | } |
| 1116 | |
| 1117 | # Reinsert the first hunk header if the user accidentally deleted it |
| 1118 | if ($newtext[0] !~ /^@/) { |
| 1119 | unshift @newtext, $oldtext->[0]; |
| 1120 | } |
| 1121 | return \@newtext; |
| 1122 | } |
| 1123 | |
| 1124 | sub diff_applies { |
Junio C Hamano | 9dce832 | 2011-04-06 14:12:34 -0700 | [diff] [blame] | 1125 | return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check', |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 1126 | map { @{$_->{TEXT}} } @_); |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1127 | } |
| 1128 | |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1129 | sub _restore_terminal_and_die { |
| 1130 | ReadMode 'restore'; |
| 1131 | print "\n"; |
| 1132 | exit 1; |
| 1133 | } |
| 1134 | |
| 1135 | sub prompt_single_character { |
| 1136 | if ($use_readkey) { |
| 1137 | local $SIG{TERM} = \&_restore_terminal_and_die; |
| 1138 | local $SIG{INT} = \&_restore_terminal_and_die; |
| 1139 | ReadMode 'cbreak'; |
| 1140 | my $key = ReadKey 0; |
| 1141 | ReadMode 'restore'; |
Thomas Rast | b5cc003 | 2011-05-17 17:19:08 +0200 | [diff] [blame] | 1142 | if ($use_termcap and $key eq "\e") { |
| 1143 | while (!defined $term_escapes{$key}) { |
| 1144 | my $next = ReadKey 0.5; |
| 1145 | last if (!defined $next); |
| 1146 | $key .= $next; |
| 1147 | } |
| 1148 | $key =~ s/\e/^[/; |
| 1149 | } |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1150 | print "$key" if defined $key; |
| 1151 | print "\n"; |
| 1152 | return $key; |
| 1153 | } else { |
| 1154 | return <STDIN>; |
| 1155 | } |
| 1156 | } |
| 1157 | |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1158 | sub prompt_yesno { |
| 1159 | my ($prompt) = @_; |
| 1160 | while (1) { |
| 1161 | print colored $prompt_color, $prompt; |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1162 | my $line = prompt_single_character; |
Jeff King | d5addcf | 2017-06-21 15:26:36 -0400 | [diff] [blame] | 1163 | return undef unless defined $line; |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1164 | return 0 if $line =~ /^n/i; |
| 1165 | return 1 if $line =~ /^y/i; |
| 1166 | } |
| 1167 | } |
| 1168 | |
| 1169 | sub edit_hunk_loop { |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1170 | my ($head, $hunks, $ix) = @_; |
| 1171 | my $hunk = $hunks->[$ix]; |
| 1172 | my $text = $hunk->{TEXT}; |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1173 | |
| 1174 | while (1) { |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1175 | my $newtext = edit_hunk_manually($text); |
| 1176 | if (!defined $newtext) { |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1177 | return undef; |
| 1178 | } |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 1179 | my $newhunk = { |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1180 | TEXT => $newtext, |
| 1181 | TYPE => $hunk->{TYPE}, |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 1182 | USE => 1, |
| 1183 | DIRTY => 1, |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 1184 | }; |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1185 | $newhunk->{OFS_DELTA} = recount_edited_hunk($text, $newtext); |
| 1186 | # If this hunk has already been edited then add the |
| 1187 | # offset delta of the previous edit to get the real |
| 1188 | # delta from the original unedited hunk. |
| 1189 | $hunk->{OFS_DELTA} and |
| 1190 | $newhunk->{OFS_DELTA} += $hunk->{OFS_DELTA}; |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1191 | if (diff_applies($head, |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1192 | @{$hunks}[0..$ix-1], |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1193 | $newhunk, |
Phillip Wood | 2b8ea7f | 2018-03-05 10:56:28 +0000 | [diff] [blame] | 1194 | @{$hunks}[$ix+1..$#{$hunks}])) { |
| 1195 | $newhunk->{DISPLAY} = [color_diff(@{$newtext})]; |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1196 | return $newhunk; |
| 1197 | } |
| 1198 | else { |
| 1199 | prompt_yesno( |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1200 | # TRANSLATORS: do not translate [y/n] |
| 1201 | # The program will only accept that input |
| 1202 | # at this point. |
| 1203 | # Consider translating (saying "no" discards!) as |
| 1204 | # (saying "n" for "no" discards!) if the translation |
| 1205 | # of the word "no" does not start with n. |
| 1206 | __('Your edited hunk does not apply. Edit again ' |
| 1207 | . '(saying "no" discards!) [y/n]? ') |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1208 | ) or return undef; |
| 1209 | } |
| 1210 | } |
| 1211 | } |
| 1212 | |
Vasco Almeida | 186b52c | 2016-12-14 11:54:31 -0100 | [diff] [blame] | 1213 | my %help_patch_modes = ( |
| 1214 | stage => N__( |
| 1215 | "y - stage this hunk |
| 1216 | n - do not stage this hunk |
| 1217 | q - quit; do not stage this hunk or any of the remaining ones |
| 1218 | a - stage this hunk and all later hunks in the file |
| 1219 | d - do not stage this hunk or any of the later hunks in the file"), |
| 1220 | stash => N__( |
| 1221 | "y - stash this hunk |
| 1222 | n - do not stash this hunk |
| 1223 | q - quit; do not stash this hunk or any of the remaining ones |
| 1224 | a - stash this hunk and all later hunks in the file |
| 1225 | d - do not stash this hunk or any of the later hunks in the file"), |
| 1226 | reset_head => N__( |
| 1227 | "y - unstage this hunk |
| 1228 | n - do not unstage this hunk |
| 1229 | q - quit; do not unstage this hunk or any of the remaining ones |
| 1230 | a - unstage this hunk and all later hunks in the file |
| 1231 | d - do not unstage this hunk or any of the later hunks in the file"), |
| 1232 | reset_nothead => N__( |
| 1233 | "y - apply this hunk to index |
| 1234 | n - do not apply this hunk to index |
| 1235 | q - quit; do not apply this hunk or any of the remaining ones |
| 1236 | a - apply this hunk and all later hunks in the file |
| 1237 | d - do not apply this hunk or any of the later hunks in the file"), |
| 1238 | checkout_index => N__( |
| 1239 | "y - discard this hunk from worktree |
| 1240 | n - do not discard this hunk from worktree |
| 1241 | q - quit; do not discard this hunk or any of the remaining ones |
| 1242 | a - discard this hunk and all later hunks in the file |
| 1243 | d - do not discard this hunk or any of the later hunks in the file"), |
| 1244 | checkout_head => N__( |
| 1245 | "y - discard this hunk from index and worktree |
| 1246 | n - do not discard this hunk from index and worktree |
| 1247 | q - quit; do not discard this hunk or any of the remaining ones |
| 1248 | a - discard this hunk and all later hunks in the file |
| 1249 | d - do not discard this hunk or any of the later hunks in the file"), |
| 1250 | checkout_nothead => N__( |
| 1251 | "y - apply this hunk to index and worktree |
| 1252 | n - do not apply this hunk to index and worktree |
| 1253 | q - quit; do not apply this hunk or any of the remaining ones |
| 1254 | a - apply this hunk and all later hunks in the file |
| 1255 | d - do not apply this hunk or any of the later hunks in the file"), |
| 1256 | ); |
| 1257 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1258 | sub help_patch_cmd { |
Phillip Wood | 01a6966 | 2018-02-13 10:32:39 +0000 | [diff] [blame] | 1259 | local $_; |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1260 | my $other = $_[0] . ",?"; |
Phillip Wood | 01a6966 | 2018-02-13 10:32:39 +0000 | [diff] [blame] | 1261 | print colored $help_color, __($help_patch_modes{$patch_mode}), "\n", |
| 1262 | map { "$_\n" } grep { |
| 1263 | my $c = quotemeta(substr($_, 0, 1)); |
| 1264 | $other =~ /,$c/ |
| 1265 | } split "\n", __ <<EOF ; |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1266 | g - select a hunk to go to |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1267 | / - search for a hunk matching the given regex |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1268 | j - leave this hunk undecided, see next undecided hunk |
| 1269 | J - leave this hunk undecided, see next hunk |
| 1270 | k - leave this hunk undecided, see previous undecided hunk |
| 1271 | K - leave this hunk undecided, see previous hunk |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1272 | s - split the current hunk into smaller hunks |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1273 | e - manually edit the current hunk |
Ralf Wildenhues | 280e50c | 2007-11-28 19:21:42 +0100 | [diff] [blame] | 1274 | ? - print help |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1275 | EOF |
| 1276 | } |
| 1277 | |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 1278 | sub apply_patch { |
| 1279 | my $cmd = shift; |
Junio C Hamano | 9dce832 | 2011-04-06 14:12:34 -0700 | [diff] [blame] | 1280 | my $ret = run_git_apply $cmd, @_; |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 1281 | if (!$ret) { |
| 1282 | print STDERR @_; |
| 1283 | } |
| 1284 | return $ret; |
| 1285 | } |
| 1286 | |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1287 | sub apply_patch_for_checkout_commit { |
| 1288 | my $reverse = shift; |
Junio C Hamano | 9dce832 | 2011-04-06 14:12:34 -0700 | [diff] [blame] | 1289 | my $applies_index = run_git_apply 'apply '.$reverse.' --cached --check', @_; |
| 1290 | my $applies_worktree = run_git_apply 'apply '.$reverse.' --check', @_; |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1291 | |
| 1292 | if ($applies_worktree && $applies_index) { |
Junio C Hamano | 9dce832 | 2011-04-06 14:12:34 -0700 | [diff] [blame] | 1293 | run_git_apply 'apply '.$reverse.' --cached', @_; |
| 1294 | run_git_apply 'apply '.$reverse, @_; |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1295 | return 1; |
| 1296 | } elsif (!$applies_index) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1297 | print colored $error_color, __("The selected hunks do not apply to the index!\n"); |
| 1298 | if (prompt_yesno __("Apply them to the worktree anyway? ")) { |
Junio C Hamano | 9dce832 | 2011-04-06 14:12:34 -0700 | [diff] [blame] | 1299 | return run_git_apply 'apply '.$reverse, @_; |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1300 | } else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1301 | print colored $error_color, __("Nothing was applied.\n"); |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1302 | return 0; |
| 1303 | } |
| 1304 | } else { |
| 1305 | print STDERR @_; |
| 1306 | return 0; |
| 1307 | } |
| 1308 | } |
| 1309 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1310 | sub patch_update_cmd { |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 1311 | my @all_mods = list_modified($patch_mode_flavour{FILTER}); |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1312 | error_msg sprintf(__("ignoring unmerged: %s\n"), $_->{VALUE}) |
Jeff King | 4066bd6 | 2012-04-05 08:30:08 -0400 | [diff] [blame] | 1313 | for grep { $_->{UNMERGED} } @all_mods; |
| 1314 | @all_mods = grep { !$_->{UNMERGED} } @all_mods; |
| 1315 | |
Thomas Rast | 9fe7a64 | 2008-10-26 20:37:06 +0100 | [diff] [blame] | 1316 | my @mods = grep { !($_->{BINARY}) } @all_mods; |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1317 | my @them; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1318 | |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1319 | if (!@mods) { |
Thomas Rast | 9fe7a64 | 2008-10-26 20:37:06 +0100 | [diff] [blame] | 1320 | if (@all_mods) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1321 | print STDERR __("Only binary files changed.\n"); |
Thomas Rast | 9fe7a64 | 2008-10-26 20:37:06 +0100 | [diff] [blame] | 1322 | } else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1323 | print STDERR __("No changes.\n"); |
Thomas Rast | 9fe7a64 | 2008-10-26 20:37:06 +0100 | [diff] [blame] | 1324 | } |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1325 | return 0; |
| 1326 | } |
Jeff King | c852bd5 | 2017-03-02 04:48:22 -0500 | [diff] [blame] | 1327 | if ($patch_mode_only) { |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1328 | @them = @mods; |
| 1329 | } |
| 1330 | else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1331 | @them = list_and_choose({ PROMPT => __('Patch update'), |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1332 | HEADER => $status_head, }, |
| 1333 | @mods); |
| 1334 | } |
Junio C Hamano | 12db334 | 2007-11-22 01:47:13 -0800 | [diff] [blame] | 1335 | for (@them) { |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1336 | return 0 if patch_update_file($_->{VALUE}); |
Junio C Hamano | 12db334 | 2007-11-22 01:47:13 -0800 | [diff] [blame] | 1337 | } |
Wincent Colaiuta | a7d9da6 | 2007-11-21 13:36:38 +0100 | [diff] [blame] | 1338 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1339 | |
William Pursell | 3f6aff6 | 2008-12-04 10:00:24 +0000 | [diff] [blame] | 1340 | # Generate a one line summary of a hunk. |
| 1341 | sub summarize_hunk { |
| 1342 | my $rhunk = shift; |
| 1343 | my $summary = $rhunk->{TEXT}[0]; |
| 1344 | |
| 1345 | # Keep the line numbers, discard extra context. |
| 1346 | $summary =~ s/@@(.*?)@@.*/$1 /s; |
| 1347 | $summary .= " " x (20 - length $summary); |
| 1348 | |
| 1349 | # Add some user context. |
| 1350 | for my $line (@{$rhunk->{TEXT}}) { |
| 1351 | if ($line =~ m/^[+-].*\w/) { |
| 1352 | $summary .= $line; |
| 1353 | last; |
| 1354 | } |
| 1355 | } |
| 1356 | |
| 1357 | chomp $summary; |
| 1358 | return substr($summary, 0, 80) . "\n"; |
| 1359 | } |
| 1360 | |
| 1361 | |
| 1362 | # Print a one-line summary of each hunk in the array ref in |
Stefano Lattarini | 41ccfdd | 2013-04-12 00:36:10 +0200 | [diff] [blame] | 1363 | # the first argument, starting with the index in the 2nd. |
William Pursell | 3f6aff6 | 2008-12-04 10:00:24 +0000 | [diff] [blame] | 1364 | sub display_hunks { |
| 1365 | my ($hunks, $i) = @_; |
| 1366 | my $ctr = 0; |
| 1367 | $i ||= 0; |
| 1368 | for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) { |
| 1369 | my $status = " "; |
| 1370 | if (defined $hunks->[$i]{USE}) { |
| 1371 | $status = $hunks->[$i]{USE} ? "+" : "-"; |
| 1372 | } |
| 1373 | printf "%s%2d: %s", |
| 1374 | $status, |
| 1375 | $i + 1, |
| 1376 | summarize_hunk($hunks->[$i]); |
| 1377 | } |
| 1378 | return $i; |
| 1379 | } |
| 1380 | |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1381 | my %patch_update_prompt_modes = ( |
| 1382 | stage => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1383 | mode => N__("Stage mode change [y,n,q,a,d%s,?]? "), |
| 1384 | deletion => N__("Stage deletion [y,n,q,a,d%s,?]? "), |
| 1385 | hunk => N__("Stage this hunk [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1386 | }, |
| 1387 | stash => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1388 | mode => N__("Stash mode change [y,n,q,a,d%s,?]? "), |
| 1389 | deletion => N__("Stash deletion [y,n,q,a,d%s,?]? "), |
| 1390 | hunk => N__("Stash this hunk [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1391 | }, |
| 1392 | reset_head => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1393 | mode => N__("Unstage mode change [y,n,q,a,d%s,?]? "), |
| 1394 | deletion => N__("Unstage deletion [y,n,q,a,d%s,?]? "), |
| 1395 | hunk => N__("Unstage this hunk [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1396 | }, |
| 1397 | reset_nothead => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1398 | mode => N__("Apply mode change to index [y,n,q,a,d%s,?]? "), |
| 1399 | deletion => N__("Apply deletion to index [y,n,q,a,d%s,?]? "), |
| 1400 | hunk => N__("Apply this hunk to index [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1401 | }, |
| 1402 | checkout_index => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1403 | mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "), |
| 1404 | deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "), |
| 1405 | hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1406 | }, |
| 1407 | checkout_head => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1408 | mode => N__("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), |
| 1409 | deletion => N__("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), |
| 1410 | hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1411 | }, |
| 1412 | checkout_nothead => { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1413 | mode => N__("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), |
| 1414 | deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), |
| 1415 | hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1416 | }, |
| 1417 | ); |
| 1418 | |
Wincent Colaiuta | a7d9da6 | 2007-11-21 13:36:38 +0100 | [diff] [blame] | 1419 | sub patch_update_file { |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1420 | my $quit = 0; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1421 | my ($ix, $num); |
Wincent Colaiuta | a7d9da6 | 2007-11-21 13:36:38 +0100 | [diff] [blame] | 1422 | my $path = shift; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1423 | my ($head, @hunk) = parse_diff($path); |
Jeff King | 24ab81a | 2009-10-27 20:52:57 -0400 | [diff] [blame] | 1424 | ($head, my $mode, my $deletion) = parse_diff_header($head); |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 1425 | for (@{$head->{DISPLAY}}) { |
| 1426 | print; |
| 1427 | } |
Jeff King | ca72468 | 2008-03-27 03:32:25 -0400 | [diff] [blame] | 1428 | |
| 1429 | if (@{$mode->{TEXT}}) { |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 1430 | unshift @hunk, $mode; |
Jeff King | ca72468 | 2008-03-27 03:32:25 -0400 | [diff] [blame] | 1431 | } |
Jeff King | 8947fdd | 2009-12-08 02:49:35 -0500 | [diff] [blame] | 1432 | if (@{$deletion->{TEXT}}) { |
| 1433 | foreach my $hunk (@hunk) { |
| 1434 | push @{$deletion->{TEXT}}, @{$hunk->{TEXT}}; |
| 1435 | push @{$deletion->{DISPLAY}}, @{$hunk->{DISPLAY}}; |
| 1436 | } |
Jeff King | 24ab81a | 2009-10-27 20:52:57 -0400 | [diff] [blame] | 1437 | @hunk = ($deletion); |
| 1438 | } |
Jeff King | ca72468 | 2008-03-27 03:32:25 -0400 | [diff] [blame] | 1439 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1440 | $num = scalar @hunk; |
| 1441 | $ix = 0; |
| 1442 | |
| 1443 | while (1) { |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1444 | my ($prev, $next, $other, $undecided, $i); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1445 | $other = ''; |
| 1446 | |
| 1447 | if ($num <= $ix) { |
| 1448 | $ix = 0; |
| 1449 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1450 | for ($i = 0; $i < $ix; $i++) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1451 | if (!defined $hunk[$i]{USE}) { |
| 1452 | $prev = 1; |
William Pursell | 57886bc | 2008-11-27 04:07:52 +0000 | [diff] [blame] | 1453 | $other .= ',k'; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1454 | last; |
| 1455 | } |
| 1456 | } |
| 1457 | if ($ix) { |
William Pursell | 57886bc | 2008-11-27 04:07:52 +0000 | [diff] [blame] | 1458 | $other .= ',K'; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1459 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1460 | for ($i = $ix + 1; $i < $num; $i++) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1461 | if (!defined $hunk[$i]{USE}) { |
| 1462 | $next = 1; |
William Pursell | 57886bc | 2008-11-27 04:07:52 +0000 | [diff] [blame] | 1463 | $other .= ',j'; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1464 | last; |
| 1465 | } |
| 1466 | } |
| 1467 | if ($ix < $num - 1) { |
William Pursell | 57886bc | 2008-11-27 04:07:52 +0000 | [diff] [blame] | 1468 | $other .= ',J'; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1469 | } |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1470 | if ($num > 1) { |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1471 | $other .= ',g,/'; |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1472 | } |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1473 | for ($i = 0; $i < $num; $i++) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1474 | if (!defined $hunk[$i]{USE}) { |
| 1475 | $undecided = 1; |
| 1476 | last; |
| 1477 | } |
| 1478 | } |
| 1479 | last if (!$undecided); |
| 1480 | |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 1481 | if ($hunk[$ix]{TYPE} eq 'hunk' && |
| 1482 | hunk_splittable($hunk[$ix]{TEXT})) { |
William Pursell | 57886bc | 2008-11-27 04:07:52 +0000 | [diff] [blame] | 1483 | $other .= ',s'; |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1484 | } |
Jeff King | 0392513 | 2009-04-16 03:14:15 -0400 | [diff] [blame] | 1485 | if ($hunk[$ix]{TYPE} eq 'hunk') { |
| 1486 | $other .= ',e'; |
| 1487 | } |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 1488 | for (@{$hunk[$ix]{DISPLAY}}) { |
| 1489 | print; |
| 1490 | } |
Vasco Almeida | 0539d5e | 2016-12-14 11:54:30 -0100 | [diff] [blame] | 1491 | print colored $prompt_color, |
| 1492 | sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); |
| 1493 | |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1494 | my $line = prompt_single_character; |
Jeff King | a8bec7a | 2014-12-15 11:35:27 -0500 | [diff] [blame] | 1495 | last unless defined $line; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1496 | if ($line) { |
| 1497 | if ($line =~ /^y/i) { |
| 1498 | $hunk[$ix]{USE} = 1; |
| 1499 | } |
| 1500 | elsif ($line =~ /^n/i) { |
| 1501 | $hunk[$ix]{USE} = 0; |
| 1502 | } |
| 1503 | elsif ($line =~ /^a/i) { |
| 1504 | while ($ix < $num) { |
| 1505 | if (!defined $hunk[$ix]{USE}) { |
| 1506 | $hunk[$ix]{USE} = 1; |
| 1507 | } |
| 1508 | $ix++; |
| 1509 | } |
| 1510 | next; |
| 1511 | } |
Phillip Wood | 4bdd6e7 | 2018-02-13 10:32:41 +0000 | [diff] [blame] | 1512 | elsif ($line =~ /^g(.*)/) { |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1513 | my $response = $1; |
Phillip Wood | 4bdd6e7 | 2018-02-13 10:32:41 +0000 | [diff] [blame] | 1514 | unless ($other =~ /g/) { |
| 1515 | error_msg __("No other hunks to goto\n"); |
| 1516 | next; |
| 1517 | } |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1518 | my $no = $ix > 10 ? $ix - 10 : 0; |
| 1519 | while ($response eq '') { |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1520 | $no = display_hunks(\@hunk, $no); |
| 1521 | if ($no < $num) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1522 | print __("go to which hunk (<ret> to see more)? "); |
| 1523 | } else { |
| 1524 | print __("go to which hunk? "); |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1525 | } |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1526 | $response = <STDIN>; |
Thomas Rast | 68c02d7 | 2009-02-02 22:46:29 +0100 | [diff] [blame] | 1527 | if (!defined $response) { |
| 1528 | $response = ''; |
| 1529 | } |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1530 | chomp $response; |
| 1531 | } |
| 1532 | if ($response !~ /^\s*\d+\s*$/) { |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1533 | error_msg sprintf(__("Invalid number: '%s'\n"), |
| 1534 | $response); |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1535 | } elsif (0 < $response && $response <= $num) { |
| 1536 | $ix = $response - 1; |
| 1537 | } else { |
Vasco Almeida | c4a85c3 | 2016-12-14 11:54:29 -0100 | [diff] [blame] | 1538 | error_msg sprintf(__n("Sorry, only %d hunk available.\n", |
| 1539 | "Sorry, only %d hunks available.\n", $num), $num); |
William Pursell | 070434d | 2008-12-04 10:22:40 +0000 | [diff] [blame] | 1540 | } |
| 1541 | next; |
| 1542 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1543 | elsif ($line =~ /^d/i) { |
| 1544 | while ($ix < $num) { |
| 1545 | if (!defined $hunk[$ix]{USE}) { |
| 1546 | $hunk[$ix]{USE} = 0; |
| 1547 | } |
| 1548 | $ix++; |
| 1549 | } |
| 1550 | next; |
| 1551 | } |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1552 | elsif ($line =~ /^q/i) { |
Junio C Hamano | f5ea3f2 | 2011-04-29 15:12:32 -0700 | [diff] [blame] | 1553 | for ($i = 0; $i < $num; $i++) { |
| 1554 | if (!defined $hunk[$i]{USE}) { |
| 1555 | $hunk[$i]{USE} = 0; |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1556 | } |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1557 | } |
| 1558 | $quit = 1; |
Junio C Hamano | f5ea3f2 | 2011-04-29 15:12:32 -0700 | [diff] [blame] | 1559 | last; |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1560 | } |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1561 | elsif ($line =~ m|^/(.*)|) { |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1562 | my $regex = $1; |
Phillip Wood | 88f6ffc | 2018-02-13 10:32:40 +0000 | [diff] [blame] | 1563 | unless ($other =~ m|/|) { |
| 1564 | error_msg __("No other hunks to search\n"); |
| 1565 | next; |
| 1566 | } |
Ævar Arnfjörð Bjarmason | fd2fb4a | 2018-03-31 12:50:58 +0000 | [diff] [blame] | 1567 | if ($regex eq "") { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1568 | print colored $prompt_color, __("search for regex? "); |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1569 | $regex = <STDIN>; |
| 1570 | if (defined $regex) { |
| 1571 | chomp $regex; |
| 1572 | } |
| 1573 | } |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1574 | my $search_string; |
| 1575 | eval { |
Thomas Rast | ca6ac7f | 2009-02-05 09:28:26 +0100 | [diff] [blame] | 1576 | $search_string = qr{$regex}m; |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1577 | }; |
| 1578 | if ($@) { |
| 1579 | my ($err,$exp) = ($@, $1); |
| 1580 | $err =~ s/ at .*git-add--interactive line \d+, <STDIN> line \d+.*$//; |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1581 | error_msg sprintf(__("Malformed search regexp %s: %s\n"), $exp, $err); |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1582 | next; |
| 1583 | } |
| 1584 | my $iy = $ix; |
| 1585 | while (1) { |
| 1586 | my $text = join ("", @{$hunk[$iy]{TEXT}}); |
| 1587 | last if ($text =~ $search_string); |
| 1588 | $iy++; |
| 1589 | $iy = 0 if ($iy >= $num); |
| 1590 | if ($ix == $iy) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1591 | error_msg __("No hunk matches the given pattern\n"); |
William Pursell | dd971cc | 2008-11-27 04:07:57 +0000 | [diff] [blame] | 1592 | last; |
| 1593 | } |
| 1594 | } |
| 1595 | $ix = $iy; |
| 1596 | next; |
| 1597 | } |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1598 | elsif ($line =~ /^K/) { |
| 1599 | if ($other =~ /K/) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1600 | $ix--; |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1601 | } |
| 1602 | else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1603 | error_msg __("No previous hunk\n"); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1604 | } |
| 1605 | next; |
| 1606 | } |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1607 | elsif ($line =~ /^J/) { |
| 1608 | if ($other =~ /J/) { |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1609 | $ix++; |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1610 | } |
| 1611 | else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1612 | error_msg __("No next hunk\n"); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1613 | } |
| 1614 | next; |
| 1615 | } |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1616 | elsif ($line =~ /^k/) { |
| 1617 | if ($other =~ /k/) { |
| 1618 | while (1) { |
| 1619 | $ix--; |
| 1620 | last if (!$ix || |
| 1621 | !defined $hunk[$ix]{USE}); |
| 1622 | } |
| 1623 | } |
| 1624 | else { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1625 | error_msg __("No previous hunk\n"); |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1626 | } |
| 1627 | next; |
| 1628 | } |
| 1629 | elsif ($line =~ /^j/) { |
| 1630 | if ($other !~ /j/) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1631 | error_msg __("No next hunk\n"); |
William Pursell | ace30ba | 2008-11-27 04:08:03 +0000 | [diff] [blame] | 1632 | next; |
| 1633 | } |
| 1634 | } |
Phillip Wood | 4bdd6e7 | 2018-02-13 10:32:41 +0000 | [diff] [blame] | 1635 | elsif ($line =~ /^s/) { |
| 1636 | unless ($other =~ /s/) { |
| 1637 | error_msg __("Sorry, cannot split this hunk\n"); |
| 1638 | next; |
| 1639 | } |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 1640 | my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY}); |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1641 | if (1 < @split) { |
Vasco Almeida | c4a85c3 | 2016-12-14 11:54:29 -0100 | [diff] [blame] | 1642 | print colored $header_color, sprintf( |
| 1643 | __n("Split into %d hunk.\n", |
| 1644 | "Split into %d hunks.\n", |
| 1645 | scalar(@split)), scalar(@split)); |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1646 | } |
Wincent Colaiuta | 4af756f | 2007-12-07 13:35:10 +0100 | [diff] [blame] | 1647 | splice (@hunk, $ix, 1, @split); |
Junio C Hamano | 835b2ae | 2006-12-11 17:09:26 -0800 | [diff] [blame] | 1648 | $num = scalar @hunk; |
| 1649 | next; |
| 1650 | } |
Phillip Wood | 4bdd6e7 | 2018-02-13 10:32:41 +0000 | [diff] [blame] | 1651 | elsif ($line =~ /^e/) { |
| 1652 | unless ($other =~ /e/) { |
| 1653 | error_msg __("Sorry, cannot edit this hunk\n"); |
| 1654 | next; |
| 1655 | } |
Thomas Rast | ac083c4 | 2008-07-03 00:00:00 +0200 | [diff] [blame] | 1656 | my $newhunk = edit_hunk_loop($head, \@hunk, $ix); |
| 1657 | if (defined $newhunk) { |
| 1658 | splice @hunk, $ix, 1, $newhunk; |
| 1659 | } |
| 1660 | } |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1661 | else { |
| 1662 | help_patch_cmd($other); |
| 1663 | next; |
| 1664 | } |
| 1665 | # soft increment |
| 1666 | while (1) { |
| 1667 | $ix++; |
| 1668 | last if ($ix >= $num || |
| 1669 | !defined $hunk[$ix]{USE}); |
| 1670 | } |
| 1671 | } |
| 1672 | } |
| 1673 | |
Junio C Hamano | 7a26e65 | 2009-05-16 10:48:23 -0700 | [diff] [blame] | 1674 | @hunk = coalesce_overlapping_hunks(@hunk); |
| 1675 | |
Jean-Luc Herren | 7b40a45 | 2007-10-09 21:34:17 +0200 | [diff] [blame] | 1676 | my $n_lofs = 0; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1677 | my @result = (); |
| 1678 | for (@hunk) { |
Thomas Rast | 8cbd431 | 2008-07-02 23:59:16 +0200 | [diff] [blame] | 1679 | if ($_->{USE}) { |
| 1680 | push @result, @{$_->{TEXT}}; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1681 | } |
| 1682 | } |
| 1683 | |
| 1684 | if (@result) { |
Jeff King | e1327ed | 2010-02-22 20:05:44 -0500 | [diff] [blame] | 1685 | my @patch = reassemble_patch($head->{TEXT}, @result); |
Thomas Rast | 8f0bef6 | 2009-08-13 14:29:39 +0200 | [diff] [blame] | 1686 | my $apply_routine = $patch_mode_flavour{APPLY}; |
| 1687 | &$apply_routine(@patch); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1688 | refresh(); |
| 1689 | } |
| 1690 | |
| 1691 | print "\n"; |
Matthieu Moy | 9a7a1e0 | 2009-04-10 16:57:01 +0200 | [diff] [blame] | 1692 | return $quit; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1693 | } |
| 1694 | |
| 1695 | sub diff_cmd { |
| 1696 | my @mods = list_modified('index-only'); |
| 1697 | @mods = grep { !($_->{BINARY}) } @mods; |
| 1698 | return if (!@mods); |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1699 | my (@them) = list_and_choose({ PROMPT => __('Review diff'), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1700 | IMMEDIATE => 1, |
| 1701 | HEADER => $status_head, }, |
| 1702 | @mods); |
| 1703 | return if (!@them); |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1704 | my $reference = (is_initial_commit()) ? get_empty_tree() : 'HEAD'; |
Jeff King | 18bc761 | 2008-02-13 05:50:51 -0500 | [diff] [blame] | 1705 | system(qw(git diff -p --cached), $reference, '--', |
| 1706 | map { $_->{VALUE} } @them); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1707 | } |
| 1708 | |
| 1709 | sub quit_cmd { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1710 | print __("Bye.\n"); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1711 | exit(0); |
| 1712 | } |
| 1713 | |
| 1714 | sub help_cmd { |
Vasco Almeida | 5fa8326 | 2016-12-14 11:54:26 -0100 | [diff] [blame] | 1715 | # TRANSLATORS: please do not translate the command names |
| 1716 | # 'status', 'update', 'revert', etc. |
| 1717 | print colored $help_color, __ <<'EOF' ; |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1718 | status - show paths with changes |
| 1719 | update - add working tree state to the staged set of changes |
| 1720 | revert - revert staged set of changes back to the HEAD version |
| 1721 | patch - pick hunks and update selectively |
Ralf Thielow | e519ecc | 2017-02-22 19:46:27 +0100 | [diff] [blame] | 1722 | diff - view diff between HEAD and index |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1723 | add untracked - add contents of untracked files to the staged set of changes |
| 1724 | EOF |
| 1725 | } |
| 1726 | |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1727 | sub process_args { |
| 1728 | return unless @ARGV; |
| 1729 | my $arg = shift @ARGV; |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1730 | if ($arg =~ /--patch(?:=(.*))?/) { |
| 1731 | if (defined $1) { |
| 1732 | if ($1 eq 'reset') { |
| 1733 | $patch_mode = 'reset_head'; |
| 1734 | $patch_mode_revision = 'HEAD'; |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1735 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1736 | if ($arg ne '--') { |
| 1737 | $patch_mode_revision = $arg; |
| 1738 | $patch_mode = ($arg eq 'HEAD' ? |
| 1739 | 'reset_head' : 'reset_nothead'); |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1740 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1741 | } |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1742 | } elsif ($1 eq 'checkout') { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1743 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1744 | if ($arg eq '--') { |
| 1745 | $patch_mode = 'checkout_index'; |
| 1746 | } else { |
| 1747 | $patch_mode_revision = $arg; |
| 1748 | $patch_mode = ($arg eq 'HEAD' ? |
| 1749 | 'checkout_head' : 'checkout_nothead'); |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1750 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | 4f35365 | 2009-08-15 13:48:30 +0200 | [diff] [blame] | 1751 | } |
Thomas Rast | dda1f2a | 2009-08-13 14:29:44 +0200 | [diff] [blame] | 1752 | } elsif ($1 eq 'stage' or $1 eq 'stash') { |
| 1753 | $patch_mode = $1; |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1754 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1755 | } else { |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1756 | die sprintf(__("unknown --patch mode: %s"), $1); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1757 | } |
| 1758 | } else { |
| 1759 | $patch_mode = 'stage'; |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1760 | $arg = shift @ARGV or die __("missing --"); |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1761 | } |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1762 | die sprintf(__("invalid argument %s, expecting --"), |
| 1763 | $arg) unless $arg eq "--"; |
Thomas Rast | d002ef4 | 2009-08-15 13:48:31 +0200 | [diff] [blame] | 1764 | %patch_mode_flavour = %{$patch_modes{$patch_mode}}; |
Jeff King | c852bd5 | 2017-03-02 04:48:22 -0500 | [diff] [blame] | 1765 | $patch_mode_only = 1; |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1766 | } |
| 1767 | elsif ($arg ne "--") { |
Vasco Almeida | 13c58c1 | 2016-12-14 11:54:27 -0100 | [diff] [blame] | 1768 | die sprintf(__("invalid argument %s, expecting --"), $arg); |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1769 | } |
| 1770 | } |
| 1771 | |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1772 | sub main_loop { |
| 1773 | my @cmd = ([ 'status', \&status_cmd, ], |
| 1774 | [ 'update', \&update_cmd, ], |
| 1775 | [ 'revert', \&revert_cmd, ], |
| 1776 | [ 'add untracked', \&add_untracked_cmd, ], |
| 1777 | [ 'patch', \&patch_update_cmd, ], |
| 1778 | [ 'diff', \&diff_cmd, ], |
| 1779 | [ 'quit', \&quit_cmd, ], |
| 1780 | [ 'help', \&help_cmd, ], |
| 1781 | ); |
| 1782 | while (1) { |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1783 | my ($it) = list_and_choose({ PROMPT => __('What now'), |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1784 | SINGLETON => 1, |
| 1785 | LIST_FLAT => 4, |
Vasco Almeida | 258e779 | 2016-12-14 11:54:25 -0100 | [diff] [blame] | 1786 | HEADER => __('*** Commands ***'), |
Jean-Luc Herren | c95c024 | 2007-09-26 15:56:19 +0200 | [diff] [blame] | 1787 | ON_EOF => \&quit_cmd, |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1788 | IMMEDIATE => 1 }, @cmd); |
| 1789 | if ($it) { |
| 1790 | eval { |
| 1791 | $it->[1]->(); |
| 1792 | }; |
| 1793 | if ($@) { |
| 1794 | print "$@"; |
| 1795 | } |
| 1796 | } |
| 1797 | } |
| 1798 | } |
| 1799 | |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1800 | process_args(); |
Junio C Hamano | 5cde71d | 2006-12-10 20:55:50 -0800 | [diff] [blame] | 1801 | refresh(); |
Jeff King | c852bd5 | 2017-03-02 04:48:22 -0500 | [diff] [blame] | 1802 | if ($patch_mode_only) { |
Wincent Colaiuta | b63e995 | 2007-11-25 14:15:42 +0100 | [diff] [blame] | 1803 | patch_update_cmd(); |
| 1804 | } |
| 1805 | else { |
| 1806 | status_cmd(); |
| 1807 | main_loop(); |
| 1808 | } |