This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5515

narrow: drop explicit dirstate write
ClosedPublic

Authored by martinvonz on Jan 7 2019, 2:01 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4475322b7533: narrow: drop explicit dirstate write
Summary

The dirstate is written when the wlock is released, so we don't need
to write it explicitly in updateworkingcopy(). I don't know why I put
it there in the first place (tests pass without it even in the commit
that introduced it).

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.

Revision Contents
Changeset List

Diff 13141

hgext/narrow/narrowcommands.py

fm.startitem() fm.startitem()
fm.write('status', '%s ', 'X', label='narrow.excluded') fm.write('status', '%s ', 'X', label='narrow.excluded')
fm.write('pat', '%s\n', i, label='narrow.excluded') fm.write('pat', '%s\n', i, label='narrow.excluded')
fm.end() fm.end()
return 0 return 0
if update_working_copy: if update_working_copy:
with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr: with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr:
narrowspec.updateworkingcopy(repo, tr) narrowspec.updateworkingcopy(repo)
narrowspec.copytoworkingcopy(repo, tr) narrowspec.copytoworkingcopy(repo, tr)
return 0 return 0
if not widening and not narrowing: if not widening and not narrowing:
ui.status(_("nothing to widen or narrow\n")) ui.status(_("nothing to widen or narrow\n"))
return 0 return 0
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():

mercurial/narrowspec.py

def checkworkingcopynarrowspec(repo): def checkworkingcopynarrowspec(repo):
storespec = repo.svfs.tryread(FILENAME) storespec = repo.svfs.tryread(FILENAME)
wcspec = repo.vfs.tryread(DIRSTATE_FILENAME) wcspec = repo.vfs.tryread(DIRSTATE_FILENAME)
if wcspec != storespec: if wcspec != storespec:
raise error.Abort(_("working copy's narrowspec is stale"), raise error.Abort(_("working copy's narrowspec is stale"),
hint=_("run 'hg tracked --update-working-copy'")) hint=_("run 'hg tracked --update-working-copy'"))
def updateworkingcopy(repo, tr): def updateworkingcopy(repo):
oldspec = repo.vfs.tryread(DIRSTATE_FILENAME) oldspec = repo.vfs.tryread(DIRSTATE_FILENAME)
newspec = repo.svfs.tryread(FILENAME) newspec = repo.svfs.tryread(FILENAME)
oldincludes, oldexcludes = parseconfig(repo.ui, oldspec) oldincludes, oldexcludes = parseconfig(repo.ui, oldspec)
newincludes, newexcludes = parseconfig(repo.ui, newspec) newincludes, newexcludes = parseconfig(repo.ui, newspec)
oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes) oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes)
newmatch = match(repo.root, include=newincludes, exclude=newexcludes) newmatch = match(repo.root, include=newincludes, exclude=newexcludes)
addedmatch = matchmod.differencematcher(newmatch, oldmatch) addedmatch = matchmod.differencematcher(newmatch, oldmatch)
repo.narrowpats = newincludes, newexcludes repo.narrowpats = newincludes, newexcludes
repo._narrowmatch = newmatch repo._narrowmatch = newmatch
pctx = repo['.'] pctx = repo['.']
newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds] newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds]
for f in newfiles: for f in newfiles:
ds.normallookup(f) ds.normallookup(f)
_writeaddedfiles(repo, pctx, newfiles) _writeaddedfiles(repo, pctx, newfiles)
ds.write(tr)