This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8230

histedit: fix formatting after D8150
ClosedPublic

Authored by martinvonz on Mar 5 2020, 11:31 AM.

Details

Reviewers
durin42
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG24a3a9f7ea77: histedit: fix formatting after D8150
rHGa02418dfe7f2: histedit: fix formatting after D8150

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 5 2020, 11:31 AM
Alphare accepted this revision.Mar 5 2020, 11:42 AM
pulkit accepted this revision.Mar 5 2020, 12:23 PM
This revision is now accepted and ready to land.Mar 5 2020, 12:23 PM
martinvonz added a commit: rHGa02418dfe7f2: histedit: fix formatting after D8150.Mar 5 2020, 12:25 PM
Closed by commit rHGa02418dfe7f2: histedit: fix formatting after D8150 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Mar 5 2020, 12:54 PM

Sorry, I accidentally queued this myself. OTOH, the patch already was accepted by two people and it seems entirely uncontroversial and it's nice to have tests passing, so I'll leave it queued and will also merge it into the default branch so tests pass there too.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (5 lines)

Diff 20519

hgext/histedit.py

for intentional "edit" command, but also for resolving unexpected for intentional "edit" command, but also for resolving unexpected
conflicts). conflicts).
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
# kludge: _chistedit only works for starting an edit, not aborting # kludge: _chistedit only works for starting an edit, not aborting
# or continuing, so fall back to regular _texthistedit for those # or continuing, so fall back to regular _texthistedit for those
# operations. # operations.
if ( if ui.interface(b'histedit') == b'curses' and _getgoal(opts) == goalnew:
ui.interface(b'histedit') == b'curses'
and _getgoal(opts) == goalnew
):
return _chistedit(ui, repo, freeargs, opts) return _chistedit(ui, repo, freeargs, opts)
return _texthistedit(ui, repo, freeargs, opts) return _texthistedit(ui, repo, freeargs, opts)
def _texthistedit(ui, repo, freeargs, opts): def _texthistedit(ui, repo, freeargs, opts):
state = histeditstate(repo) state = histeditstate(repo)
with repo.wlock() as wlock, repo.lock() as lock: with repo.wlock() as wlock, repo.lock() as lock:
state.wlock = wlock state.wlock = wlock