# HG changeset patch # User Martin von Zweigbergk # Date 1546850266 28800 # Node ID 4475322b7533d1798c8b3d338542b08a5859817d # Parent 9bc7ec924234f48c0019e166d976d5d6b1fb0efa narrow: drop explicit dirstate write 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). Differential Revision: https://phab.mercurial-scm.org/D5515 diff -r 9bc7ec924234 -r 4475322b7533 hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py Wed Jan 09 18:00:20 2019 -0500 +++ b/hgext/narrow/narrowcommands.py Mon Jan 07 00:37:46 2019 -0800 @@ -433,7 +433,7 @@ if update_working_copy: with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr: - narrowspec.updateworkingcopy(repo, tr) + narrowspec.updateworkingcopy(repo) narrowspec.copytoworkingcopy(repo, tr) return 0 diff -r 9bc7ec924234 -r 4475322b7533 mercurial/narrowspec.py --- a/mercurial/narrowspec.py Wed Jan 09 18:00:20 2019 -0500 +++ b/mercurial/narrowspec.py Mon Jan 07 00:37:46 2019 -0800 @@ -266,7 +266,7 @@ raise error.Abort(_("working copy's narrowspec is stale"), hint=_("run 'hg tracked --update-working-copy'")) -def updateworkingcopy(repo, tr): +def updateworkingcopy(repo): oldspec = repo.vfs.tryread(DIRSTATE_FILENAME) newspec = repo.svfs.tryread(FILENAME) @@ -294,5 +294,3 @@ for f in newfiles: ds.normallookup(f) _writeaddedfiles(repo, pctx, newfiles) - - ds.write(tr)