Show More
@@ -276,8 +276,6 b' class queue:' | |||||
276 | # TODO unify with commands.py |
|
276 | # TODO unify with commands.py | |
277 | if not patchdir: |
|
277 | if not patchdir: | |
278 | patchdir = self.path |
|
278 | patchdir = self.path | |
279 | pwd = os.getcwd() |
|
|||
280 | os.chdir(repo.root) |
|
|||
281 | err = 0 |
|
279 | err = 0 | |
282 | if not wlock: |
|
280 | if not wlock: | |
283 | wlock = repo.wlock() |
|
281 | wlock = repo.wlock() | |
@@ -304,7 +302,8 b' class queue:' | |||||
304 |
|
302 | |||
305 | try: |
|
303 | try: | |
306 | pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') |
|
304 | pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') | |
307 |
f = os.popen("%s -p1 --no-backup-if-mismatch < '%s'" % |
|
305 | f = os.popen("%s -d '%s' -p1 --no-backup-if-mismatch < '%s'" % | |
|
306 | (pp, repo.root, pf)) | |||
308 | except: |
|
307 | except: | |
309 | self.ui.warn("patch failed, unable to continue (try -v)\n") |
|
308 | self.ui.warn("patch failed, unable to continue (try -v)\n") | |
310 | err = 1 |
|
309 | err = 1 | |
@@ -371,7 +370,6 b' class queue:' | |||||
371 | err = 1 |
|
370 | err = 1 | |
372 | break |
|
371 | break | |
373 | tr.close() |
|
372 | tr.close() | |
374 | os.chdir(pwd) |
|
|||
375 | return (err, n) |
|
373 | return (err, n) | |
376 |
|
374 | |||
377 | def delete(self, repo, patch): |
|
375 | def delete(self, repo, patch): |
General Comments 0
You need to be logged in to leave comments.
Login now