Mercurial > hg-stable
changeset 40368:fad6068249d9
lfs: don't add extension to hgrc after conversion (BC)
This is in the spirit of bcf72d7b1524.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 18 Oct 2018 21:55:47 -0400 |
| parents | 824b687ff6af |
| children | ef6cab7930b3 |
| files | hgext/lfs/wrapper.py tests/test-lfs-largefiles.t tests/test-lfs.t |
| diffstat | 3 files changed, 1 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/lfs/wrapper.py Thu Oct 18 21:00:07 2018 +0900 +++ b/hgext/lfs/wrapper.py Thu Oct 18 21:55:47 2018 -0400 @@ -213,10 +213,6 @@ self.repo.requirements.add('lfs') self.repo._writerequirements() - # Permanently enable lfs locally - self.repo.vfs.append( - 'hgrc', util.tonativeeol('\n[extensions]\nlfs=\n')) - return node sink.__class__ = lfssink
--- a/tests/test-lfs-largefiles.t Thu Oct 18 21:00:07 2018 +0900 +++ b/tests/test-lfs-largefiles.t Thu Oct 18 21:55:47 2018 -0400 @@ -286,8 +286,7 @@ 0 remove large_by_size.bin $ cd nolargefiles -The requirement is added to the destination repo, and the extension is enabled -locally. +The requirement is added to the destination repo. $ cat .hg/requires dotencode @@ -296,8 +295,6 @@ lfs revlogv1 store - $ hg config --debug extensions | grep lfs - $TESTTMP/nolargefiles/.hg/hgrc:*: extensions.lfs= (glob) $ hg log -r 'all()' -G -T '{rev} {join(lfs_files, ", ")} ({desc})\n' o 8 large_by_size.bin (remove large_by_size.bin)
--- a/tests/test-lfs.t Thu Oct 18 21:00:07 2018 +0900 +++ b/tests/test-lfs.t Thu Oct 18 21:55:47 2018 -0400 @@ -1030,9 +1030,6 @@ size 39 x-is-binary 0 - $ 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