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.

37083:f99d64e8a4e4

    revset,
    scmutil,
    smartset,
    util,
    vfs as vfsmod,
)

class TransplantError(error.Abort):
    pass

                if os.path.exists(seriespath):
                    os.unlink(seriespath)
                p1 = repo.dirstate.p1()
                p2 = node
                self.log(user, date, message, p1, p2, merge=merge)
                self.ui.write(util.forcebytestr(inst) + '\n')
                raise TransplantError(_('fix up the working directory and run '
                                        'hg transplant --continue'))
        else:
            files = None
        if merge:

37084:f0b6fbea00cf

    revset,
    scmutil,
    smartset,
    util,
    vfs as vfsmod,
)
from mercurial.utils import (
    stringutil,
)

class TransplantError(error.Abort):
    pass

                if os.path.exists(seriespath):
                    os.unlink(seriespath)
                p1 = repo.dirstate.p1()
                p2 = node
                self.log(user, date, message, p1, p2, merge=merge)
                self.ui.write(stringutil.forcebytestr(inst) + '\n')
                raise TransplantError(_('fix up the working directory and run '
                                        'hg transplant --continue'))
        else:
            files = None
        if merge: