equal
deleted
inserted
replaced
1104 if fixoffset: |
1104 if fixoffset: |
1105 newhunk.toline += fixoffset |
1105 newhunk.toline += fixoffset |
1106 applied[newhunk.filename()].append(newhunk) |
1106 applied[newhunk.filename()].append(newhunk) |
1107 else: |
1107 else: |
1108 fixoffset += chunk.removed - chunk.added |
1108 fixoffset += chunk.removed - chunk.added |
1109 return sum([h for h in applied.itervalues() |
1109 return (sum([h for h in applied.itervalues() |
1110 if h[0].special() or len(h) > 1], []) |
1110 if h[0].special() or len(h) > 1], []), {}) |
1111 class hunk(object): |
1111 class hunk(object): |
1112 def __init__(self, desc, num, lr, context): |
1112 def __init__(self, desc, num, lr, context): |
1113 self.number = num |
1113 self.number = num |
1114 self.desc = desc |
1114 self.desc = desc |
1115 self.hunk = [desc] |
1115 self.hunk = [desc] |