Skip to content
Snippets Groups Projects
Commit 488634db authored by Jun Wu's avatar Jun Wu
Browse files

lfs: fix committing deleted files caused by e0a1b9ee93cd

e0a1b9ee93cd (lfs: add a repo requirement for this extension once an lfs
file is committed) introduced a regression that prevents committing file
deletion.  This patch fixes that.

Differential Revision: https://phab.mercurial-scm.org/D1717
parent d624c855
No related branches found
No related tags found
No related merge requests found
......@@ -124,7 +124,7 @@
if 'lfs' not in repo.requirements:
ctx = repo[kwargs['node']]
# TODO: is there a way to just walk the files in the commit?
if any(ctx[f].islfs() for f in ctx.files()):
if any(ctx[f].islfs() for f in ctx.files() if f in ctx):
repo.requirements.add('lfs')
repo._writerequirements()
......
......@@ -680,3 +680,12 @@
$ hg -R convert_lfs2 config --debug extensions | grep lfs
$TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob)
Committing deleted files works:
$ hg init $TESTTMP/repo-del
$ cd $TESTTMP/repo-del
$ echo 1 > A
$ hg commit -m 'add A' -A A
$ hg rm A
$ hg commit -m 'rm A'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment