Mercurial > hg
comparison hgext/transplant.py @ 37084:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 22 Mar 2018 21:56:20 +0900 |
parents | 5bc7ff103081 |
children | a8a902d7176e |
comparison
equal
deleted
inserted
replaced
37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
---|---|
35 revset, | 35 revset, |
36 scmutil, | 36 scmutil, |
37 smartset, | 37 smartset, |
38 util, | 38 util, |
39 vfs as vfsmod, | 39 vfs as vfsmod, |
40 ) | |
41 from mercurial.utils import ( | |
42 stringutil, | |
40 ) | 43 ) |
41 | 44 |
42 class TransplantError(error.Abort): | 45 class TransplantError(error.Abort): |
43 pass | 46 pass |
44 | 47 |
309 if os.path.exists(seriespath): | 312 if os.path.exists(seriespath): |
310 os.unlink(seriespath) | 313 os.unlink(seriespath) |
311 p1 = repo.dirstate.p1() | 314 p1 = repo.dirstate.p1() |
312 p2 = node | 315 p2 = node |
313 self.log(user, date, message, p1, p2, merge=merge) | 316 self.log(user, date, message, p1, p2, merge=merge) |
314 self.ui.write(util.forcebytestr(inst) + '\n') | 317 self.ui.write(stringutil.forcebytestr(inst) + '\n') |
315 raise TransplantError(_('fix up the working directory and run ' | 318 raise TransplantError(_('fix up the working directory and run ' |
316 'hg transplant --continue')) | 319 'hg transplant --continue')) |
317 else: | 320 else: |
318 files = None | 321 files = None |
319 if merge: | 322 if merge: |