Mercurial > hg
comparison hgext/transplant.py @ 37120:a8a902d7176e
procutil: bulk-replace function calls to point to new module
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 24 Mar 2018 15:10:51 +0900 |
parents | f0b6fbea00cf |
children | 2a8939e25d07 |
comparison
equal
deleted
inserted
replaced
37119:d4a2e0d5d042 | 37120:a8a902d7176e |
---|---|
37 smartset, | 37 smartset, |
38 util, | 38 util, |
39 vfs as vfsmod, | 39 vfs as vfsmod, |
40 ) | 40 ) |
41 from mercurial.utils import ( | 41 from mercurial.utils import ( |
42 procutil, | |
42 stringutil, | 43 stringutil, |
43 ) | 44 ) |
44 | 45 |
45 class TransplantError(error.Abort): | 46 class TransplantError(error.Abort): |
46 pass | 47 pass |
269 fp.write("# Date %d %d\n" % date) | 270 fp.write("# Date %d %d\n" % date) |
270 fp.write(msg + '\n') | 271 fp.write(msg + '\n') |
271 fp.close() | 272 fp.close() |
272 | 273 |
273 try: | 274 try: |
274 self.ui.system('%s %s %s' % (filter, util.shellquote(headerfile), | 275 self.ui.system('%s %s %s' % (filter, |
275 util.shellquote(patchfile)), | 276 procutil.shellquote(headerfile), |
277 procutil.shellquote(patchfile)), | |
276 environ={'HGUSER': changelog[1], | 278 environ={'HGUSER': changelog[1], |
277 'HGREVISION': nodemod.hex(node), | 279 'HGREVISION': nodemod.hex(node), |
278 }, | 280 }, |
279 onerr=error.Abort, errprefix=_('filter failed'), | 281 onerr=error.Abort, errprefix=_('filter failed'), |
280 blockedtag='transplant_filter') | 282 blockedtag='transplant_filter') |