| martinvonz | |
| marmoute | |
| Alphare | |
| pulkit |
| hg-reviewers |
This adds support for the recently added rewrite.empty-successor configuration.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (16 lines) | |||
| M | mercurial/helptext/config.txt (3 lines) | |||
| A | M | tests/test-rebase-empty-successor.t (44 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c67b2ba71965 | 67082fc1c2bf | Manuel Jacob | Jun 1 2020, 2:38 AM |
| e = opts.get(b'extrafn') # internal, used by e.g. hgsubversion | e = opts.get(b'extrafn') # internal, used by e.g. hgsubversion | ||||
| self.extrafns = [_savegraft] | self.extrafns = [_savegraft] | ||||
| if e: | if e: | ||||
| self.extrafns = [e] | self.extrafns = [e] | ||||
| self.backupf = ui.configbool(b'rewrite', b'backup-bundle') | self.backupf = ui.configbool(b'rewrite', b'backup-bundle') | ||||
| self.keepf = opts.get(b'keep', False) | self.keepf = opts.get(b'keep', False) | ||||
| self.keepbranchesf = opts.get(b'keepbranches', False) | self.keepbranchesf = opts.get(b'keepbranches', False) | ||||
| self.skipemptysuccessorf = rewriteutil.skip_empty_successor( | |||||
| repo.ui, b'rebase' | |||||
| ) | |||||
| self.obsoletenotrebased = {} | self.obsoletenotrebased = {} | ||||
| self.obsoletewithoutsuccessorindestination = set() | self.obsoletewithoutsuccessorindestination = set() | ||||
| self.inmemory = inmemory | self.inmemory = inmemory | ||||
| self.stateobj = statemod.cmdstate(repo, b'rebasestate') | self.stateobj = statemod.cmdstate(repo, b'rebasestate') | ||||
| @property | @property | ||||
| def repo(self): | def repo(self): | ||||
| if self.prepared: | if self.prepared: | ||||
| commitmsg = ctx.description() | commitmsg = ctx.description() | ||||
| date = self.date | date = self.date | ||||
| if date is None: | if date is None: | ||||
| date = ctx.date() | date = ctx.date() | ||||
| extra = {b'rebase_source': ctx.hex()} | extra = {b'rebase_source': ctx.hex()} | ||||
| for c in self.extrafns: | for c in self.extrafns: | ||||
| c(ctx, extra) | c(ctx, extra) | ||||
| destphase = max(ctx.phase(), phases.draft) | destphase = max(ctx.phase(), phases.draft) | ||||
| overrides = {(b'phases', b'new-commit'): destphase} | overrides = { | ||||
| (b'phases', b'new-commit'): destphase, | |||||
| (b'ui', b'allowemptycommit'): not self.skipemptysuccessorf, | |||||
| } | |||||
| with repo.ui.configoverride(overrides, b'rebase'): | with repo.ui.configoverride(overrides, b'rebase'): | ||||
| if self.inmemory: | if self.inmemory: | ||||
| newnode = commitmemorynode( | newnode = commitmemorynode( | ||||
| repo, | repo, | ||||
| wctx=self.wctx, | wctx=self.wctx, | ||||
| extra=extra, | extra=extra, | ||||
| commitmsg=commitmsg, | commitmsg=commitmsg, | ||||
| editor=editor, | editor=editor, | ||||
| newnode = self._concludenode(rev, p1, editor) | newnode = self._concludenode(rev, p1, editor) | ||||
| else: | else: | ||||
| # Skip commit if we are collapsing | # Skip commit if we are collapsing | ||||
| newnode = None | newnode = None | ||||
| # Update the state | # Update the state | ||||
| if newnode is not None: | if newnode is not None: | ||||
| self.state[rev] = repo[newnode].rev() | self.state[rev] = repo[newnode].rev() | ||||
| ui.debug(b'rebased as %s\n' % short(newnode)) | ui.debug(b'rebased as %s\n' % short(newnode)) | ||||
| if repo[newnode].isempty(): | |||||
| ui.warn( | |||||
| _( | |||||
| b'note: created empty successor for %s, its ' | |||||
| b'destination already has all its changes\n' | |||||
| ) | |||||
| % desc | |||||
| ) | |||||
| else: | else: | ||||
| if not self.collapsef: | if not self.collapsef: | ||||
| ui.warn( | ui.warn( | ||||
| _( | _( | ||||
| b'note: not rebasing %s, its destination already ' | b'note: not rebasing %s, its destination already ' | ||||
| b'has all its changes\n' | b'has all its changes\n' | ||||
| ) | ) | ||||
| % desc | % desc | ||||
| current version. | current version. | ||||
| ``empty-successor`` | ``empty-successor`` | ||||
| Control what happens with empty successors that are the result of rewrite | Control what happens with empty successors that are the result of rewrite | ||||
| operations. If set to ``skip``, the successor is not created. If set to | operations. If set to ``skip``, the successor is not created. If set to | ||||
| ``keep``, the empty successor is created and kept. | ``keep``, the empty successor is created and kept. | ||||
| Currently, no command considers this configuration. (EXPERIMENTAL) | Currently, only the rebase command considers this configuration. | ||||
| (EXPERIMENTAL) | |||||
| ``storage`` | ``storage`` | ||||
| ----------- | ----------- | ||||
| Control the strategy Mercurial uses internally to store history. Options in this | Control the strategy Mercurial uses internally to store history. Options in this | ||||
| category impact performance and repository size. | category impact performance and repository size. | ||||
| ``revlog.optimize-delta-parent-choice`` | ``revlog.optimize-delta-parent-choice`` | ||||
| $ cat << EOF >> $HGRCPATH | |||||
| > [extensions] | |||||
| > rebase= | |||||
| > [alias] | |||||
| > tglog = log -G -T "{rev} '{desc}'\n" | |||||
| > EOF | |||||
| $ hg init | |||||
| $ echo a > a; hg add a; hg ci -m a | |||||
| $ echo b > b; hg add b; hg ci -m b1 | |||||
| $ hg up 0 -q | |||||
| $ echo b > b; hg add b; hg ci -m b2 -q | |||||
| $ hg tglog | |||||
| @ 2 'b2' | |||||
| | | |||||
| | o 1 'b1' | |||||
| |/ | |||||
| o 0 'a' | |||||
| With rewrite.empty-successor=skip, b2 is skipped because it would become empty. | |||||
| $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run | |||||
| starting dry-run rebase; repository will not be changed | |||||
| rebasing 2:6e2aad5e0f3c "b2" (tip) | |||||
| note: not rebasing 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes | |||||
| dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase | |||||
| With rewrite.empty-successor=keep, b2 will be recreated although it became empty. | |||||
| $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep | |||||
| rebasing 2:6e2aad5e0f3c "b2" (tip) | |||||
| note: created empty successor for 2:6e2aad5e0f3c "b2" (tip), its destination already has all its changes | |||||
| saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg | |||||
| $ hg tglog | |||||
| @ 2 'b2' | |||||
| | | |||||
| o 1 'b1' | |||||
| | | |||||
| o 0 'a' | |||||