Mercurial > hg
diff hgext/lfs/__init__.py @ 40313:ef0baff11aea
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 16 Oct 2018 08:16:11 -0400 |
parents | 9c4cbbb0fc51 535fc8a22365 |
children | 84d61fdcefa5 |
line wrap: on
line diff
--- a/hgext/lfs/__init__.py Fri Aug 31 19:58:41 2018 +0100 +++ b/hgext/lfs/__init__.py Tue Oct 16 08:16:11 2018 -0400 @@ -237,13 +237,15 @@ if 'lfs' not in repo.requirements: def checkrequireslfs(ui, repo, **kwargs): - if 'lfs' not in repo.requirements: - last = kwargs.get(r'node_last') - _bin = node.bin - if last: - s = repo.set('%n:%n', _bin(kwargs[r'node']), _bin(last)) - else: - s = repo.set('%n', _bin(kwargs[r'node'])) + if 'lfs' in repo.requirements: + return 0 + + last = kwargs.get(r'node_last') + _bin = node.bin + if last: + s = repo.set('%n:%n', _bin(kwargs[r'node']), _bin(last)) + else: + s = repo.set('%n', _bin(kwargs[r'node'])) match = repo.narrowmatch() for ctx in s: # TODO: is there a way to just walk the files in the commit?