git-aggregator 1.7.0

Fetching only required branches

If any of your merges refer to a specific commit, you will probably need to fetch all remotes from the corresponding remote or use any other strategy to get that fetch working, but we recommend to simply add this like in the example above:

fetch_all:
    - oca
    - other-remote

You can specify that you want to fetch all references from all remotes you have defined with:

fetch_all: true

Shallow repositories

To save big amounts of bandwidth and disk space, you can use shallow clones. These download only a restricted amount of commits depending on some criteria. Available options are depth, shallow-since and shallow-exclude.

You can use those in the defaults sections to apply them everywhere, or specifying them in the corresponding merges section, for which you must use the dict alternate construction. If you need to disable a default in merges, set it to false:

./odoo:
    defaults:
        depth: 20
    remotes:
        odoo: https://github.com/odoo/odoo.git
        ocb: https://github.com/OCA/OCB.git
        acsone: https://github.com/acsone/odoo.git
    merges:
        -
            remote: ocb
            ref: "9.0"
            depth: 1000
        -
            remote: odoo
            ref: refs/pull/14859/head
    target: acsone 9.0

Remember that you need to fetch at least the common ancestor of all merges for it to succeed.

Triggers

It’s also possible to specify a command or a list of shell commands to execute after the aggregation (and before the push). The commands are executed into the aggregated directory.

./product_attribute:
    remotes:
    oca: https://github.com/OCA/product-attribute.git
    acsone: git+ssh://git@github.com/acsone/product-attribute.git
    merges:
        - oca 8.0
    target: acsone aggregated_branch_name
    shell_command_after: echo 'my command'

./connector-interfaces:
    remotes:
    oca:  https://github.com/OCA/connector-interfaces.git
    acsone:  https://github.com/acsone/connector-interfaces.git
    merges:
        - oca 9.0
    target: acsone aggregated_branch_name
    shell_command_after:
        - echo 'a first command'
        - echo 'a second command'

A real life example: applying a patch

./odoo:
    remotes:
    oca: https://github.com/OCA/OCB.git
    acsone: git@github.com/acsone/OCB.git
    merges:
        - oca 9.0
    target: acsone aggregated_branch_name
    shell_command_after:
        - git am "$(git format-patch -1 XXXXXX -o ../patches)"

1.7.0 (August 14, 2019)

• Fix a bug in --show-all-prs, which was printing a wrong PR URL.

• Display PR labels too in --show-all-prs.

1.6.0 (March 04, 2019)

• Add –show-all-prs command to list all GitHub pull requests used in merge sections.

1.5.0 (December 07, 2018)

• Add –force. If set, dirty repositories will fail to aggregate.

1.4.0 (September 13, 2018)

• Add –jobs option for multi-process operation.

1.3.0 (August 21, 2018)

• Improve configuration file parsing by mimicing Kaptan’s behavior of resolving handler by extension (#22)

1.2.1 (July, 12, 2018)

• show-closed-prs now displays merge status

• some documentation improvements

1.2.0 (May, 17, 2017)

• support .yml config file extension

• add a show-closed-prs command to display github pull requests that are not open anymore; github pull requests must be referenced as refs/pull/NNN/head in the merges section

1.1.0 (Feb, 01, 2017)

• Use setuptools_scm for the release process (https://github.com/acsone/git-aggregator/pull/10)

• Expand env vars in config. (https://github.com/acsone/git-aggregator/pull/8)

• Shallow repositories. (https://github.com/acsone/git-aggregator/pull/7)

• Fetch only required remotes. (https://github.com/acsone/git-aggregator/pull/6)

• Display readable error if config file not found. (https://github.com/acsone/git-aggregator/pull/2)

1.0.0 (Jan, 19, 2016)

• First release

Author

• Laurent Mignon (ACSONE)

Contributors

• Cyril Gaudin (camptocamp)

• Jairo Llopis (Tecnativa)

• Stéphane Bidoul (ACSONE)

• Dave Lasley (LasLabs)

• Patric Tombez

• Cristian Moncho

• Simone Orsi (camptocamp)

• Artem Kostyuk

Maintainer

This project is maintained by ACSONE SA/NV.