Add support for (topological) branches and merges in generate_repo.py

and include an example input file (currently not used in actual tests).

Alsod make generate_storage_from_git include all branches by default instead of only master.

Needed for future origin-to-revision layer tests.

---

Migrated from D5885 (view on Phabricator)