comparison mercurial/cmdutil.py @ 32921:5694311db6ed

amend: use context manager for locking

32920:8dbcb66ac160

    crecord as crecordmod,
    encoding,
    error,
    formatter,
    graphmod,
    lock as lockmod,
    match as matchmod,
    obsolete,
    patch,
    pathutil,
    phases,

    ui.note(_('amending changeset %s\n') % old)
    base = old.p1()
    createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)

    wlock = lock = newid = None
    try:
        wlock = repo.wlock()
        lock = repo.lock()
        with repo.transaction('amend') as tr:
            # See if we got a message from -m or -l, if not, open the editor
            # with the message of the changeset to amend
            message = logmessage(ui, opts)
            # ensure logfile does not conflict with later enforcement of the

            # commit
            if node:
                ui.note(_('stripping intermediate changeset %s\n') % ctx)
            ui.note(_('stripping amended changeset %s\n') % old)
            repair.strip(ui, repo, old.node(), topic='amend-backup')
    finally:
        lockmod.release(lock, wlock)
    return newid

def commiteditor(repo, ctx, subs, editform=''):
    if ctx.description():
        return ctx.description()

32921:5694311db6ed

    crecord as crecordmod,
    encoding,
    error,
    formatter,
    graphmod,
    match as matchmod,
    obsolete,
    patch,
    pathutil,
    phases,

    ui.note(_('amending changeset %s\n') % old)
    base = old.p1()
    createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)

    newid = None
    with repo.wlock(), repo.lock():
        with repo.transaction('amend') as tr:
            # See if we got a message from -m or -l, if not, open the editor
            # with the message of the changeset to amend
            message = logmessage(ui, opts)
            # ensure logfile does not conflict with later enforcement of the

            # commit
            if node:
                ui.note(_('stripping intermediate changeset %s\n') % ctx)
            ui.note(_('stripping amended changeset %s\n') % old)
            repair.strip(ui, repo, old.node(), topic='amend-backup')
    return newid

def commiteditor(repo, ctx, subs, editform=''):
    if ctx.description():
        return ctx.description()