Blacklist resources managed by ensure_dependencies.py in Git

[matze]

Observed Behavior

When working with the new ensure_dependencies.py script and git(1), one currently needs to manually ensure that the contents of fetched modules are not added to the git index.

Possible Workarounds

Below please find a list of possible workarounds beside manually maintaining the module paths in a .gitignore file - without necessity of completeness but in order of recommendation:

• Use git-update-index(1) in to blacklist the resource paths from being added to the index.
• Manually maintain the destination paths in the .git/info/exclude file.
• Create some fancy githooks(5) to circumvent the issue.

Expected Behavior

The ensure_dependencies.py script should *automagically* apply one of the aforementioned workarounds (except the .gitignore file solution, of course).

[matze]

See also: ​http://gitready.com/intermediate/2009/02/18/temporarily-ignoring-files.html

[AAlvz]

Code on:

​https://github.com/AAlvz/infrastructure/tree/1377-Blacklist_dependencies_git

[trev]

You shouldn't modify the copy in the infrastructure repository but rather the master in the buildtools repository.

[matze]

We will, the Git version is only used for collaboration and testing right now. The patch-set for review will address the buildtools version, however.

[matze]

In addition to the circumstances explained in the ticket description, there are also a few more cases that may need to be addressed:

• When only one of the dependency versions is available (e.g. during development, when testing an upgrade to a more recent version or when waiting for the HG=>Git sync), it's possible that the script uses e.g. the Git dependencies although the root repository has been cloned via Mercurial (or vice-versa). In that case, the Mercurial mechanism of ignoring directories that feature a .hg sub-directory is circumvented, of course.

• When working with both Mercurial and Git in the same directory (quite common, even in our office), it's actually the Python hashing algorithm that will decide whether the Mercurial or Git versions of the dependencies are preferred when updating. Thus, one may consider converting the repo_types variable into an ordered set or similar (it's currently a hash, although there's no need for string-associative access anywhere in the script).

Note that the first item is addressed in the first patch-set for review - in addition to the ticket's general changes -, while the latter is currently just a side-note to consider.

[matze]

@trev @fhd
Please make sure the changes are pushed to the buildtools repo.

@AAlvz
As soon as the buildtools repo has been updated this ticket can be closed.

[trev]

Pushed: ​https://hg.adblockplus.org/buildtools/rev/f9f664d8ee05