git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 1/9] add -i: add function to format hunk header

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Mar 5, 2018, 10:56 UTC
Message-ID
<20180305105630.14407-2-phillip.wood@talktalk.net>
In-Reply-To
<20180305105630.14407-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>

This code is duplicated in a couple of places so make it into a function as we're going to add some more callers shortly.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 git-add--interactive.perl | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 964c3a7542..8ababa6453 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -751,6 +751,15 @@ sub parse_hunk_header {
 	return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
 }
 
+sub format_hunk_header {
+	my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = @_;
+	return ("@@ -$o_ofs" .
+		(($o_cnt != 1) ? ",$o_cnt" : '') .
+		" +$n_ofs" .
+		(($n_cnt != 1) ? ",$n_cnt" : '') .
+		" @@\n");
+}
+
 sub split_hunk {
 	my ($text, $display) = @_;
 	my @split = ();
@@ -838,11 +847,7 @@ sub split_hunk {
 		my $o_cnt = $hunk->{OCNT};
 		my $n_cnt = $hunk->{NCNT};
 
-		my $head = ("@@ -$o_ofs" .
-			    (($o_cnt != 1) ? ",$o_cnt" : '') .
-			    " +$n_ofs" .
-			    (($n_cnt != 1) ? ",$n_cnt" : '') .
-			    " @@\n");
+		my $head = format_hunk_header($o_ofs, $o_cnt, $n_ofs, $n_cnt);
 		my $display_head = $head;
 		unshift @{$hunk->{TEXT}}, $head;
 		if ($diff_use_color) {
@@ -912,11 +917,7 @@ sub merge_hunk {
 		}
 		push @line, $line;
 	}
-	my $head = ("@@ -$o0_ofs" .
-		    (($o_cnt != 1) ? ",$o_cnt" : '') .
-		    " +$n0_ofs" .
-		    (($n_cnt != 1) ? ",$n_cnt" : '') .
-		    " @@\n");
+	my $head = format_hunk_header($o0_ofs, $o_cnt, $n0_ofs, $n_cnt);
 	@{$prev->{TEXT}} = ($head, @line);
 }
 

-- 
2.16.2
Previous: Phillip WoodNext: Phillip Wood
Message 69 of 79 in “Correct offsets of hunks when one is skipped”
  1. 0/4 Correct offsets of hunks when one is skippedPhillip Wood, Feb 13, 2018
  2. 1/4 add -i: add function to format hunk headerPhillip Wood, Feb 13, 2018
  3. 3/4 add -p: Adjust offsets of subsequent hunks when one is skippedPhillip Wood, Feb 13, 2018
  4. 4/4 add -p: calculate offset delta for edited patchesPhillip Wood, Feb 13, 2018
  5. 2/4 t3701: add failing test for pathological context linesPhillip Wood, Feb 13, 2018
  6. Junio C HamanoFeb 13, 2018
  7. brian m. carlsonFeb 13, 2018
  8. Phillip WoodFeb 19, 2018
  9. 0/9 Correct offsets of hunks when one is skippedPhillip Wood, Feb 19, 2018
  10. 1/9 add -i: add function to format hunk headerPhillip Wood, Feb 19, 2018
  11. Junio C HamanoFeb 20, 2018
  12. 2/9 t3701: indent here documentsPhillip Wood, Feb 19, 2018
  13. Eric SunshineFeb 19, 2018
  14. 7/9 add -p: calculate offset delta for edited patchesPhillip Wood, Feb 19, 2018
  15. 9/9 add -p: don't rely on apply's '--recount' optionPhillip Wood, Feb 19, 2018
  16. Junio C HamanoFeb 20, 2018
  17. 8/9 add -p: fix counting when splitting and coalescingPhillip Wood, Feb 19, 2018
  18. 4/9 t3701: don't hard code sha1 hash valuesPhillip Wood, Feb 19, 2018
  19. Eric SunshineFeb 19, 2018
  20. Junio C HamanoFeb 20, 2018
  21. Phillip WoodFeb 21, 2018
  22. Junio C HamanoFeb 21, 2018
  23. 3/9 t3701: use test_write_lines and write_scriptPhillip Wood, Feb 19, 2018
  24. Eric SunshineFeb 19, 2018
  25. Junio C HamanoFeb 20, 2018
  26. Phillip WoodFeb 21, 2018
  27. 6/9 add -p: Adjust offsets of subsequent hunks when one is skippedPhillip Wood, Feb 19, 2018
  28. 5/9 t3701: add failing test for pathological context linesPhillip Wood, Feb 19, 2018
  29. Phillip WoodFeb 21, 2018
  30. 0/9 Correct offsets of hunks when one is skippedPhillip Wood, Feb 27, 2018
  31. 1/9 add -i: add function to format hunk headerPhillip Wood, Feb 27, 2018
  32. 4/9 t3701: don't hard code sha1 hash valuesPhillip Wood, Feb 27, 2018
  33. Junio C HamanoFeb 27, 2018
  34. Phillip WoodFeb 28, 2018
  35. Phillip WoodFeb 28, 2018
  36. 3/9 t3701: use test_write_lines and write_scriptPhillip Wood, Feb 27, 2018
  37. 5/9 t3701: add failing test for pathological context linesPhillip Wood, Feb 27, 2018
  38. 9/9 add -p: don't rely on apply's '--recount' optionPhillip Wood, Feb 27, 2018
  39. 2/9 t3701: indent here documentsPhillip Wood, Feb 27, 2018
  40. Junio C HamanoFeb 27, 2018
  41. Phillip WoodFeb 28, 2018
  42. Junio C HamanoFeb 28, 2018
  43. Phillip WoodMar 1, 2018
  44. Junio C HamanoMar 1, 2018
  45. 6/9 add -p: Adjust offsets of subsequent hunks when one is skippedPhillip Wood, Feb 27, 2018
  46. 7/9 add -p: calculate offset delta for edited patchesPhillip Wood, Feb 27, 2018
  47. 8/9 add -p: fix counting when splitting and coalescingPhillip Wood, Feb 27, 2018
  48. 0/9 Correct offsets of hunks when one is skippedPhillip Wood, Mar 1, 2018
  49. 1/9 add -i: add function to format hunk headerPhillip Wood, Mar 1, 2018
  50. 9/9 add -p: don't rely on apply's '--recount' optionPhillip Wood, Mar 1, 2018
  51. Junio C HamanoMar 1, 2018
  52. Phillip WoodMar 2, 2018
  53. 7/9 add -p: calculate offset delta for edited patchesPhillip Wood, Mar 1, 2018
  54. Junio C HamanoMar 1, 2018
  55. Phillip WoodMar 2, 2018
  56. 3/9 t3701: use test_write_lines and write_scriptPhillip Wood, Mar 1, 2018
  57. 4/9 t3701: don't hard code sha1 hash valuesPhillip Wood, Mar 1, 2018
  58. SZEDER GáborMar 2, 2018
  59. Junio C HamanoMar 2, 2018
  60. Phillip WoodMar 5, 2018
  61. SZEDER GáborMar 5, 2018
  62. 2/9 t3701: indent here documentsPhillip Wood, Mar 1, 2018
  63. 5/9 t3701: add failing test for pathological context linesPhillip Wood, Mar 1, 2018
  64. 6/9 add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood, Mar 1, 2018
  65. 8/9 add -p: fix counting when splitting and coalescingPhillip Wood, Mar 1, 2018
  66. Junio C HamanoMar 1, 2018
  67. Phillip WoodMar 2, 2018
  68. 0/9 Correct offsets of hunks when one is skippedPhillip Wood, Mar 5, 2018
  69. 1/9 add -i: add function to format hunk headerPhillip Wood, Mar 5, 2018
  70. 2/9 t3701: indent here documentsPhillip Wood, Mar 5, 2018
  71. 3/9 t3701: use test_write_lines and write_scriptPhillip Wood, Mar 5, 2018
  72. 8/9 add -p: fix counting when splitting and coalescingPhillip Wood, Mar 5, 2018
  73. 6/9 add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood, Mar 5, 2018
  74. 5/9 t3701: add failing test for pathological context linesPhillip Wood, Mar 5, 2018
  75. 4/9 t3701: don't hard code sha1 hash valuesPhillip Wood, Mar 5, 2018
  76. 7/9 add -p: calculate offset delta for edited patchesPhillip Wood, Mar 5, 2018
  77. 9/9 add -p: don't rely on apply's '--recount' optionPhillip Wood, Mar 5, 2018
  78. Junio C HamanoMar 5, 2018
  79. Phillip WoodMar 6, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.