This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3871

rebase: improve output of --confirm option
AbandonedPublic

Authored by khanchi97 on Jul 1 2018, 5:52 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Before this patch --cofirm option was throwing the same rebasing
information two times, one before confirmation and one after. Also
added tests to reflect the same behavior.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Jul 1 2018, 5:52 AM
khanchi97 edited the summary of this revision. (Show Details)Jul 9 2018, 11:43 PM
khanchi97 updated this revision to Diff 9487.
khanchi97 updated this revision to Diff 9503.Jul 10 2018, 10:45 AM
durin42 added a subscriber: durin42.Jul 13 2018, 10:02 AM

This doesn't apply cleanly, could you rebase it?

hgext/rebase.py
975

I feel like the functions that accept supprbinfo should grow a docstring or comment that explains what supprbinfo does.

(I sort of figured it out, but it took a while.)

khanchi97 added a comment.Jul 14 2018, 2:07 AM
In D3871#61439, @durin42 wrote:

This doesn't apply cleanly, could you rebase it?

@durin42 I have made a change in --confirm option https://phab.mercurial-scm.org/D3944 if this functionality (don't prompt if hit a conflict) is acceptable then we don't need this patch (i.e suppressing rebase info). Thanks!

hgext/rebase.py
975

yeah, next time I will take care of this.

khanchi97 abandoned this revision.Aug 3 2018, 4:38 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (22 lines)
Mtests/test-rebase-inmemory.t (1 line)

Diff 9503

hgext/rebase.py

