equal
deleted
inserted
replaced
146 diffopts.git = True |
146 diffopts.git = True |
147 diffopts.showfunc = True |
147 diffopts.showfunc = True |
148 originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
148 originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
149 originalchunks = patch.parsepatch(originaldiff) |
149 originalchunks = patch.parsepatch(originaldiff) |
150 |
150 |
151 # 1. filter patch, so we have intending-to apply subset of it |
151 # 1. filter patch, since we are intending to apply subset of it |
152 try: |
152 try: |
153 chunks, newopts = filterfn(ui, originalchunks) |
153 chunks, newopts = filterfn(ui, originalchunks) |
154 except patch.PatchError as err: |
154 except patch.PatchError as err: |
155 raise error.Abort(_('error parsing patch: %s') % err) |
155 raise error.Abort(_('error parsing patch: %s') % err) |
156 opts.update(newopts) |
156 opts.update(newopts) |