Show More
@@ -448,9 +448,10 b' def eol(mctx, x):' | |||||
448 |
|
448 | |||
449 | s = [] |
|
449 | s = [] | |
450 | for f in mctx.existing(): |
|
450 | for f in mctx.existing(): | |
451 |
|
|
451 | fctx = mctx.ctx[f] | |
452 |
if |
|
452 | if fctx.isbinary(): | |
453 | continue |
|
453 | continue | |
|
454 | d = fctx.data() | |||
454 | if (enc == 'dos' or enc == 'win') and '\r\n' in d: |
|
455 | if (enc == 'dos' or enc == 'win') and '\r\n' in d: | |
455 | s.append(f) |
|
456 | s.append(f) | |
456 | elif enc == 'unix' and re.search('(?<!\r)\n', d): |
|
457 | elif enc == 'unix' and re.search('(?<!\r)\n', d): |
@@ -515,6 +515,17 b' enabled adds the lfs requirement' | |||||
515 | d: binary=False |
|
515 | d: binary=False | |
516 | b55353847f02 tip |
|
516 | b55353847f02 tip | |
517 |
|
517 | |||
|
518 | Binary blobs don't need to be present to be skipped in filesets. (And their | |||
|
519 | absence doesn't cause an abort.) | |||
|
520 | ||||
|
521 | $ rm .hg/store/lfs/objects/96/a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7 | |||
|
522 | $ rm .hg/store/lfs/objects/92/f76135a4baf4faccb8586a60faf830c2bdfce147cefa188aaf4b790bd01b7e | |||
|
523 | ||||
|
524 | $ hg files --debug -r . 'set:eol("unix")' --config 'experimental.lfs.disableusercache=True' | |||
|
525 | lfs: found c04b5bb1a5b2eb3e9cd4805420dba5a9d133da5b7adeeafb5474c4adae9faa80 in the local lfs store | |||
|
526 | lfs: found 5dde896887f6754c9b15bfe3a441ae4806df2fde94001311e08bf110622e0bbe in the local lfs store | |||
|
527 | 2 b | |||
|
528 | ||||
518 | $ cd .. |
|
529 | $ cd .. | |
519 |
|
530 | |||
520 | # Test fctx.cmp fastpath - diff without LFS blobs |
|
531 | # Test fctx.cmp fastpath - diff without LFS blobs |
General Comments 0
You need to be logged in to leave comments.
Login now