Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 2270:afd7c4ec000f
Fix issue240: mq: qpush fails on Solaris
author | Danek Duvall <danek.duvall@sun.com> |
---|---|
date | Thu, 11 May 2006 18:24:58 -0700 |
parents | 5acd648770d0 |
children | dacf718e1d48 |
comparison
equal
deleted
inserted
replaced
2269:8cb77698f5fd | 2270:afd7c4ec000f |
---|---|
279 if list: | 279 if list: |
280 message.append("\nimported patch %s" % patch) | 280 message.append("\nimported patch %s" % patch) |
281 message = '\n'.join(message) | 281 message = '\n'.join(message) |
282 | 282 |
283 try: | 283 try: |
284 f = os.popen("patch -p1 --no-backup-if-mismatch < '%s'" % (pf)) | 284 pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') |
285 f = os.popen("%s -p1 --no-backup-if-mismatch < '%s'" % (pp, pf)) | |
285 except: | 286 except: |
286 self.ui.warn("patch failed, unable to continue (try -v)\n") | 287 self.ui.warn("patch failed, unable to continue (try -v)\n") |
287 err = 1 | 288 err = 1 |
288 break | 289 break |
289 files = [] | 290 files = [] |