This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9253

commit: don't change phases for preexisting commits
ClosedPublic

Authored by danchr on Oct 28 2020, 11:19 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG067707e026b4: commit: don't change phases for preexisting commits
rHGf803c584f8f9: commit: don't change phases for preexisting commits
Summary

I noticed when pulling with hg-git in a repository that already had
the changes, but pulled from another Mercurial repository. This meant
that hg-git would re-create exact matches of the changesets, and
if they were public, they'd get reverted to drafts.

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

danchr created this revision.Oct 28 2020, 11:19 AM
danchr updated this revision to Diff 23312.Oct 28 2020, 11:21 AM
danchr updated this revision to Diff 23313.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> added a commit: rHGf803c584f8f9: commit: don't change phases for preexisting commits.Oct 28 2020, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf803c584f8f9: commit: don't change phases for preexisting commits (authored by Dan Villiom Podlaski Christiansen <danchr@gmail.com>). · Explain Why
This revision was automatically updated to reflect the committed changes.
danchr added a parent revision: D9256: backout: don't assume that tip as what we just committed.Oct 28 2020, 9:06 PM
danchr edited the summary of this revision. (Show Details)
danchr updated this revision to Diff 23318.
danchr edited the summary of this revision. (Show Details)Oct 29 2020, 3:03 AM
danchr added a child revision: D9257: commit: warn the user when a commit already exists.
danchr updated this revision to Diff 23353.
danchr updated this revision to Diff 23355.Oct 29 2020, 3:10 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (10 lines)
Mmercurial/commit.py (5 lines)
Mtests/test-phases.t (49 lines)

Diff 23316

mercurial/cmdutil.py

def commitstatus(repo, node, branch, bheads=None, opts=None): def commitstatus(repo, node, branch, bheads=None, opts=None):
if opts is None: if opts is None:
opts = {} opts = {}
ctx = repo[node] ctx = repo[node]
parents = ctx.parents() parents = ctx.parents()
if ( if repo.changelog.tip() != node:
# this check is two-fold: 1. avoid reporting something like
# "committed new head" when recommitting old changesets, and
# 2., issue a helpful warning for most instances -- excepting
# when recommitting tip
repo.ui.warn(
_("warning: commit didn't add anything to the repository!\n"),
)
elif (
not opts.get(b'amend') not opts.get(b'amend')
and bheads and bheads
and node not in bheads and node not in bheads
and not any( and not any(
p.node() in bheads and p.branch() == branch for p in parents p.node() in bheads and p.branch() == branch for p in parents
) )
): ):
repo.ui.status(_(b'created new head\n')) repo.ui.status(_(b'created new head\n'))

mercurial/commit.py

b'p2copies', b'p2copies',
b'filesadded', b'filesadded',
b'filesremoved', b'filesremoved',
): ):
extra.pop(name, None) extra.pop(name, None)
if repo.changelog._copiesstorage == b'extra': if repo.changelog._copiesstorage == b'extra':
extra = _extra_with_copies(repo, extra, files) extra = _extra_with_copies(repo, extra, files)
# save the tip to check whether we actually committed anything
tip = repo.changelog.tip()
# update changelog # update changelog
repo.ui.note(_(b"committing changelog\n")) repo.ui.note(_(b"committing changelog\n"))
repo.changelog.delayupdate(tr) repo.changelog.delayupdate(tr)
n = repo.changelog.add( n = repo.changelog.add(
mn, mn,
files, files,
ctx.description(), ctx.description(),
tr, tr,
p1.node(), p1.node(),
p2.node(), p2.node(),
user, user,
ctx.date(), ctx.date(),
extra, extra,
) )
xp1, xp2 = p1.hex(), p2 and p2.hex() or b'' xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
repo.hook( repo.hook(
b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2, b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2,
) )
# set the new commit is proper phase # set the new commit is proper phase
targetphase = subrepoutil.newcommitphase(repo.ui, ctx) targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
if targetphase: if targetphase and (tip != repo.changelog.tip() or repo[n].hidden()):
# retract boundary do not alter parent changeset. # retract boundary do not alter parent changeset.
# if a parent have higher the resulting phase will # if a parent have higher the resulting phase will
# be compliant anyway # be compliant anyway
# #
# if minimal phase was 0 we don't need to retract anything # if minimal phase was 0 we don't need to retract anything
phases.registernew(repo, tr, targetphase, [n]) phases.registernew(repo, tr, targetphase, [n])
return n return n

tests/test-phases.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G $ hg log -G
@ changeset: 0:4a2df7238c3b @ changeset: 0:4a2df7238c3b
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: A summary: A
$ cd ..
Recommitting an exact match of a public commit shouldn't change it to
draft:
$ cd initialrepo
$ hg phase -r 2
2: public
$ hg up -C 1
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ mkcommit C
warning: commit didn't add anything to the repository!
$ hg phase -r 2
2: public
Same, but for secret:
$ hg up 7
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit F -s
test-debug-phase: new rev 8: x -> 2
test-hook-close-phase: de414268ec5ce2330c590b942fbb5ff0b0ca1a0a: -> secret
$ hg up 7
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit F
$ hg phase -r tip
8: secret
But what about obsoleted changesets?
$ hg up 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit H
test-debug-phase: new rev 5: x -> 2
warning: commit didn't add anything to the repository!
test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8: -> secret
$ hg phase -r 5
5: secret
$ hg par
changeset: 5:a030c6be5127
user: test
date: Thu Jan 01 00:00:00 1970 +0000
obsolete: pruned
summary: H
$ hg up tip
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cd ..