Mercurial > public > mercurial-scm > hg-stable
diff tests/test-annotate.t @ 45454:037e88d453fa
commit: pass mergestate into _filecommit() instead of re-reading it
mergestate reading although cheap is not free. Let's read mergestate once on top
and pass it into `_filecommit()`.
In upcoming patches, we will be reading mergestate more in `_filecommit()`.
Differential Revision: https://phab.mercurial-scm.org/D8984
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 03 Sep 2020 14:14:04 +0530 |
parents | ce9ee81df9ff |
children | c8860a212770 |
line wrap: on
line diff
--- a/tests/test-annotate.t Fri Sep 11 13:04:05 2020 +0530 +++ b/tests/test-annotate.t Thu Sep 03 14:14:04 2020 +0530 @@ -481,7 +481,7 @@ > from __future__ import absolute_import > from mercurial import commit, error, extensions, node > def _filecommit(orig, repo, fctx, manifest1, manifest2, - > linkrev, tr, includecopymeta): + > linkrev, tr, includecopymeta, ms): > fname = fctx.path() > text = fctx.data() > flog = repo.file(fname)