equal
deleted
inserted
replaced
1850 context = None |
1850 context = None |
1851 lr = linereader(fp) |
1851 lr = linereader(fp) |
1852 |
1852 |
1853 for x in iter(lr.readline, ''): |
1853 for x in iter(lr.readline, ''): |
1854 if state == BFILE and ( |
1854 if state == BFILE and ( |
1855 (not context and x[0] == '@') |
1855 (not context and x.startswith('@')) |
1856 or (context is not False and x.startswith('***************')) |
1856 or (context is not False and x.startswith('***************')) |
1857 or x.startswith('GIT binary patch')): |
1857 or x.startswith('GIT binary patch')): |
1858 gp = None |
1858 gp = None |
1859 if (gitpatches and |
1859 if (gitpatches and |
1860 gitpatches[-1].ispatching(afile, bfile)): |
1860 gitpatches[-1].ispatching(afile, bfile)): |