comparison mercurial/commands.py @ 37084:f0b6fbea00cf

stringutil: bulk-replace call sites to point to new module

This might conflict with other patches floating around, sorry.

37083:f99d64e8a4e4

    templatekw,
    ui as uimod,
    util,
    wireprotoserver,
)
from .utils import dateutil

release = lockmod.release

table = {}
table.update(debugcommandsmod.command._table)

            datefmt = '%a %b %d %H:%M:%S %Y %1%2'
        found = False
        @util.cachefunc
        def binary():
            flog = getfile(fn)
            return util.binary(flog.read(ctx.filenode(fn)))

        fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
        if opts.get('all'):
            iter = difflinestates(pstates, states)
        else:

        return
    if optupdate:
        try:
            return hg.updatetotally(ui, repo, checkout, brev)
        except error.UpdateAbort as inst:
            msg = _("not updating: %s") % util.forcebytestr(inst)
            hint = inst.hint
            raise error.UpdateAbort(msg, hint=hint)
    if modheads > 1:
        currentbranchheads = len(repo.branchheads())
        if currentbranchheads == modheads:

37084:f0b6fbea00cf

    templatekw,
    ui as uimod,
    util,
    wireprotoserver,
)
from .utils import (
    dateutil,
    stringutil,
)

release = lockmod.release

table = {}
table.update(debugcommandsmod.command._table)

            datefmt = '%a %b %d %H:%M:%S %Y %1%2'
        found = False
        @util.cachefunc
        def binary():
            flog = getfile(fn)
            return stringutil.binary(flog.read(ctx.filenode(fn)))

        fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
        if opts.get('all'):
            iter = difflinestates(pstates, states)
        else:

        return
    if optupdate:
        try:
            return hg.updatetotally(ui, repo, checkout, brev)
        except error.UpdateAbort as inst:
            msg = _("not updating: %s") % stringutil.forcebytestr(inst)
            hint = inst.hint
            raise error.UpdateAbort(msg, hint=hint)
    if modheads > 1:
        currentbranchheads = len(repo.branchheads())
        if currentbranchheads == modheads: