diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -406,7 +406,7 @@ self.repo.ui.debug("rebasing on disk\n") self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory) - def _performrebase(self, tr): + def _performrebase(self, tr, supprbinfo=False): self._assignworkingcopy() repo, ui = self.repo, self.ui if self.keepbranchesf: @@ -455,7 +455,8 @@ self.obsoletewithoutsuccessorindestination, ) for rev in sortedrevs: - self._rebasenode(tr, rev, allowdivergence, progress) + self._rebasenode(tr, rev, allowdivergence, progress, + supprbinfo=supprbinfo) p.complete() ui.note(_('rebase merging completed\n')) @@ -504,7 +505,8 @@ mergemod.mergestate.clean(repo) 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 dest = self.destmap[rev] ctx = repo[rev] @@ -535,7 +537,8 @@ self.skipped)) self.state[rev] = dest elif self.state[rev] == revtodo: - ui.status(_('rebasing %s\n') % desc) + if not supprbinfo: + ui.status(_('rebasing %s\n') % desc) progressfn(ctx) p1, p2, base = defineparents(repo, rev, self.destmap, self.state, self.skipped, @@ -872,7 +875,7 @@ suppwarns=True) if not ui.promptchoice(_(b'apply changes (yn)?' b'$$ &Yes $$ &No')): - _dorebase(ui, repo, opts, inmemory=False) + _dorebase(ui, repo, opts, inmemory=False, supprbinfo=True) return 1 else: if confirm: @@ -894,12 +897,13 @@ rbsrt._prepareabortorcontinue(isabort=True, backup=False, suppwarns=True) -def _dorebase(ui, repo, opts, inmemory=False): +def _dorebase(ui, repo, opts, inmemory=False, supprbinfo=False): 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, - supptrwarns=False): + supptrwarns=False, supprbinfo=False): with repo.wlock(), repo.lock(): # Validate input and define rebasing points destf = opts.get('dest', None) @@ -968,7 +972,7 @@ if singletr and not inmemory: dsguard = dirstateguard.dirstateguard(repo, 'rebase') with util.acceptintervention(dsguard): - rbsrt._performrebase(tr) + rbsrt._performrebase(tr, supprbinfo=supprbinfo) if not leaveunfinished: rbsrt._finishrebase() diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -519,7 +519,6 @@ merging e 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)