( )⚙ D10670 rewriteutil: give examples of public changesets that can't be rewritten

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10670

rewriteutil: give examples of public changesets that can't be rewritten
ClosedPublic

Authored by martinvonz on May 4 2021, 1:58 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5b6dd0d9171b: rewriteutil: give examples of public changesets that can't be rewritten
Summary

This patch copies the feature from the evolve extension.

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

martinvonz created this revision.May 4 2021, 1:58 PM
martinvonz added a commit: rHG5b6dd0d9171b: rewriteutil: give examples of public changesets that can't be rewritten.May 5 2021, 6:36 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5b6dd0d9171b: rewriteutil: give examples of public changesets that can't be rewritten (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27595

mercurial/rewriteutil.py

from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullrev, nullrev,
) )
from . import ( from . import (
error, error,
node,
obsolete, obsolete,
obsutil, obsutil,
revset, revset,
scmutil, scmutil,
util, util,
) )
NODE_RE = re.compile(br'\b[0-9a-f]{6,64}\b') NODE_RE = re.compile(br'\b[0-9a-f]{6,64}\b')
def _formatrevs(repo, revs, maxrevs=4):
"""returns a string summarizing revisions in a decent size
If there are few enough revisions, we list them all. Otherwise we display a
summary of the form:
1ea73414a91b and 5 others
"""
tonode = repo.changelog.node
numrevs = len(revs)
if numrevs < maxrevs:
shorts = [node.short(tonode(r)) for r in revs]
summary = b', '.join(shorts)
else:
first = revs.first()
summary = _(b'%s and %d others')
summary %= (node.short(tonode(first)), numrevs - 1)
return summary
def precheck(repo, revs, action=b'rewrite'): def precheck(repo, revs, action=b'rewrite'):
"""check if revs can be rewritten """check if revs can be rewritten
action is used to control the error message. action is used to control the error message.
Make sure this function is called after taking the lock. Make sure this function is called after taking the lock.
""" """
if nullrev in revs: if nullrev in revs:
msg = _(b"cannot %s the null revision") % action msg = _(b"cannot %s the null revision") % action
hint = _(b"no changeset checked out") hint = _(b"no changeset checked out")
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
if any(util.safehasattr(r, 'rev') for r in revs): if any(util.safehasattr(r, 'rev') for r in revs):
repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs") repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs")
revs = (r.rev() for r in revs) revs = (r.rev() for r in revs)
if len(repo[None].parents()) > 1: if len(repo[None].parents()) > 1:
raise error.StateError( raise error.StateError(
_(b"cannot %s changesets while merging") % action _(b"cannot %s changesets while merging") % action
) )
publicrevs = repo.revs(b'%ld and public()', revs) publicrevs = repo.revs(b'%ld and public()', revs)
if publicrevs: if publicrevs:
msg = _(b"cannot %s public changesets") % action summary = _formatrevs(repo, publicrevs)
msg = _(b"cannot %s public changesets: %s") % (action, summary)
hint = _(b"see 'hg help phases' for details") hint = _(b"see 'hg help phases' for details")
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
newunstable = disallowednewunstable(repo, revs) newunstable = disallowednewunstable(repo, revs)
if newunstable: if newunstable:
hint = _(b"see 'hg help evolution.instability'") hint = _(b"see 'hg help evolution.instability'")
raise error.InputError( raise error.InputError(
_(b"cannot %s changeset with children") % action, hint=hint _(b"cannot %s changeset with children") % action, hint=hint

tests/test-amend.t

2 new content-divergent changesets 2 new content-divergent changesets
#endif #endif
Cannot amend public changeset Cannot amend public changeset
$ hg phase -r A --public $ hg phase -r A --public
$ hg update -C -q A $ hg update -C -q A
$ hg amend -m AMEND $ hg amend -m AMEND
abort: cannot amend public changesets abort: cannot amend public changesets: 426bada5c675
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
Amend a merge changeset Amend a merge changeset
$ hg init $TESTTMP/repo3 $ hg init $TESTTMP/repo3
$ cd $TESTTMP/repo3 $ cd $TESTTMP/repo3
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'

tests/test-branch-change.t

stable 34:d1c2addda4a2 stable 34:d1c2addda4a2
jkl 29:6bc1c6c2c9da (inactive) jkl 29:6bc1c6c2c9da (inactive)
ghi 28:2f1019bd29d2 (inactive) ghi 28:2f1019bd29d2 (inactive)
Changing branch on public changeset Changing branch on public changeset
$ hg phase -r . -p $ hg phase -r . -p
$ hg branch -r . def $ hg branch -r . def
abort: cannot change branch of public changesets abort: cannot change branch of public changesets: d1c2addda4a2
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
Merge commit with conflicts, with evolution and without Merge commit with conflicts, with evolution and without
$ mklozenge() { $ mklozenge() {
> echo foo > a > echo foo > a
> hg ci -qAm foo > hg ci -qAm foo

tests/test-commit-amend.t

$ hg init $ hg init
Setup: Setup:
$ echo a >> a $ echo a >> a
$ hg ci -Am 'base' $ hg ci -Am 'base'
adding a adding a
Refuse to amend public csets: Refuse to amend public csets:
$ hg phase -r . -p $ hg phase -r . -p
$ hg ci --amend $ hg ci --amend
abort: cannot amend public changesets abort: cannot amend public changesets: ad120869acf0
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg phase -r . -f -d $ hg phase -r . -f -d
$ echo a >> a $ echo a >> a
$ hg ci -Am 'base1' $ hg ci -Am 'base1'
Nothing to amend: Nothing to amend:

tests/test-fix.t

Fixing a public revision isn't allowed. It should abort early enough that Fixing a public revision isn't allowed. It should abort early enough that
nothing happens, even to the working directory. nothing happens, even to the working directory.
$ printf "hello\n" > hello.whole $ printf "hello\n" > hello.whole
$ hg commit -Aqm "hello" $ hg commit -Aqm "hello"
$ hg phase -r 0 --public $ hg phase -r 0 --public
$ hg fix -r 0 $ hg fix -r 0
abort: cannot fix public changesets abort: cannot fix public changesets: 6470986d2e7b
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg fix -r 0 --working-dir $ hg fix -r 0 --working-dir
abort: cannot fix public changesets abort: cannot fix public changesets: 6470986d2e7b
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg cat -r tip hello.whole $ hg cat -r tip hello.whole
hello hello
$ cat hello.whole $ cat hello.whole
hello hello
$ cd .. $ cd ..

tests/test-histedit-obsolete.t

$ hg log -G $ hg log -G
@ 13:b449568bf7fc (draft) f @ 13:b449568bf7fc (draft) f
| |
o 12:40db8afa467b (public) c o 12:40db8afa467b (public) c
| |
o 0:cb9a9f314b8b (public) a o 0:cb9a9f314b8b (public) a
$ hg histedit -r '.~2' $ hg histedit -r '.~2'
abort: cannot edit public changesets abort: cannot edit public changesets: cb9a9f314b8b, 40db8afa467b
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
Prepare further testing Prepare further testing
------------------------------------------- -------------------------------------------
$ for x in g h i j k ; do $ for x in g h i j k ; do

tests/test-rebase-scenario-global.t

Check rebasing public changeset Check rebasing public changeset
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
$ hg rebase -d 0 -b 6 $ hg rebase -d 0 -b 6
nothing to rebase nothing to rebase
[1] [1]
$ hg rebase -d 5 -b 6 $ hg rebase -d 5 -b 6
abort: cannot rebase public changesets abort: cannot rebase public changesets: e1c4361dd923
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg rebase -d 5 -r '1 + (6::)' $ hg rebase -d 5 -r '1 + (6::)'
abort: cannot rebase public changesets abort: cannot rebase public changesets: e1c4361dd923
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg rebase -d 5 -b 6 --keep $ hg rebase -d 5 -b 6 --keep
rebasing 6:e1c4361dd923 "C" rebasing 6:e1c4361dd923 "C"
rebasing 7:c9659aac0000 tip "D" rebasing 7:c9659aac0000 tip "D"
Check rebasing mutable changeset Check rebasing mutable changeset

tests/test-split.t

$ mv b a $ mv b a
$ hg ci -m a2 -q $ hg ci -m a2 -q
$ hg bookmark -i r2 $ hg bookmark -i r2
Cannot split a public changeset Cannot split a public changeset
$ hg phase --public -r 'all()' $ hg phase --public -r 'all()'
$ hg split . $ hg split .
abort: cannot split public changesets abort: cannot split public changesets: 1df0d5c5a3ab
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
$ hg phase --draft -f -r 'all()' $ hg phase --draft -f -r 'all()'
Cannot split while working directory is dirty Cannot split while working directory is dirty
$ touch dirty $ touch dirty

tests/test-unamend.t

Trying to unamend a public changeset Trying to unamend a public changeset
$ hg up -C 23 $ hg up -C 23
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg phase -r . -p $ hg phase -r . -p
1 new phase-divergent changesets 1 new phase-divergent changesets
$ hg unamend $ hg unamend
abort: cannot unamend public changesets abort: cannot unamend public changesets: 03ddd6fc5af1
(see 'hg help phases' for details) (see 'hg help phases' for details)
[10] [10]
Testing whether unamend retains copies or not Testing whether unamend retains copies or not
$ hg status $ hg status
$ hg mv a foo $ hg mv a foo