Changeset a3fcc9cdc265…
Parent d4dadfbc9448…
by Andrew Pritchard <andrewp@fogcreek.com>
Changes to one file · Browse files at a3fcc9cdc265 Showing diff from parent d4dadfbc9448 Diff from another changeset...
@@ -417,16 +417,17 @@
repo.__class__ = bfiles_repo
- def checkrequireskbfiles(ui, repo, **kwargs):
- if 'kbfiles' not in repo.requirements and bfutil.any_('.kbf/' in f[0] \
- for f in repo.store.datafiles()):
+ def checkrequireskbfiles(ui, repo, node=None, source=None, url=None):
+ if 'kbfiles' not in repo.requirements:
+ if (node is not None and repo.manifest(node).find('.kbf/')[0] \
+ is not None) or (bfutil.any_('.kbf/' in f[0] \
+ for f in repo.store.datafiles())):
+ # work around bug in mercurial 1.9 whereby requirements is a list
+ # on newly-cloned repos
+ repo.requirements = set(repo.requirements)
- # work around bug in mercurial 1.9 whereby requirements is a list
- # on newly-cloned repos
- repo.requirements = set(repo.requirements)
-
- repo.requirements |= set(['kbfiles'])
- repo._writerequirements()
+ repo.requirements |= set(['kbfiles'])
+ repo._writerequirements()
checkrequireskbfiles(ui, repo)
|
Loading...