This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9830

commit: look-up new revision once
ClosedPublic

Authored by joerg.sonnenberger on Jan 18 2021, 6:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG72f5280e33b6: commit: look-up new revision once
Summary

Look-up by node is slightly more expensive, so since it is necessary
more than once, do it explicitly.

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

joerg.sonnenberger added a commit: rHG72f5280e33b6: commit: look-up new revision once.Jan 20 2021, 3:24 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG72f5280e33b6: commit: look-up new revision once (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commit.py (5 lines)

Diff 25183

mercurial/commit.py

ctx.description(), ctx.description(),
tr, tr,
p1.node(), p1.node(),
p2.node(), p2.node(),
user, user,
ctx.date(), ctx.date(),
extra, extra,
) )
rev = repo[n].rev()
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', b'pretxncommit',
throw=True, throw=True,
node=hex(n), node=hex(n),
parent1=xp1, parent1=xp1,
parent2=xp2, 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)
# prevent unmarking changesets as public on recommit # prevent unmarking changesets as public on recommit
waspublic = oldtip == repo.changelog.tiprev() and not repo[n].phase() waspublic = oldtip == repo.changelog.tiprev() and not repo[rev].phase()
if targetphase and not waspublic: if targetphase and not waspublic:
# 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, [repo[n].rev()]) phases.registernew(repo, tr, targetphase, [rev])
return n return n
def _prepare_files(tr, ctx, error=False, origctx=None): def _prepare_files(tr, ctx, error=False, origctx=None):
repo = ctx.repo() repo = ctx.repo()
p1 = ctx.p1() p1 = ctx.p1()
writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)