immerrr avatar immerrr committed ccdd582

crpatch.parsepatch: when splitting diff hunk into smaller ones, account after-context when calculating their start lines

Comments (0)

Files changed (1)

crecord/crpatch.py

                      self.before, self.changedlines, self.context)
             self.header.hunks.append(h)
             self.stream.append(h)
-            self.fromline += len(self.before) + h.removed
-            self.toline += len(self.before) + h.added
+            self.fromline += len(self.before) + h.removed + len(self.context)
+            self.toline += len(self.before) + h.added + len(self.context)
             self.before = []
             self.changedlines = []
             self.context = []
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.