| changeset 43104 | 74802979dd9d |
| parent 43097 | 27c4f93d07a9 |
| child 43106 | d783f945a701 |
| 43103:c95b2f40db7c | 43104:74802979dd9d |
|---|---|
1329 applied[newhunk.filename()].append(newhunk) |
1329 applied[newhunk.filename()].append(newhunk) |
1330 else: |
1330 else: |
1331 fixoffset += chunk.removed - chunk.added |
1331 fixoffset += chunk.removed - chunk.added |
1332 return ( |
1332 return ( |
1333 sum( |
1333 sum( |
1334 [h for h in applied.itervalues() if h[0].special() or len(h) > 1], |
1334 [ |
1335 h |
|
1336 for h in pycompat.itervalues(applied) |
|
1337 if h[0].special() or len(h) > 1 |
|
1338 ], |
|
1335 [], |
1339 [], |
1336 ), |
1340 ), |
1337 {}, |
1341 {}, |
1338 ) |
1342 ) |
1339 |
1343 |