equal
deleted
inserted
replaced
114 |
114 |
115 status = repo.status(match=match) |
115 status = repo.status(match=match) |
116 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) |
116 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) |
117 diffopts.nodates = True |
117 diffopts.nodates = True |
118 diffopts.git = True |
118 diffopts.git = True |
|
119 diffopts.showfunc = True |
119 originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
120 originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
120 originalchunks = patch.parsepatch(originaldiff) |
121 originalchunks = patch.parsepatch(originaldiff) |
121 |
122 |
122 # 1. filter patch, so we have intending-to apply subset of it |
123 # 1. filter patch, so we have intending-to apply subset of it |
123 try: |
124 try: |