Mercurial > hg
comparison mercurial/crecord.py @ 29937:2c302c654451
merge with stable
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Wed, 14 Sep 2016 17:12:39 +0200 |
parents | bff109e6398a e7766022a61a |
children | 3664537386ab |
comparison
equal
deleted
inserted
replaced
29936:3e7ded768556 | 29937:2c302c654451 |
---|---|
385 # calculate the number of removed lines converted to context lines | 385 # calculate the number of removed lines converted to context lines |
386 removedconvertedtocontext = self.originalremoved - self.removed | 386 removedconvertedtocontext = self.originalremoved - self.removed |
387 | 387 |
388 contextlen = (len(self.before) + len(self.after) + | 388 contextlen = (len(self.before) + len(self.after) + |
389 removedconvertedtocontext) | 389 removedconvertedtocontext) |
390 if self.after and self.after[-1] == '\\ no newline at end of file\n': | 390 if self.after and self.after[-1] == '\\ No newline at end of file\n': |
391 contextlen -= 1 | 391 contextlen -= 1 |
392 fromlen = contextlen + self.removed | 392 fromlen = contextlen + self.removed |
393 tolen = contextlen + self.added | 393 tolen = contextlen + self.added |
394 | 394 |
395 # diffutils manual, section "2.2.2.2 detailed description of unified | 395 # diffutils manual, section "2.2.2.2 detailed description of unified |