This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1717

lfs: fix committing deleted files caused by e0a1b9ee93cd
ClosedPublic

Authored by quark on Dec 18 2017, 5:48 PM.

Details

Reviewers
mharbison72
krbullock
Group Reviewers
hg-reviewers
Commits
rHG488634db5928: lfs: fix committing deleted files caused by e0a1b9ee93cd
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Dec 18 2017, 5:48 PM
mharbison72 added a comment.Dec 18 2017, 8:08 PM

LGTM. Sorry about that.

krbullock accepted this revision.Dec 18 2017, 10:52 PM
krbullock added a subscriber: krbullock.

Queued per Matt's review, thanks.

This revision is now accepted and ready to land.Dec 18 2017, 10:52 PM
Closed by commit rHG488634db5928: lfs: fix committing deleted files caused by e0a1b9ee93cd (authored by quark). · Explain WhyDec 18 2017, 11:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/__init__.py (2 lines)
Mtests/test-lfs.t (9 lines)

Diff 4539

hgext/lfs/__init__.py

# Push hook # Push hook
repo.prepushoutgoinghooks.add('lfs', wrapper.prepush) repo.prepushoutgoinghooks.add('lfs', wrapper.prepush)
if 'lfs' not in repo.requirements: if 'lfs' not in repo.requirements:
def checkrequireslfs(ui, repo, **kwargs): def checkrequireslfs(ui, repo, **kwargs):
if 'lfs' not in repo.requirements: if 'lfs' not in repo.requirements:
ctx = repo[kwargs['node']] ctx = repo[kwargs['node']]
# TODO: is there a way to just walk the files in the commit? # 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.requirements.add('lfs')
repo._writerequirements() repo._writerequirements()
ui.setconfig('hooks', 'commit.lfs', checkrequireslfs, 'lfs') ui.setconfig('hooks', 'commit.lfs', checkrequireslfs, 'lfs')
def wrapfilelog(filelog): def wrapfilelog(filelog):
wrapfunction = extensions.wrapfunction wrapfunction = extensions.wrapfunction

tests/test-lfs.t

$ hg --cwd convert_lfs2 debugdata large 0 $ hg --cwd convert_lfs2 debugdata large 0
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e oid sha256:66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
size 39 size 39
x-is-binary 0 x-is-binary 0
$ hg -R convert_lfs2 config --debug extensions | grep lfs $ hg -R convert_lfs2 config --debug extensions | grep lfs
$TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob) $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'