This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5540

histedit: fix --continue and --abort when curses is enabled
ClosedPublic

Authored by durin42 on Jan 9 2019, 6:00 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG9bc7ec924234: histedit: fix --continue and --abort when curses is enabled
Summary

I overlooked this when I did the initial import.

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

durin42 created this revision.Jan 9 2019, 6:00 PM
martinvonz added a subscriber: martinvonz.Jan 9 2019, 6:07 PM
martinvonz added inline comments.
hgext/histedit.py
1599–1600

Maybe use ... and _getgoal(opts) == goalnew instead? In addition to being simpler, that seems like it would also correctly handle the --edit-plan option (which I didn't even know existed until just now).

durin42 updated this revision to Diff 13136.Jan 10 2019, 10:24 AM
martinvonz accepted this revision.Jan 10 2019, 1:45 PM
This revision is now accepted and ready to land.Jan 10 2019, 1:45 PM
Closed by commit rHG9bc7ec924234: histedit: fix --continue and --abort when curses is enabled (authored by durin42). · Explain WhyJan 10 2019, 1:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (5 lines)
Mtests/test-histedit-non-commute.t (5 lines)

Diff 13140

hgext/histedit.py

pick 8ef592ce7cc4 4 Bedazzle the zerlog pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 5339bf82f0ca 3 Zworgle the foobar pick 5339bf82f0ca 3 Zworgle the foobar
pick 252a1af424ad 2 Blorb a morgwazzle pick 252a1af424ad 2 Blorb a morgwazzle
Returns 0 on success, 1 if user intervention is required (not only Returns 0 on success, 1 if user intervention is required (not only
for intentional "edit" command, but also for resolving unexpected for intentional "edit" command, but also for resolving unexpected
conflicts). conflicts).
""" """
if ui.interface('histedit') == 'curses': # kludge: _chistedit only works for starting an edit, not aborting
# or continuing, so fall back to regular _texthistedit for those
# operations.
if ui.interface('histedit') == 'curses' and _getgoal(opts) == goalnew:
return _chistedit(ui, repo, *freeargs, **opts) return _chistedit(ui, repo, *freeargs, **opts)
martinvonzUnsubmitted
Not Done

Maybe use ... and _getgoal(opts) == goalnew instead? In addition to being simpler, that seems like it would also correctly handle the --edit-plan option (which I didn't even know existed until just now).

martinvonz: Maybe use `... and _getgoal(opts) == goalnew` instead? In addition to being simpler, that seems…
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
state.lock = lock state.lock = lock
_histedit(ui, repo, state, *freeargs, **opts) _histedit(ui, repo, state, *freeargs, **opts)

tests/test-histedit-non-commute.t

$ hg resolve --mark e $ hg resolve --mark e
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --continue 2>&1 | fixbundle $ hg histedit --continue 2>&1 | fixbundle
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick 7b4e2f4b7bcd) Fix up the change (pick 7b4e2f4b7bcd)
(hg histedit --continue to resume) (hg histedit --continue to resume)
$ hg histedit --continue 2>&1 | fixbundle We forcibly enable curses here so we can verify that continuing works
with curses enabled.
$ hg histedit --continue --config ui.interactive=true \
> --config ui.interface=curses 2>&1 | fixbundle
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative
former children. former children.
just continue this time just continue this time
$ hg revert -r 'p1()' e $ hg revert -r 'p1()' e
make sure the to-be-empty commit doesn't screw up the state (issue5545) make sure the to-be-empty commit doesn't screw up the state (issue5545)