Mercurial > hg-stable
view tests/test-annotate.py @ 39474:a913d2892e17
lfs: ensure the blob is linked to the remote store on skipped uploads
I noticed a "missing" blob when pushing two repositories with common blobs to a
fresh server, and then running `hg verify` as a user different from the one
running the web server. When pushing the second repo, several of the blobs
already existed in the user cache, so the server indicated to the client that it
doesn't need to upload the blobs. That's good enough for the web server process
to serve up in the future. But a different user has a different cache by
default, so verify complains that `lfs.url` needs to be set, because it wants to
fetch the missing blobs.
Aside from that corner case, it's better to keep all of the blobs in the repo
whenever possible. Especially since the largefiles wiki says the user cache can
be deleted at any time to reclaim disk space- users switching over may have the
same expectations.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 06 Sep 2018 00:51:21 -0400 |
parents | 434e520adb8c |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import from __future__ import print_function import unittest from mercurial import ( mdiff, pycompat, ) from mercurial.dagop import ( annotateline, _annotatedfile, _annotatepair, ) def tr(a): return [annotateline(fctx, lineno, skip) for fctx, lineno, skip in zip(a.fctxs, a.linenos, a.skips)] class AnnotateTests(unittest.TestCase): """Unit tests for annotate code.""" def testannotatepair(self): self.maxDiff = None # camelcase-required oldfctx = b'old' p1fctx, p2fctx, childfctx = b'p1', b'p2', b'c' olddata = b'a\nb\n' p1data = b'a\nb\nc\n' p2data = b'a\nc\nd\n' childdata = b'a\nb2\nc\nc2\nd\n' diffopts = mdiff.diffopts() def decorate(text, fctx): n = text.count(b'\n') linenos = pycompat.rangelist(1, n + 1) return _annotatedfile([fctx] * n, linenos, [False] * n, text) # Basic usage oldann = decorate(olddata, oldfctx) p1ann = decorate(p1data, p1fctx) p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts) self.assertEqual(tr(p1ann), [ annotateline(b'old', 1), annotateline(b'old', 2), annotateline(b'p1', 3), ]) p2ann = decorate(p2data, p2fctx) p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts) self.assertEqual(tr(p2ann), [ annotateline(b'old', 1), annotateline(b'p2', 2), annotateline(b'p2', 3), ]) # Test with multiple parents (note the difference caused by ordering) childann = decorate(childdata, childfctx) childann = _annotatepair([p1ann, p2ann], childfctx, childann, False, diffopts) self.assertEqual(tr(childann), [ annotateline(b'old', 1), annotateline(b'c', 2), annotateline(b'p2', 2), annotateline(b'c', 4), annotateline(b'p2', 3), ]) childann = decorate(childdata, childfctx) childann = _annotatepair([p2ann, p1ann], childfctx, childann, False, diffopts) self.assertEqual(tr(childann), [ annotateline(b'old', 1), annotateline(b'c', 2), annotateline(b'p1', 3), annotateline(b'c', 4), annotateline(b'p2', 3), ]) # Test with skipchild (note the difference caused by ordering) childann = decorate(childdata, childfctx) childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, diffopts) self.assertEqual(tr(childann), [ annotateline(b'old', 1), annotateline(b'old', 2, True), # note that this line was carried over from earlier so it is *not* # marked skipped annotateline(b'p2', 2), annotateline(b'p2', 2, True), annotateline(b'p2', 3), ]) childann = decorate(childdata, childfctx) childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, diffopts) self.assertEqual(tr(childann), [ annotateline(b'old', 1), annotateline(b'old', 2, True), annotateline(b'p1', 3), annotateline(b'p1', 3, True), annotateline(b'p2', 3), ]) if __name__ == '__main__': import silenttestrunner silenttestrunner.main(__name__)