[ADD] Support specifying a pin for merges

[thomaspaulb]

Depends on:

• Drop support for other configuration file formats than yaml #76
• [RFR] Avoid contacting twice (Fixes #28) #74

Use case:

Currently in gitaggregator, you can already do:

OCA/web:
  defaults:
    depth: 10
  remotes:
    origin: https://github.com/OCA/web.git
    forgeflow: https://github.com/forgeflow/web.git
  target: origin 16.0
  merges:
    - origin d20edd1b171c166b6f7d016ac2cfb044a95f084f
    - forgeflow 27be86ab189d91aeb9b4be7bb11198dc016f43fa
  fetch_all: true

With this change, you can specify the exact branches on which the commits are and do:

OCA/web:
  defaults:
    depth: 100
  remotes:
    origin: https://github.com/OCA/web.git
    forgeflow: https://github.com/forgeflow/web.git
  target: origin 16.0
  merges:
    - origin 16.0 d20edd1b171c166b6f7d016ac2cfb044a95f084f
    - forgeflow 16.0-mig-web_notify_channel_message 27be86ab189d91aeb9b4be7bb11198dc016f43fa

So that fetch_all = True is not needed anymore and just the branches need to be fetched, and then reset to the pinned commit.

NB: I notice that Github currently also accept querying directly for the SHA. Is that new? Eg just this also works:

OCA/web:
  defaults:
    depth: 10
  remotes:
    origin: https://github.com/OCA/web.git
    forgeflow: https://github.com/forgeflow/web.git
  target: origin 16.0
  merges:
    - origin d20edd1b171c166b6f7d016ac2cfb044a95f084f
    - forgeflow 27be86ab189d91aeb9b4be7bb11198dc016f43fa

[codecov]

Codecov Report

Merging #73 (89db99c) into master (fe1e0bb) will increase coverage by 0.14%.
The diff coverage is 90.36%.

@@            Coverage Diff             @@
##           master      #73      +/-   ##
==========================================
+ Coverage   82.64%   82.78%   +0.14%     
==========================================
  Files           6        6              
  Lines         409      459      +50     
==========================================
+ Hits          338      380      +42     
- Misses         71       79       +8     

Impacted Files	Coverage Δ
git_aggregator/repo.py	75.53% <89.74%> (+1.40%)	⬆️
git_aggregator/config.py	99.02% <100.00%> (+0.03%)	⬆️

[sbidoul]

Can you describe the use case?

[sbidoul]

Can you describe the use case?

Ah, I now see this is #50

[sbidoul]

What happens if the target branch is rebased and thus the specified commit does not exist anymore on that branch?

[thomaspaulb]

What happens if the target branch is rebased and thus the specified commit does not exist anymore on that branch?

Then the build fails.

[thomaspaulb]

Can you describe the use case?

I've updated the PR description to specify the use case, but it all becomes a bit thin if we are also allowed to query directly for the SHA.