martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION 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). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5515 AFFECTED FILES hgext/narrow/narrowcommands.py mercurial/narrowspec.py CHANGE DETAILS diff --git a/mercurial/narrowspec.py b/mercurial/narrowspec.py --- a/mercurial/narrowspec.py +++ b/mercurial/narrowspec.py @@ -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) diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py --- a/hgext/narrow/narrowcommands.py +++ b/hgext/narrow/narrowcommands.py @@ -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 To: martinvonz, durin42, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
