Show More
@@ -83,7 +83,7 b' def filterchunks(ui, originalhunks, usec' | |||||
83 | else: |
|
83 | else: | |
84 | recordfn = crecordmod.chunkselector |
|
84 | recordfn = crecordmod.chunkselector | |
85 |
|
85 | |||
86 |
return crecordmod.filterpatch(ui, originalhunks, recordfn |
|
86 | return crecordmod.filterpatch(ui, originalhunks, recordfn) | |
87 |
|
87 | |||
88 | else: |
|
88 | else: | |
89 | return patch.filterpatch(ui, originalhunks, operation) |
|
89 | return patch.filterpatch(ui, originalhunks, operation) |
@@ -440,11 +440,8 b' class uihunk(patchnode):' | |||||
440 | def __repr__(self): |
|
440 | def __repr__(self): | |
441 | return '<hunk %r@%d>' % (self.filename(), self.fromline) |
|
441 | return '<hunk %r@%d>' % (self.filename(), self.fromline) | |
442 |
|
442 | |||
443 |
def filterpatch(ui, chunks, chunkselector |
|
443 | def filterpatch(ui, chunks, chunkselector): | |
444 | """interactively filter patch chunks into applied-only chunks""" |
|
444 | """interactively filter patch chunks into applied-only chunks""" | |
445 |
|
||||
446 | if operation is None: |
|
|||
447 | operation = _('confirm') |
|
|||
448 | chunks = list(chunks) |
|
445 | chunks = list(chunks) | |
449 | # convert chunks list into structure suitable for displaying/modifying |
|
446 | # convert chunks list into structure suitable for displaying/modifying | |
450 | # with curses. create a list of headers only. |
|
447 | # with curses. create a list of headers only. |
General Comments 0
You need to be logged in to leave comments.
Login now