| changeset 48935 | 2cce2fa5bcf7 |
| parent 48913 | f254fc73d956 |
| child 48941 | fd5b8e696b75 |
| 48934:06de08b36c82 | 48935:2cce2fa5bcf7 |
|---|---|
1340 applied[newhunk.filename()].append(newhunk) |
1340 applied[newhunk.filename()].append(newhunk) |
1341 else: |
1341 else: |
1342 fixoffset += chunk.removed - chunk.added |
1342 fixoffset += chunk.removed - chunk.added |
1343 return ( |
1343 return ( |
1344 sum( |
1344 sum( |
1345 [ |
1345 [h for h in applied.values() if h[0].special() or len(h) > 1], |
1346 h |
|
1347 for h in pycompat.itervalues(applied) |
|
1348 if h[0].special() or len(h) > 1 |
|
1349 ], |
|
1350 [], |
1346 [], |
1351 ), |
1347 ), |
1352 {}, |
1348 {}, |
1353 ) |
1349 ) |
1354 |
1350 |