from mercurial.context import overlayworkingctx from mercurial.context import overlayworkingctx
self.wctx = overlayworkingctx(self.repo) self.wctx = overlayworkingctx(self.repo)
self.repo.ui.debug("rebasing in-memory\n") self.repo.ui.debug("rebasing in-memory\n")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
self.repo.ui.debug("rebasing on disk\n") self.repo.ui.debug("rebasing on disk\n")
self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory) self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory)
def _performrebase(self, tr): def _performrebase(self, tr, supprbinfo=False):
self._assignworkingcopy() self._assignworkingcopy()
repo, ui = self.repo, self.ui repo, ui = self.repo, self.ui
if self.keepbranchesf: if self.keepbranchesf:
# insert _savebranch at the start of extrafns so if # insert _savebranch at the start of extrafns so if
# there's a user-provided extrafn it can clobber branch if # there's a user-provided extrafn it can clobber branch if
# desired # desired
self.extrafns.insert(0, _savebranch) self.extrafns.insert(0, _savebranch)
if self.collapsef: if self.collapsef:
sortedrevs = self.repo.revs('sort(%ld, -topo)', subset) sortedrevs = self.repo.revs('sort(%ld, -topo)', subset)
if not allowdivergence: if not allowdivergence:
sortedrevs -= self.repo.revs( sortedrevs -= self.repo.revs(
'descendants(%ld) and not %ld', 'descendants(%ld) and not %ld',
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
) )
for rev in sortedrevs: for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress) self._rebasenode(tr, rev, allowdivergence, progress,
supprbinfo=supprbinfo)
p.complete() p.complete()
ui.note(_('rebase merging completed\n')) ui.note(_('rebase merging completed\n'))
def _concludenode(self, rev, p1, p2, editor, commitmsg=None): def _concludenode(self, rev, p1, p2, editor, commitmsg=None):
'''Commit the wd changes with parents p1 and p2. '''Commit the wd changes with parents p1 and p2.
Reuse commit info from rev but also store useful information in extra. Reuse commit info from rev but also store useful information in extra.
Return node of committed revision.''' Return node of committed revision.'''
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
return newnode return newnode
def _rebasenode(self, tr, rev, allowdivergence, progressfn): def _rebasenode(self, tr, rev, allowdivergence, progressfn,
supprbinfo=False):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
dest = self.destmap[rev] dest = self.destmap[rev]
ctx = repo[rev] ctx = repo[rev]
desc = _ctxdesc(ctx) desc = _ctxdesc(ctx)
if self.state[rev] == rev: if self.state[rev] == rev:
ui.status(_('already rebased %s\n') % desc) ui.status(_('already rebased %s\n') % desc)
elif (not allowdivergence elif (not allowdivergence
and rev in self.obsoletewithoutsuccessorindestination): and rev in self.obsoletewithoutsuccessorindestination):
# Make clearrebased aware state[rev] is not a true successor # Make clearrebased aware state[rev] is not a true successor
self.skipped.add(rev) self.skipped.add(rev)
# Record rev as moved to its desired destination in self.state. # Record rev as moved to its desired destination in self.state.
# This helps bookmark and working parent movement. # This helps bookmark and working parent movement.
dest = max(adjustdest(repo, rev, self.destmap, self.state, dest = max(adjustdest(repo, rev, self.destmap, self.state,
self.skipped)) self.skipped))
self.state[rev] = dest self.state[rev] = dest
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
if not supprbinfo:
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
progressfn(ctx) progressfn(ctx)
p1, p2, base = defineparents(repo, rev, self.destmap, p1, p2, base = defineparents(repo, rev, self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
if len(repo[None].parents()) == 2: if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
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)
if not ui.promptchoice(_(b'apply changes (yn)?' if not ui.promptchoice(_(b'apply changes (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
_dorebase(ui, repo, opts, inmemory=False) _dorebase(ui, repo, opts, inmemory=False, supprbinfo=True)
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()
else: else:
rbsrt._prepareabortorcontinue(isabort=True, backup=False, rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True) suppwarns=True)
else: else:
ui.status(_('dry-run rebase completed successfully; run without' ui.status(_('dry-run rebase completed successfully; run without'
' -n/--dry-run to perform this rebase\n')) ' -n/--dry-run to perform this rebase\n'))
return 0 return 0
finally: finally:
if not confirm: if not confirm:
# no need to store backup in case of dryrun # no need to store backup in case of dryrun
rbsrt._prepareabortorcontinue(isabort=True, backup=False, rbsrt._prepareabortorcontinue(isabort=True, backup=False,
suppwarns=True) suppwarns=True)
def _dorebase(ui, repo, opts, inmemory=False): def _dorebase(ui, repo, opts, inmemory=False, supprbinfo=False):
rbsrt = rebaseruntime(repo, ui, inmemory, opts) rbsrt = rebaseruntime(repo, ui, inmemory, opts)
return _origrebase(ui, repo, opts, rbsrt, inmemory=inmemory) return _origrebase(ui, repo, opts, rbsrt, inmemory=inmemory,
supprbinfo=supprbinfo)
def _origrebase(ui, repo, opts, rbsrt, inmemory=False, leaveunfinished=False, def _origrebase(ui, repo, opts, rbsrt, inmemory=False, leaveunfinished=False,
supptrwarns=False): supptrwarns=False, supprbinfo=False):
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
# Validate input and define rebasing points # Validate input and define rebasing points
destf = opts.get('dest', None) destf = opts.get('dest', None)
srcf = opts.get('source', None) srcf = opts.get('source', None)
basef = opts.get('base', None) basef = opts.get('base', None)
revf = opts.get('rev', []) revf = opts.get('rev', [])
# search default destination in this space # search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214. # used in the 'hg pull --rebase' case, see issue 5214.
# committing each node, which is slower but allows partial success. # committing each node, which is slower but allows partial success.
with util.acceptintervention(tr): with util.acceptintervention(tr):
# Same logic for the dirstate guard, except we don't create one when # Same logic for the dirstate guard, except we don't create one when
# rebasing in-memory (it's not needed). # rebasing in-memory (it's not needed).
dsguard = None dsguard = None
if singletr and not inmemory: if singletr and not inmemory:
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
rbsrt._performrebase(tr) rbsrt._performrebase(tr, supprbinfo=supprbinfo)
durin42Unsubmitted
Not Done

I feel like the functions that accept supprbinfo should grow a docstring or comment that explains what supprbinfo does.

(I sort of figured it out, but it took a while.)

durin42: I feel like the functions that accept supprbinfo should grow a docstring or comment that…
khanchi97AuthorUnsubmitted
Not Done

yeah, next time I will take care of this.

khanchi97: yeah, next time I will take care of this.
if not leaveunfinished: if not leaveunfinished:
rbsrt._finishrebase() rbsrt._finishrebase()
def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None, def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None,
revf=None, destspace=None): revf=None, destspace=None):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []

tests/test-rebase-inmemory.t

$ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
> y > y
> EOF > EOF
starting rebase... starting 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 apply changes (yn)? y
rebasing 4:e860deea161a "e"
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')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ echo e>e $ echo e>e
$ hg resolve --mark --all $ hg resolve --mark --all
(no more unresolved files) (no more unresolved files)