This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6365

context: move contents of committablectx.markcommitted() to workingctx
ClosedPublic

Authored by martinvonz on May 11 2019, 2:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfdd4d668ceb5: context: move contents of committablectx.markcommitted() to workingctx
Summary

Same reasoning as previous commits: this function updates the
dirstate. By not updating the dirstate here, we also fix the
close-head test.

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 11 2019, 2:11 AM
durin42 added a subscriber: durin42.May 15 2019, 1:55 PM
durin42 added inline comments.
mercurial/context.py
1228–1229

Nit: this pass isn't needed. I'll fix in flight.

Closed by commit rHGfdd4d668ceb5: context: move contents of committablectx.markcommitted() to workingctx (authored by martinvonz). · Explain WhyMay 15 2019, 2:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15107

mercurial/context.py

"""Perform post-commit cleanup necessary after committing this ctx """Perform post-commit cleanup necessary after committing this ctx
Specifically, this updates backing stores this working context Specifically, this updates backing stores this working context
wraps to reflect the fact that the changes reflected by this wraps to reflect the fact that the changes reflected by this
workingctx have been committed. For example, it marks workingctx have been committed. For example, it marks
modified and added files as normal in the dirstate. modified and added files as normal in the dirstate.
""" """
with self._repo.dirstate.parentchange():
for f in self.modified() + self.added():
self._repo.dirstate.normal(f)
for f in self.removed():
self._repo.dirstate.drop(f)
self._repo.dirstate.setparents(node)
# write changes out explicitly, because nesting wlock at
# runtime may prevent 'wlock.release()' in 'repo.commit()'
# from immediately doing so for subsequent changing files
self._repo.dirstate.write(self._repo.currenttransaction())
def dirty(self, missing=False, merge=True, branch=True): def dirty(self, missing=False, merge=True, branch=True):
durin42Unsubmitted
Not Done

Nit: this pass isn't needed. I'll fix in flight.

durin42: Nit: this pass isn't needed. I'll fix in flight.
return False return False
class workingctx(committablectx): class workingctx(committablectx):
"""A workingctx object makes access to data related to """A workingctx object makes access to data related to
the current working directory convenient. the current working directory convenient.
date - any valid date string or (unixtime, offset), or None. date - any valid date string or (unixtime, offset), or None.
user - username string, or None. user - username string, or None.
extra - a dictionary of extra values, or None. extra - a dictionary of extra values, or None.
unknown=True, ignored=False)) unknown=True, ignored=False))
def matches(self, match): def matches(self, match):
match = self._repo.narrowmatch(match) match = self._repo.narrowmatch(match)
ds = self._repo.dirstate ds = self._repo.dirstate
return sorted(f for f in ds.matches(match) if ds[f] != 'r') return sorted(f for f in ds.matches(match) if ds[f] != 'r')
def markcommitted(self, node): def markcommitted(self, node):
super(workingctx, self).markcommitted(node) with self._repo.dirstate.parentchange():
for f in self.modified() + self.added():
self._repo.dirstate.normal(f)
for f in self.removed():
self._repo.dirstate.drop(f)
self._repo.dirstate.setparents(node)
# write changes out explicitly, because nesting wlock at
# runtime may prevent 'wlock.release()' in 'repo.commit()'
# from immediately doing so for subsequent changing files
self._repo.dirstate.write(self._repo.currenttransaction())
sparse.aftercommit(self._repo, node) sparse.aftercommit(self._repo, node)
class committablefilectx(basefilectx): class committablefilectx(basefilectx):
"""A committablefilectx provides common functionality for a file context """A committablefilectx provides common functionality for a file context
that wants the ability to commit, e.g. workingfilectx or memfilectx.""" that wants the ability to commit, e.g. workingfilectx or memfilectx."""
def __init__(self, repo, path, filelog=None, ctx=None): def __init__(self, repo, path, filelog=None, ctx=None):
self._repo = repo self._repo = repo

tests/fakedirstatewritetime.py

def markcommitted(orig, committablectx, node): def markcommitted(orig, committablectx, node):
ui = committablectx.repo().ui ui = committablectx.repo().ui
return fakewrite(ui, lambda : orig(committablectx, node)) return fakewrite(ui, lambda : orig(committablectx, node))
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(context.workingctx, '_poststatusfixup', extensions.wrapfunction(context.workingctx, '_poststatusfixup',
_poststatusfixup) _poststatusfixup)
extensions.wrapfunction(context.committablectx, 'markcommitted', extensions.wrapfunction(context.workingctx, 'markcommitted',
markcommitted) markcommitted)

tests/test-close-head.t

[255] [255]
$ hg --config extensions.closehead= close-head -m 'Not a head' -r 0 1 $ hg --config extensions.closehead= close-head -m 'Not a head' -r 0 1
abort: revision is not an open head: 0 abort: revision is not an open head: 0
[255] [255]
$ hg id $ hg id
000000000000 000000000000
$ hg --config extensions.closehead= close-head -m 'Close old heads' -r 1 2 $ hg --config extensions.closehead= close-head -m 'Close old heads' -r 1 2
$ hg id $ hg id
340d36cac2f4 tip 000000000000
$ hg bookmark $ hg bookmark
@ 1:66f7d451a68b @ 1:66f7d451a68b
$ hg heads $ hg heads
changeset: 11:1d876b1f862c changeset: 11:1d876b1f862c
user: debugbuilddag user: debugbuilddag
date: Thu Jan 01 00:00:11 1970 +0000 date: Thu Jan 01 00:00:11 1970 +0000
summary: r11 summary: r11