This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3944

rebase: in --confirm option just abort if hit a conflict
ClosedPublic

Authored by khanchi97 on Jul 14 2018, 2:00 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb3d0c97a0820: rebase: in --confirm option just abort if hit a conflict
Summary

Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is atleast one conlict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.

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

khanchi97 created this revision.Jul 14 2018, 2:00 AM
khanchi97 added inline comments.Jul 14 2018, 7:20 AM
hgext/rebase.py
875

In the case when we hit a conflict, yuya suggested me to either prompt the user to confirm for "rerun rebase that's known to have at least one conflict" OR not prompt at all, just abort if we hit a conflict.
And I think, to keep it simple, just aborting is good option, not sure first option could be more useful though.

yuja added a subscriber: yuja.Jul 14 2018, 10:14 AM

Queued, thanks.

rbsrt._prepareabortorcontinue(isabort=True, backup=False,
                              suppwarns=True)
needsabort = False

You can remove the if confirm: block at all as it's handled at finally:.

Closed by commit rHGb3d0c97a0820: rebase: in --confirm option just abort if hit a conflict (authored by khanchi97). · Explain WhyJul 14 2018, 10:19 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (3 lines)
Mtests/test-rebase-inmemory.t (60 lines)

Diff 9594

hgext/rebase.py

leaveunfinished=True) leaveunfinished=True)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
if confirm: if confirm:
# abort as in-memory merge doesn't support conflict # abort as in-memory merge doesn't support conflict
rbsrt._prepareabortorcontinue(isabort=True, backup=False, rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True) suppwarns=True)
needsabort = False needsabort = False
if not ui.promptchoice(_(b'apply changes (yn)?'
khanchi97AuthorUnsubmitted
Not Done

In the case when we hit a conflict, yuya suggested me to either prompt the user to confirm for "rerun rebase that's known to have at least one conflict" OR not prompt at all, just abort if we hit a conflict.
And I think, to keep it simple, just aborting is good option, not sure first option could be more useful though.

khanchi97: In the case when we hit a conflict, yuya suggested me to either prompt the user to confirm for…
b'$$ &Yes $$ &No')):
return _dorebase(ui, repo, opts, inmemory=False)
return 1 return 1
else: else:
if confirm: if confirm:
ui.status(_('rebase completed successfully\n')) ui.status(_('rebase completed successfully\n'))
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
# finish unfinished rebase # finish unfinished rebase
rbsrt._finishrebase() rbsrt._finishrebase()

tests/test-rebase-inmemory.t

|/ c |/ c
| |
o 1:d2ae7f538514 test o 1:d2ae7f538514 test
| b | b
| |
o 0:cb9a9f314b8b test o 0:cb9a9f314b8b test
a a
$ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF $ hg rebase -s 4 -d . --keep --confirm
> n
> EOF
starting in-memory rebase
rebasing 4:e860deea161a "e"
merging e
hit a merge conflict
apply changes (yn)? n
[1]
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@ 9:906d72f66a59 test
| conflict with e
|
o 8:12cbf031f469 test
| d
|
o 7:c83b1da5b1ae test
| c
|
o 6:baf10c5166d4 test
| g
|
o 5:6343ca3eff20 test
| f
|
| o 4:e860deea161a test
| | e
| |
| o 3:055a42cdd887 test
| | d
| |
| o 2:177f92b77385 test
|/ c
|
o 1:d2ae7f538514 test
| b
|
o 0:cb9a9f314b8b test
a
$ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
> y
> EOF
starting in-memory rebase starting in-memory rebase
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
merging e merging e
hit a merge conflict hit a merge conflict
apply changes (yn)? y
rebasing 4:e860deea161a "e"
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ echo e>e
$ hg resolve --mark --all
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
rebasing 4:e860deea161a "e"
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
o 10:9fa3731dd6df test
| e
|
@ 9:906d72f66a59 test @ 9:906d72f66a59 test
| conflict with e | conflict with e
| |
o 8:12cbf031f469 test o 8:12cbf031f469 test
| d | d
| |
o 7:c83b1da5b1ae test o 7:c83b1da5b1ae test
| c | c