Mercurial > hgsubversion
comparison hgsubversion/stupid.py @ 1320:2061fd988f3f
stupid: adapt to Mercurial 3.4 changes
Straightforward API change.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 27 Mar 2015 16:42:50 -0700 |
parents | 3e6013940854 |
children | 57d65269d30c 89997a5fc181 |
comparison
equal
deleted
inserted
replaced
1319:43a365f5d13c | 1320:2061fd988f3f |
---|---|
192 try: | 192 try: |
193 touched = set() | 193 touched = set() |
194 backend = svnbackend(ui, meta.repo, parentctx, store) | 194 backend = svnbackend(ui, meta.repo, parentctx, store) |
195 | 195 |
196 try: | 196 try: |
197 ret = patch.patchbackend(ui, backend, patchfp, 0, touched) | 197 try: |
198 ret = patch.patchbackend(ui, backend, patchfp, 0, files=touched) | |
199 except TypeError: | |
200 # Mercurial >= 3.4 have an extra prefix parameter | |
201 ret = patch.patchbackend(ui, backend, patchfp, 0, '', | |
202 files=touched) | |
198 if ret < 0: | 203 if ret < 0: |
199 raise BadPatchApply('patching failed') | 204 raise BadPatchApply('patching failed') |
200 if ret > 0: | 205 if ret > 0: |
201 raise BadPatchApply('patching succeeded with fuzz') | 206 raise BadPatchApply('patching succeeded with fuzz') |
202 except patch.PatchError, e: | 207 except patch.PatchError, e: |