Mercurial > hg
changeset 35799:b91bca85ba73 stable
lfs: don't automatically exclude '.hg*' files from external tracking
The only reasons I did this in the first place was because tracking externally
seems like it would always be a mistake, and the eol extension does the same
thing. Yuya and Jun thought it might be better to not do this[1], so I'll defer
to them on this. If a problem with say, .hgtags or .hgeol does arise, it can be
added back without breaking existing repos.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-January/110371.html
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 23 Jan 2018 21:29:45 -0500 |
| parents | 97bdbcb43ebf |
| children | d5288b966e2f |
| files | hgext/lfs/wrapper.py tests/test-lfs.t |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/lfs/wrapper.py Tue Jan 23 20:50:02 2018 -0500 +++ b/hgext/lfs/wrapper.py Tue Jan 23 21:29:45 2018 -0500 @@ -131,8 +131,7 @@ lfstrack = self.opener.options['lfstrack'] - # Always exclude hg owned files - if not self.filename.startswith('.hg') and lfstrack(self.filename, textlen): + if lfstrack(self.filename, textlen): flags |= revlog.REVIDX_EXTSTORED return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
--- a/tests/test-lfs.t Tue Jan 23 20:50:02 2018 -0500 +++ b/tests/test-lfs.t Tue Jan 23 21:29:45 2018 -0500 @@ -18,9 +18,7 @@ # Commit small file $ echo s > smallfile $ echo '**.py = LF' > .hgeol - $ hg --config lfs.track='size(">1000B") | "path:.hgeol"' commit -Aqm "add small file" - $ hg debugdata .hgeol 0 - **.py = LF + $ hg --config lfs.track='size(">1000B")' commit -Aqm "add small file" # Commit large file $ echo $LONG > largefile @@ -976,6 +974,7 @@ $ cat > .hglfs << EOF > [track] + > path:.hglfs = none() > **.test = size(">5B") > **.exclude = none() > ** = size(">10B")