chore: release v4.5.0 (#89)

Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>

.github/pull_request_template.md

@@ -18,3 +18,36 @@ changes that span multiple kiegroup repositories and depend on each other. -->
 - [ ] Documentation updated if applicable.
 
 > **Note:** `dist/cli/index.js` and `dist/gha/index.js` are automatically generated by git hooks and gh workflows.
+
+<details>
+<summary>
+First time here?
+</summary>
+
+This project follows [git conventional commits](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13) pattern, therefore the commits should have the following format:
+
+```
+<type>(<optional scope>): <subject>
+empty separator line
+<optional body>
+empty separator line
+<optional footer>
+```
+
+Where the type must be one of `[build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test]`
+
+> **NOTE**: if you are still in a `work in progress` branch and you want to push your changes remotely, consider adding `--no-verify` for both `commit` and `push`, e.g., `git push origin <feat-branch> --no-verify` - this could become useful to push changes where there are still tests failures. Once the pull request is ready, please `amend` the commit and force-push it to keep following the adopted git commit standard. 
+
+</details>
+
+<details>
+<summary>
+How to prepare for a new release?
+</summary>
+
+There is no need to manually update `package.json` version and `CHANGELOG.md` information. This process has been automated in [Prepare Release](./workflows/prepare-release.yml) *Github* workflow.
+
+Therefore whenever enough changes are merged into the `main` branch, one of the maintainers will trigger this workflow that will automatically update `version` and `changelog` based on the commits on the git tree.
+
+More details can be found in [package release](https://github.com/kiegroup/git-backporting/blob/main/README.md#package-release) section of the README.
+</details>

.github/workflows/coverage.yml

@@ -0,0 +1,15 @@
+name: 'coverage report'
+
+on:
+    pull_request_target:
+        branches:
+            - main
+
+jobs:
+    coverage:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: ArtiomTr/jest-coverage-report-action@v2
+              with:
+                test-script: npm test 

.github/workflows/prepare-release.yml

@@ -0,0 +1,50 @@
+# this workflow prepare the project for the next release, it will update changelog and version based on the previous commits.
+# after that it will open a pull request for this change
+name: "prepare release"
+
+on: 
+  workflow_dispatch:
+    inputs:
+      options:
+        description: 'Additional release-it options'     
+        required: false
+        default: ''
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  prepare-release:
+    name: Prepare release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Git config
+        run: |
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+      - name: Npm config
+        run: npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
+      - run: npm ci
+      - name: Compute next version
+        run: |
+          next_version=$(npx release-it --release-version --no-git.requireCleanWorkingDir)
+          echo "NEXT_VERSION=${next_version}" >> $GITHUB_ENV
+      - name: Prepare the release changes
+        run: npm run release:prepare -- --ci --no-git.commit ${{ github.event.inputs.options }}
+      - name: Create Pull Request
+        uses: gr2m/create-or-update-pull-request-action@v1.x
+        with:
+          title: "chore: release v${{ env.NEXT_VERSION }}"
+          body: >
+            Creating changes for the next release.
+          branch: release/v${{ env.NEXT_VERSION }}
+          commit-message: "chore: release v${{ env.NEXT_VERSION }}"
+          reviewers: lampajr

.github/workflows/release.yml

@@ -24,12 +24,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-      - name: git config
+      - name: Git config
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-      - name: npm config
+      - name: Npm config
         run: npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
       - run: npm ci
       # the version/changelog must be already updated on main branch using "npm run release:prepare"
-      - run: npm run release -- --ci --no-increment --no-git.commit ${{ github.event.inputs.options }}
+      # or check prepare-release.yml workflow
+      - name: New version release
+        run: npm run release -- --ci --no-increment --no-git.commit ${{ github.event.inputs.options }}

.gitignore

@@ -11,3 +11,7 @@ report.json
 .vscode/
 build/
 .npmrc
+
+# temporary files created during tests
+*test*.json
+bp

CHANGELOG.md

@@ -1,56 +1,127 @@
 # Changelog
 
-## [3.1.0](https://github.com/lampajr/backporting/compare/v3.0.0...v3.1.0) (2023-07-05)
+## [4.5.0](https://github.com/kiegroup/git-backporting/compare/v4.4.1...v4.5.0) (2023-12-10)
 
 
 ### Features
 
-* config file as option ([#42](https://github.com/lampajr/backporting/issues/42)) ([5ead31f](https://github.com/lampajr/backporting/commit/5ead31f606b585ecdf7ed2e9de8ebd841b935898))
+* **gh-85:** take git tokens from environment ([#88](https://github.com/kiegroup/git-backporting/issues/88)) ([70da575](https://github.com/kiegroup/git-backporting/commit/70da575afce603190eafed927637922a37fbd087))
 
-## [3.0.0](https://github.com/lampajr/backporting/compare/v2.2.1...v3.0.0) (2023-07-01)
-
-
-### Features
-
-* integrate tool with gitlab service ([#39](https://github.com/lampajr/backporting/issues/39)) ([107f5e5](https://github.com/lampajr/backporting/commit/107f5e52d663157145aa14f6cf7fa4d6704cb844))
+## [4.4.1](https://github.com/kiegroup/git-backporting/compare/v4.4.0...v4.4.1) (2023-12-05)
 
 
 ### Bug Fixes
 
-* removed 'powered by..' pr body suffix ([6869bec](https://github.com/lampajr/backporting/commit/6869becb3e5979b24f6fe29bf38141e15c1bdc66))
+* namespace parsing in gitlab ([#84](https://github.com/kiegroup/git-backporting/issues/84)) ([ed32d22](https://github.com/kiegroup/git-backporting/commit/ed32d2275b6008d31e456c41beecd536eceb23dc))
 
-## [2.2.1](https://github.com/lampajr/backporting/compare/v2.2.0...v2.2.1) (2023-06-27)
+## [4.4.0](https://github.com/kiegroup/git-backporting/compare/v4.3.0...v4.4.0) (2023-08-18)
+
+
+### Features
+
+* integrate with codeberg ([#80](https://github.com/kiegroup/git-backporting/issues/80)) ([9f0fbc0](https://github.com/kiegroup/git-backporting/commit/9f0fbc0b2fd8d449207660323be87f6d2fa8c017))
+* **issue-77:** handle multiple target branches ([#78](https://github.com/kiegroup/git-backporting/issues/78)) ([5fc72e1](https://github.com/kiegroup/git-backporting/commit/5fc72e127bedb3177f4e17ff1182827c78154ef1))
+
+## [4.3.0](https://github.com/kiegroup/git-backporting/compare/v4.2.0...v4.3.0) (2023-07-27)
+
+
+### Features
+
+* **issue-70:** additional pr comments ([bed7e29](https://github.com/kiegroup/git-backporting/commit/bed7e29ddc1ba5498faa2c7cc33ec3b127947dcf))
 
 
 ### Bug Fixes
 
-* fix gha no-inherit-reviewers input ([8b586cc](https://github.com/lampajr/backporting/commit/8b586ccdfe0e6b90ed41ea8a5eecdbc24893fe25))
+* gha skip whitespace trim on body ([#73](https://github.com/kiegroup/git-backporting/issues/73)) ([29589a6](https://github.com/kiegroup/git-backporting/commit/29589a63b503b30820a13a442de533239dec06f4))
+* preserve new lines in body and comments ([#72](https://github.com/kiegroup/git-backporting/issues/72)) ([fa43ffc](https://github.com/kiegroup/git-backporting/commit/fa43ffc1dc5572a06309c28e93ee6ab5fba14780))
 
-## [2.2.0](https://github.com/lampajr/backporting/compare/v2.1.0...v2.2.0) (2023-06-22)
+## [4.2.0](https://github.com/kiegroup/git-backporting/compare/v4.1.0...v4.2.0) (2023-07-13)
 
 
 ### Features
 
-* override backporting pr fields ([#38](https://github.com/lampajr/backporting/issues/38)) ([a32e8cd](https://github.com/lampajr/backporting/commit/a32e8cd34c757358668fe8f88f6d1733d3fa8391))
-
-## [2.1.0](https://github.com/lampajr/backporting/compare/v2.0.1...v2.1.0) (2023-06-20)
-
-
-### Features
-
-* **issue-17:** override backporting pr data ([#29](https://github.com/lampajr/backporting/issues/29)) ([941beda](https://github.com/lampajr/backporting/commit/941beda208e4a8c1577bd4d39299fbbfbf569c06))
+* **issue-62:** make cherry-pick strategy configurable ([#63](https://github.com/kiegroup/git-backporting/issues/63)) ([265955d](https://github.com/kiegroup/git-backporting/commit/265955dda77a8191fd1f64517fec20e8d5f8c5b4))
 
 
 ### Bug Fixes
 
-* gha input parser ([95b35aa](https://github.com/lampajr/backporting/commit/95b35aa4efb86e2bc4990d920feec1ec5c4eb8e4))
+* **issue-57:** truncate the bp branch name ([#58](https://github.com/kiegroup/git-backporting/issues/58)) ([ead1322](https://github.com/kiegroup/git-backporting/commit/ead1322c0f6bb5de96c487e8f6b6565734144853))
 
-## [2.0.1](https://github.com/lampajr/backporting/compare/v2.0.0...v2.0.1) (2023-01-05)
 
-## [2.0.0](https://github.com/lampajr/backporting/compare/v1.0.0...v2.0.0) (2023-01-05)
+### Performance Improvements
+
+* use concurrent promises instead of awaiting them one by one ([#59](https://github.com/kiegroup/git-backporting/issues/59)) ([49a7350](https://github.com/kiegroup/git-backporting/commit/49a73504066396ca2a074f55bb23815e13ae462e))
+
+## [4.1.0](https://github.com/kiegroup/git-backporting/compare/v4.0.0...v4.1.0) (2023-07-11)
 
 
 ### Features
 
-* backport still open pull requests ([b3936e0](https://github.com/lampajr/backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
-* pull request backporting ([b3936e0](https://github.com/lampajr/backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
+* **issue-41:** set and inherit labels ([#48](https://github.com/kiegroup/git-backporting/issues/48)) ([fcc0167](https://github.com/kiegroup/git-backporting/commit/fcc01673f4bc9aa2786faf6dfd503a29e5ca0cd9))
+* **issue-54:** backport pr commits without squash ([#55](https://github.com/kiegroup/git-backporting/issues/55)) ([c4dbb26](https://github.com/kiegroup/git-backporting/commit/c4dbb26c1d9d266ed86f3f0d6016b8cff7743f8b))
+
+
+### Bug Fixes
+
+* **issue-52:** use pull request github api url as source ([#53](https://github.com/kiegroup/git-backporting/issues/53)) ([a737aa7](https://github.com/kiegroup/git-backporting/commit/a737aa7c4c66983de358b8472121ab918de922e3))
+
+## [4.0.0](https://github.com/kiegroup/git-backporting/compare/v3.0.0...v4.0.0) (2023-07-06)
+
+Project moved under @kiegroup organization.
+
+## [3.1.1](https://github.com/kiegroup/git-backporting/compare/v3.1.0...v3.1.1) (2023-07-06)
+
+## [3.1.0](https://github.com/kiegroup/git-backporting/compare/v3.0.0...v3.1.0) (2023-07-05)
+
+
+### Features
+
+* config file as option ([#42](https://github.com/kiegroup/git-backporting/issues/42)) ([5ead31f](https://github.com/kiegroup/git-backporting/commit/5ead31f606b585ecdf7ed2e9de8ebd841b935898))
+
+## [3.0.0](https://github.com/kiegroup/git-backporting/compare/v2.2.1...v3.0.0) (2023-07-01)
+
+
+### Features
+
+* integrate tool with gitlab service ([#39](https://github.com/kiegroup/git-backporting/issues/39)) ([107f5e5](https://github.com/kiegroup/git-backporting/commit/107f5e52d663157145aa14f6cf7fa4d6704cb844))
+
+
+### Bug Fixes
+
+* removed 'powered by..' pr body suffix ([6869bec](https://github.com/kiegroup/git-backporting/commit/6869becb3e5979b24f6fe29bf38141e15c1bdc66))
+
+## [2.2.1](https://github.com/kiegroup/git-backporting/compare/v2.2.0...v2.2.1) (2023-06-27)
+
+
+### Bug Fixes
+
+* fix gha no-inherit-reviewers input ([8b586cc](https://github.com/kiegroup/git-backporting/commit/8b586ccdfe0e6b90ed41ea8a5eecdbc24893fe25))
+
+## [2.2.0](https://github.com/kiegroup/git-backporting/compare/v2.1.0...v2.2.0) (2023-06-22)
+
+
+### Features
+
+* override backporting pr fields ([#38](https://github.com/kiegroup/git-backporting/issues/38)) ([a32e8cd](https://github.com/kiegroup/git-backporting/commit/a32e8cd34c757358668fe8f88f6d1733d3fa8391))
+
+## [2.1.0](https://github.com/kiegroup/git-backporting/compare/v2.0.1...v2.1.0) (2023-06-20)
+
+
+### Features
+
+* **issue-17:** override backporting pr data ([#29](https://github.com/kiegroup/git-backporting/issues/29)) ([941beda](https://github.com/kiegroup/git-backporting/commit/941beda208e4a8c1577bd4d39299fbbfbf569c06))
+
+
+### Bug Fixes
+
+* gha input parser ([95b35aa](https://github.com/kiegroup/git-backporting/commit/95b35aa4efb86e2bc4990d920feec1ec5c4eb8e4))
+
+## [2.0.1](https://github.com/kiegroup/git-backporting/compare/v2.0.0...v2.0.1) (2023-01-05)
+
+## [2.0.0](https://github.com/kiegroup/git-backporting/compare/v1.0.0...v2.0.0) (2023-01-05)
+
+
+### Features
+
+* backport still open pull requests ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
+* pull request backporting ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))

README.md

@@ -1,25 +1,20 @@
 <h1 align="center">
-  BPER </br>
-  Git Backporter </br>
+  Git Backporting </br>
   :outbox_tray: :inbox_tray:
 </h1>
 
 <p align="center">
-  <a href="https://github.com/lampajr/backporting">
-    <img alt="ci checks status" src="https://github.com/lampajr/backporting/actions/workflows/ci.yml/badge.svg">
+  <a href="https://github.com/kiegroup/git-backporting">
+    <img alt="ci checks status" src="https://github.com/kiegroup/git-backporting/actions/workflows/ci.yml/badge.svg">
   </a>
-  <a href="https://badge.fury.io/js/@lampajr%2Fbper">
-    <img alt="npm version" src="https://badge.fury.io/js/@lampajr%2Fbper.svg">
+  <a href="https://badge.fury.io/js/@kie%2Fgit-backporting">
+    <img alt="npm version" src="https://badge.fury.io/js/@kie%2Fgit-backporting.svg">
   </a>
 </p>
 
 ---
 
-## :tada: BPER v3 is out!! You can backport Gitlab merge requests now :tada:
-
----
-
-**Git Backporter**, also referenced as **bper**, is a [NodeJS](https://nodejs.org/) command line tool that provides capabilities to *backport* pull requests (on *GitHub*) and merge requests (on *GitLab*) in an automated way. This tool also comes with a predefined *GitHub* action in order to make CI/CD integration easier for all users.
+**Git Backporting** is a [NodeJS](https://nodejs.org/) command line tool that provides capabilities to *backport* pull requests (on *GitHub*) and merge requests (on *GitLab*) in an automated way. This tool also comes with a predefined *GitHub* action in order to make CI/CD integration easier for all users.
 
 
 Table of content
@@ -27,15 +22,16 @@ Table of content
 
 * **[Who is this tool for](#who-is-this-tool-for)**
 * **[CLI tool](#cli-tool)**
-* **[Supported git services](#supported-git-services)**
 * **[GitHub action](#github-action)**
 * **[Future works](#future-works)**
+* **[Migrating to v4](#migrating-to-v4)**
+* **[Development](#development)**
 * **[Contributing](#contributing)**
 * **[License](#license)**
 
 ## Who is this tool for?
 
-`bper` is a tool that provides capabilities to *backport* pull requests (on *GitHub*) and merge requests (on *GitLab*) in an automated way.
+`git-backporting` is a fully configurable tool that provides capabilities to *backport* pull requests (on *GitHub*) and merge requests (on *GitLab*) in an automated way.
 
 > *What is backporting?* - backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.
 
@@ -43,21 +39,23 @@ Therefore this tools is for anybody who is working on projects where they have t
 
 ## CLI tool
 
+>  All instructions provided below pertain to version `v4` of the tool. If you wish to use an earlier version, we strongly encourage you to consider migrating to version `v4` as there are no valid reason to keep using older versions. Please refer to [Migrating to v4](#migrating-to-v4) section for comprehensive details on how to properly migrate to version `v4`.
+
 This tool is released on the [public npm registry](https://www.npmjs.com/), therefore it can be easily installed using `npm`:
 
 ```bash
-$ npm install -g @lampajr/bper
+$ npm install -g @kie/git-backporting
 ```
 
 Then you just have to choose the pull request (or merge request on *Gitlab*) that you would like to backport and the target branch and the simply run the following command:
 
 ```bash
-$ bper -tb <branch> -pr <pull-request-url> -a <git-token>
+$ git-backporting -tb <branch> -pr <pull-request-url> -a <git-token>
 ```
 
 A real example could be the following one:
 ```bash
-$ bper -tb develop -pr https://github.com/lampajr/backporting-example/pull/47 -a *****
+$ git-backporting -tb develop -pr https://github.com/kiegroup/git-backporting-example/pull/47 -a *****
 ```
 
 This is the easiest invocation where you let the tool set / compute most of the backported pull request data. Obviously most of that data can be overridden with appropriate tool options, more details can be found in the [inputs](#inputs) section.
@@ -67,6 +65,27 @@ This is the easiest invocation where you let the tool set / compute most of the
 * Node 16 or higher, more details on Node can be found [here](https://nodejs.org/en).
 * Git, see [how to install](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) if you need help.
 
+### How it works?
+
+The simply works in this way: given the provided `pull/merge request` it infers the git client to use (either *Github* or *Gitlab* for now) and it retrieve the corresponding pull request object (original pull/merge request to be backported into another branch).
+
+After that it clones the corresponding git repository, check out in the provided `target branch` and create a new branch from that (name automatically generated if not provided as option).
+
+By default the tool will try to cherry-pick the single squashed/merged commit into the newly created branch (please consider using `--no-squash` option if you want to cherry-pick all commits belonging to the provided pull request).
+
+Based on the original pull request, creates a new one containing the backporting to the target branch. Note that most of these information can be overridden with appropriate CLI options or GHA inputs.
+
+#### Default cherry-pick strategy
+
+The default cherry-pick strategy is `recursive` with `theirs` option for automatic conflicts resolution. Therefore, by default, all commits are cherry-picked using the following git-equivalent command:
+```bash
+$ git cherry-pick -m 1 --strategy=recursive --strategy-option=theirs <sha>
+```
+
+From version `v4.2.0` we made both `strategy` and `strategy-option` fully configurable from CLI or GitHub action, so if users need a specific strategy which differs from the default one please consider using either `--strategy` or `--strategy-option`, or their equivalent GitHub action inputs, more details in [inputs](#inputs) section.
+
+> **NOTE**: If there are any conflicts, the tool will block the process and exit signalling the failure as there are still no ways to interactively resolve them. In these cases a manual cherry-pick is needed, or alternatively users could manually resume the process in the cloned repository (here the user will have to resolve the conflicts, push the branch and create the pull request - all manually).
+
 ### Inputs
 
 This tool comes with some inputs that allow users to override the default behavior, here the full list of available inputs:
@@ -75,10 +94,10 @@ This tool comes with some inputs that allow users to override the default behavi
 |---------------|----------------------|--------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
 | Version       | -V, --version        | -            | Current version of the tool                                                                                                                            |             |
 | Help          | -h, --help           | -            | Display the help message                                                                                                                               |             |
-| Target Branch | -tb, --target-branch | N            | Branch where the changes must be backported to                                                                                                         |             |
-| Pull Request  | -pr, --pull-request  | N            | Original pull request url, the one that must be backported, e.g., https://github.com/lampajr/backporting/pull/1                                        |             |
+| Target Branches | -tb, --target-branch | N            | Comma separated list of branches where the changes must be backported to                                                                                                         |             |
+| Pull Request  | -pr, --pull-request  | N            | Original pull request url, the one that must be backported, e.g., https://github.com/kiegroup/git-backporting/pull/1                                        |             |
 | Configuration File  | -cf, --config-file  | N            | Configuration file, in JSON format, containing all options to be overridded, note that if provided all other CLI options will be ignored                                        |             |
-| Auth          | -a, --auth           | N            | `GITHUB_TOKEN`, `GITLAB_TOKEN` or a `repo` scoped [Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) | ""          |
+| Auth          | -a, --auth           | N            | Git access/authorization token, if provided all token env variables will be ignored. See [auth token](#authorization-token) section for more details | ""          |
 | Folder        | -f, --folder         | N            | Local folder full name of the repository that will be checked out, e.g., /tmp/folder                                                                                     | {cwd}/bp    |
 | Git User       | -gu, --git-user        | N            | Local git user name                                                       | "GitHub"       |
 | Git Email       | -ge, --git-email        | N            | Local git user email                                                       | "noreply@github.com"       |
@@ -88,11 +107,28 @@ This tool comes with some inputs that allow users to override the default behavi
 | Reviewers       | --reviewers        | N            | Backporting pull request comma-separated reviewers list                                                           | []       |
 | Assignees       | --assignes        | N            | Backporting pull request comma-separated assignees list                                                           | []       |
 | No Reviewers Inheritance       | --no-inherit-reviewers        | N            | Considered only if reviewers is empty, if true keep reviewers as empty list, otherwise inherit from original pull request                                                           | false       |
-| Backport Branch Name       | --bp-branch-name        | N            | Name of the backporting pull request branch                                                           | bp-{target-branch}-{sha}       |
+| Backport Branch Names       | --bp-branch-name        | N            | Comma separated lists of the backporting pull request branch names, if they exceeds 250 chars they will be truncated                                                           | bp-{target-branch}-{sha1}...{shaN}       |
+| Labels       | --labels        | N            | Provide custom labels to be added to the backporting pull request                                                           | []       |
+| Inherit labels       | --inherit-labels        | N            | If enabled inherit lables from the original pull request                                                           | false       |
+| No squash       | --no-squash        | N            | If provided the backporting will try to backport all pull request commits without squashing                                                           | false       |
+| Strategy       | --strategy        | N            | Cherry pick merging strategy, see [git-merge](https://git-scm.com/docs/git-merge#_merge_strategies) doc for all possible values                                                           | "recursive"       |
+| Strategy Option       | --strategy-option        | N            | Cherry pick merging strategy option, see [git-merge](https://git-scm.com/docs/git-merge#_merge_strategies) doc for all possible values                                                           | "theirs"       |
+| Additional comments       | --comments        | N            | Semicolon separated list of additional comments to be posted to the backported pull request                                                           | []       |
 | Dry Run       | -d, --dry-run        | N            | If enabled the tool does not push nor create anything remotely, use this to skip PR creation                                                           | false       |
 
 > **NOTE**: `pull request` and `target branch` are *mandatory*, they must be provided as CLI options or as part of the configuration file (if used).
 
+#### Authorization token
+
+Since version `4.5.0` we introduced a new feature that allows user to provide the git access token through environment variables. These env variables are taken into consideration only if the `--auth/-a` is not provided as argument/input.
+Here the supported list of env variables:
+- `GITHUB_TOKEN`: this is checked only if backporting on Github platform.
+- `GITLAB_TOKEN`: this is checked only if backporting on Gitlab platform.
+- `CODEBERG_TOKEN`: this is checked only if backporting on Codeberg platform.
+- `GIT_TOKEN`: this is considered if none of the previous envs are set.
+
+> **NOTE**: if `--auth` argument is provided, all env variables will be ignored even if not empty.
+
 #### Configuration file example
 
 This is an example of a configuration file that can be used.
@@ -107,13 +143,15 @@ This is an example of a configuration file that can be used.
 ```
 Keep in mind that its structue MUST match the [Args](src/service/args/args.types.ts) interface, which is actually a camel-case version of the CLI options.
 
-## Supported git services
+### Supported git services
 
-Right now **bper** supports the following git management services:
+Right now **Git Backporting** supports the following git management services:
  * ***GITHUB***: Introduced since the first release of this tool (version `1.0.0`). The interaction with this system is performed using [*octokit*](https://octokit.github.io/rest.js) client library.
 
  * ***GITLAB***: This has been introduced since version `3.0.0`, it works for both public and private *GitLab* servers. The interaction with this service is performed using plain [*axios*](https://axios-http.com) requests. The *gitlab* api version that is used to make requests is `v4`, at the moment there is no possibility to override it.
 
+ * ***CODEBERG***: Introduced since version `4.4.0`, it works for public [codeberg.org](https://codeberg.org/) platform. Thanks to the api compatibility with GitHub, the interaction with this service is performed using using [*octokit*](https://octokit.github.io/rest.js) client library.
+
 > **NOTE**: by default, all gitlab requests are performed setting `rejectUnauthorized=false`, planning to make this configurable too.
 
 ## GitHub action
@@ -121,7 +159,7 @@ Right now **bper** supports the following git management services:
 This action can be used in any *GitHub* workflow, below you can find a simple example of manually triggered workflow backporting a specific pull request (provided as input).
 
 ```yml
-name: Pull Request Backporting using BPer
+name: Pull Request Backporting using Git Backporting
 
 on: 
   workflow_dispatch:
@@ -146,7 +184,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Backporting
-        uses: lampajr/backporting@main
+        uses: kiegroup/git-backporting@main
         with:
           target-branch: ${{ inputs.targetBranch }}
           pull-request: ${{ inputs.pullRequest }}
@@ -159,7 +197,7 @@ You can also use this action with other events - you'll just need to specify `ta
 For example, this configuration creates a pull request against branch `v1` once the current one is merged, provided that the label `backport-v1` is applied:
 
 ```yaml
-name: Pull Request Backporting using BPer
+name: Pull Request Backporting using Git Backporting
 
 on:
   pull_request_target:
@@ -167,6 +205,9 @@ on:
       - closed
       - labeled
 
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 jobs:
   backporting:
     name: "Backporting"
@@ -185,24 +226,77 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Backporting
-        uses: lampajr/backporting@main
+        uses: kiegroup/git-backporting@main
         with:
           target-branch: v1
           pull-request: ${{ github.event.pull_request.url }}
-          auth: ${{ secrets.GITHUB_TOKEN }}
 ```
 
 For a complete description of all inputs see [Inputs section](#inputs).
 
 ## Future works
 
-**BPer** is still in development mode, this means that there are still many future works and extension. I'll try to summarize the most important ones:
+**Git Backporting** is still in development mode, this means that there are still many future works and extension that can be implemented. I'll try to summarize the most important ones:
 
-- Provide a way to backport single commit too (or a set of them), even if no original pull request is present.
+- Provide a way to backport single commit (or a set of them) if no original pull request is present.
 - Integrate this tool with other git management services (like Bitbucket) to make it as generic as possible.
 - Integrate it into other CI/CD services like gitlab CI.
 - Provide some reusable *GitHub* workflows.
 
+## Migrating to v4
+
+From version `v4` the project has been moved under [@kiegroup](https://github.com/kiegroup) organization. During this migration we changed some things that you should be aware of. I'll try to summarize them in the following table:
+
+> **NOTE**: these changes did not affect the tool features.
+
+|             | **v4 (after migration)** | v3 or older (before migration) |
+|-------------|--------------------------|--------------------------------|
+| Owner       | kiegroup                 | lampajr                        |
+| Repository  | git-backporting          | backporting                    |
+| NPM package | @kie/git-backporting     | @lampajr/bper                  |
+| CLI tool    | git-backporting          | bper                           |
+
+So everytime you would use older version keep in mind that these changes are madnatory to make the tool working.
+
+> **NOTE**: Versions `v3.1.1` and `v4.0.0` offer identical features; the only distinction lies in the project's renaming and organization movement.
+
+## Development
+
+### Package release
+
+The release of this package is entirely based on [release-it](https://github.com/release-it/release-it) tool. I created some useful scripts that can make the release itself quite easy.
+
+
+#### Automatic release
+
+The first step is to prepare the changes for the next release, this is done by running:
+
+```bash
+$ npm run release:prepare:all
+```
+
+> NOTE: running locally this requires `npm login`, please consider using `.github/workflows/prepare-release.yml` if you don't have permission on the npm package.
+
+This script performs the following steps:
+ 1. Automatically computes the next version based on the last commits
+ 2. Create a new branch `release/v${computed_version}`
+ 3. Apply all changes, like version and changelog upgrade
+ 4. Commit those changes: `chore: release v${compute_version}`
+
+After that you should just push the new branch and open the pull request.
+> NOTE: if you don't want to run this preparation from you local environment, there is already a workflow that does all these steps, including the pull request. See [Prepare release](.github/workflows/prepare-release.yml) workflow.
+
+Once the release preparion pull request got merged, you can run [Release package](.github/workflows/release.yml) workflow that automatically performs the release itself, including npm publishing, git tag and github release.
+
+#### Manual release
+
+In case we would like to perform a manual release, it would be enough to open a pull request changing the following items:
+- Package version inside the `package.json`
+- Provide exhaustive changelog information inside `CHANGELOG.md`
+- Commit like `chore: release v<version>`
+
+Once the release preparion pull request got merged, run [Release package](.github/workflows/release.yml) workflow.
+
 ## Contributing
 
 This is an open source project, and you are more than welcome to contribute :heart:!
@@ -211,7 +305,7 @@ Every change must be submitted through a *GitHub* pull request (PR). Backporting
 
 > **Note**: this project follows [git-conventional-commits](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13) standards, thanks to the [commit-msg hook](./.husky/commit-msg) you are not allowed to use commits that do not follow those standards.
 
-1. Fork it (https://github.com/lampajr/backporting).
+1. Fork it (https://github.com/kiegroup/git-backporting).
 
 2. Create your feature branch: (git checkout -b feature).
 
@@ -223,6 +317,8 @@ Every change must be submitted through a *GitHub* pull request (PR). Backporting
 
 > **Note**: you don't need to take care about typescript compilation and minifycation, there are automated [git hooks](./.husky) taking care of that!
 
+**Hint**: if you are still in a `work in progress` branch and you want to push your changes remotely, consider adding `--no-verify` for both `commit` and `push`, e.g., `git push origin <feat-branch> --no-verify`
+
 ## License
 
-Backporting (BPer) open source project is licensed under the [MIT](./LICENSE) license.
+Git backporting open source project is licensed under the [MIT](./LICENSE) license.

action.yml

@@ -2,10 +2,10 @@ name: "Backporting GitHub Action"
 description: "GitHub action providing an automated way to backport pull requests from one branch to another"
 inputs:
   pull-request:
-    description: "URL of the pull request to backport, e.g., https://github.com/lampajr/backporting/pull/1"
+    description: "URL of the pull request to backport, e.g., https://github.com/kiegroup/git-backporting/pull/1"
     required: false
   target-branch:
-    description: "Branch where the pull request must be backported to"
+    description: "Comma separated list of branches where the pull request must be backported to"
     required: false
   config-file:
     description: "Path to a file containing the json configuration for this tool, the object must match the Args interface"
@@ -15,7 +15,7 @@ inputs:
     required: false
     default: "false"
   auth:
-    description: "GITHUB_TOKEN or a `repo` scoped Personal Access Token (PAT)"
+    description: "GITHUB_TOKEN or a `repo` scoped Personal Access Token (PAT), if not provided will look for existing env variables like GITHUB_TOKEN"
     default: ${{ github.token }}
     required: false
   git-user:
@@ -29,14 +29,14 @@ inputs:
   title:
     description: "Backporting PR title. Default is the original PR title prefixed by the target branch"
     required: false
-  body:
-    description: "Backporting PR body. Default is the original PR body prefixed by `backport: <original-pr-link>`"
-    required: false
   body-prefix:
-    description: "Backporting PR body prefix. Default is `backport: <original-pr-link>`"
+    description: "Backporting PR body prefix. Default is `Backport: <original-pr-link>`"
+    required: false
+  body:
+    description: "Backporting PR body. Default is the original PR body"
     required: false
   bp-branch-name:
-    description: "Backporting PR branch name. Default is auto-generated from commit"
+    description: "Comma separated list of backporting PR branch names. Default is auto-generated from commit and target branches"
     required: false
   reviewers:
     description: "Comma separated list of reviewers for the backporting pull request"
@@ -48,6 +48,28 @@ inputs:
     description: "Considered only if reviewers is empty, if true keep reviewers as empty list, otherwise inherit from original pull request"
     required: false
     default: "false"
+  labels:
+    description: "Comma separated list of labels to be assigned to the backported pull request"
+    required: false
+  inherit-labels:
+    description: "If true the backported pull request will inherit labels from the original one"
+    required: false
+    default: "false"
+  no-squash:
+    description: "If set to true the tool will backport all commits as part of the pull request instead of the suqashed one"
+    required: false
+    default: "false"
+  strategy:
+    description: "Cherry-pick merge strategy"
+    required: false
+    default: "recursive"
+  strategy-option:
+    description: "Cherry-pick merge strategy option"
+    required: false
+    default: "theirs"
+  comments:
+    description: "Semicolon separated list of additional comments to be posted to the backported pull request"
+    required: false
 
 runs:
   using: node16

examples/on-pr-merge/automated-workflow.yaml

@@ -0,0 +1,53 @@
+name: Automated Backporting on PR merge using Git Backporting
+
+on:
+  pull_request_target:
+    types: [closed, labeled]
+    branches:
+      - main
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  compute-targets:
+    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged }}
+    runs-on: ubuntu-latest
+    outputs:
+      target-branches: ${{ steps.set-targets.outputs.targets }}
+    env:
+      LABELS: ${{ toJSON(github.event.pull_request.labels) }}
+    steps:
+      - name: Set target branches
+        id: set-targets
+        uses: kiegroup/kie-ci/.ci/actions/parse-labels@main
+        with:
+          labels: ${LABELS}
+  
+  backporting:
+    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged && needs.compute-targets.outputs.target-branches != '[]' }}
+    name: "[${{ matrix.target-branch }}] - Backporting"
+    runs-on: ubuntu-latest
+    needs: compute-targets
+    strategy:
+      matrix: 
+        target-branch: ${{ fromJSON(needs.compute-targets.outputs.target-branches) }}
+      fail-fast: true
+    steps:    
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Backporting
+        uses: ./
+        with:
+          dry-run: true
+          pull-request: ${{  github.event.pull_request.html_url }}
+          target-branch: ${{ matrix.target-branch }}
+          auth: "${{ env.GITHUB_TOKEN }}"
+          title: "[${{ matrix.target-branch }}] ${{ github.event.pull_request.title }}"
+          body-prefix: "**Backport:** ${{  github.event.pull_request.html_url }}\r\n\r\n**Note**: comment 'ok to test' to properly launch Jenkins jobs\r\n\r\n"
+          body: "${{ github.event.pull_request.body }}"
+          labels: "cherry-pick :cherries:"
+          inherit-labels: false
+          bp-branch-name: "${{ matrix.target-branch }}_${{ github.event.pull_request.head.ref }}"

examples/on-pr-merge/pr-merge-event.json

@@ -0,0 +1,79 @@
+{
+  "pull_request": {
+    "url": "https://api.github.com/repos/lampajr/backporting-example/pulls/66",
+    "html_url": "https://github.com/lampajr/backporting-example/pull/66",
+    "diff_url": "https://github.com/lampajr/backporting-example/pull/66.diff",
+    "patch_url": "https://github.com/lampajr/backporting-example/pull/66.patch",
+    "issue_url": "https://api.github.com/repos/lampajr/backporting-example/issues/66",
+    "number": 66,
+    "state": "closed",
+    "title": "Feature1: multiple changes",
+    "user": {
+      "login": "lampajr"
+    },
+    "body": "This is the body of multiple change",
+    "merge_commit_sha": "0bcaa01cdd509ca434e123d2e2b9ce7f66234bd7",
+    "assignee": null,
+    "assignees": [
+  
+    ],
+    "requested_reviewers": [
+  
+    ],
+    "requested_teams": [
+  
+    ],
+    "labels": [
+      {
+        "name": "backport-develop",
+        "color": "AB975B",
+        "default": false,
+        "description": ""
+      }
+    ],
+    "head": {
+      "label": "lampajr:feature1",
+      "ref": "feature1",
+      "sha": "69e49388ea2ca9be272b188a9271806d487bf01e",
+      "user": {
+        "login": "lampajr"
+      },
+      "repo": {
+        "name": "backporting-example",
+        "full_name": "lampajr/backporting-example",
+        "owner": {
+          "login": "lampajr"
+        },
+        "html_url": "https://github.com/lampajr/backporting-example",
+        "clone_url": "https://github.com/lampajr/backporting-example.git"
+      }
+    },
+    "base": {
+      "label": "lampajr:main",
+      "ref": "main",
+      "sha": "c85b8fcdb741814b3e90e6e5729455cf46ff26ea",
+      "user": {
+        "login": "lampajr"
+      },
+      "repo": {
+        "name": "backporting-example",
+        "full_name": "lampajr/backporting-example",
+        "owner": {
+          "login": "lampajr"
+        },
+        "html_url": "https://github.com/lampajr/backporting-example",
+        "description": "Playground repository for automated backporting testing",
+        "url": "https://api.github.com/repos/lampajr/backporting-example",
+        "issues_url": "https://api.github.com/repos/lampajr/backporting-example/issues{/number}",
+        "pulls_url": "https://api.github.com/repos/lampajr/backporting-example/pulls{/number}",
+        "clone_url": "https://github.com/lampajr/backporting-example.git"
+      }
+    },
+    "merged": true,
+    "merged_by": {
+      "login": "lampajr"
+    },
+    "comments": 0,
+    "commits": 2
+  }
+}

package.json

@@ -1,17 +1,20 @@
 {
-  "name": "@lampajr/bper",
-  "version": "3.1.0",
-  "description": "BPer is a tool to execute automatic git backporting.",
+  "name": "@kie/git-backporting",
+  "version": "4.5.0",
+  "description": "Git backporting is a tool to execute automatic pull request git backporting.",
   "author": "",
   "license": "MIT",
   "private": false,
   "main": "./dist/gha/index.js",
   "bin": {
-    "bper": "./dist/cli/index.js"
+    "git-backporting": "./dist/cli/index.js"
   },
   "files": [
     "dist/cli/index.js"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "prepare": "husky install",
     "clean": "rm -rf ./build ./dist",
@@ -20,7 +23,7 @@
     "package:cli": "ncc build ./build/src/bin/cli.js -o dist/cli",
     "package:gha": "ncc build ./build/src/bin/gha.js -o dist/gha",
     "build": "npm run clean && npm run compile && npm run package",
-    "test": "jest",
+    "test": "jest --silent",
     "test:report": "npm test -- --coverage --testResultsProcessor=jest-sonar-reporter",
     "lint": "eslint . --ext .ts",
     "lint:fix": "npm run lint -- --fix",
@@ -28,28 +31,31 @@
     "postversion": "npm run build && git add dist && rm -rf build",
     "release": "release-it",
     "release:branch": "git checkout -b release/$(release-it --release-version) main",
-    "release:prepare": "npm run release:branch && release-it --ci --no-npm.publish --no-github.release --no-git.push --no-git.tag --no-git.requireUpstream"
+    "release:prepare": "release-it --no-npm.publish --no-github.release --no-git.push --no-git.tag --no-git.requireUpstream",
+    "release:prepare:all": "npm run release:branch && npm run release:prepare"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lampajr/backporting.git"
+    "url": "git+https://github.com/kiegroup/git-backporting.git"
   },
   "keywords": [
     "backporting",
     "pull-requests",
+    "merge-requests",
     "github-action",
     "cherry-pick"
   ],
   "bugs": {
-    "url": "https://github.com/lampajr/backporting/issues"
+    "url": "https://github.com/kiegroup/git-backporting/issues"
   },
-  "homepage": "https://github.com/lampajr/backporting#readme",
+  "homepage": "https://github.com/kiegroup/git-backporting#readme",
   "devDependencies": {
     "@commitlint/cli": "^17.4.0",
     "@commitlint/config-conventional": "^17.4.0",
     "@gitbeaker/rest": "^39.1.0",
     "@kie/mock-github": "^1.1.0",
-    "@release-it/conventional-changelog": "^5.1.1",
+    "@octokit/webhooks-types": "^6.8.0",
+    "@release-it/conventional-changelog": "^7.0.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.17",
@@ -60,14 +66,13 @@
     "husky": "^8.0.2",
     "jest": "^29.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "release-it": "^15.6.0",
+    "release-it": "^16.1.3",
     "semver": "^7.3.8",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.8.1",
     "tsc-alias": "^1.8.2",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.9.3",
-    "@octokit/webhooks-types": "^6.8.0"
+    "typescript": "^4.9.3"
   },
   "dependencies": {
     "@actions/core": "^1.10.0",

src/service/args/args-parser.ts

@@ -17,8 +17,8 @@ export default abstract class ArgsParser {
     const args = this.readArgs();
 
     // validate and fill with defaults
-    if (!args.pullRequest || !args.targetBranch) {
-      throw new Error("Missing option: pull request and target branch must be provided");
+    if (!args.pullRequest || !args.targetBranch || args.targetBranch.trim().length == 0) {
+      throw new Error("Missing option: pull request and target branches must be provided");
     }
     
     return {
@@ -36,6 +36,12 @@ export default abstract class ArgsParser {
       reviewers: this.getOrDefault(args.reviewers, []),
       assignees: this.getOrDefault(args.assignees, []),
       inheritReviewers: this.getOrDefault(args.inheritReviewers, true),
+      labels: this.getOrDefault(args.labels, []),
+      inheritLabels: this.getOrDefault(args.inheritLabels, false),
+      squash: this.getOrDefault(args.squash, true),
+      strategy: this.getOrDefault(args.strategy),
+      strategyOption: this.getOrDefault(args.strategyOption),
+      comments: this.getOrDefault(args.comments)
     };
   }
 }

src/service/args/args-utils.ts

@@ -19,4 +19,38 @@ export function parseArgs(configFileContent: string): Args {
 export function readConfigFile(pathToFile: string): Args {
   const asString: string = fs.readFileSync(pathToFile, "utf-8");
   return parseArgs(asString);
+}
+
+/**
+ * Return the input only if it is not a blank or null string, otherwise returns undefined
+ * @param key input key
+ * @returns the value or undefined
+ */
+export function getOrUndefined(value: string): string | undefined {
+  return value !== "" ? value : undefined;
+}
+
+// get rid of inner spaces too
+export function getAsCleanedCommaSeparatedList(value: string): string[] | undefined {
+  // trim the value
+  const trimmed: string = value.trim();
+  return trimmed !== "" ? trimmed.replace(/\s/g, "").split(",") : undefined; 
+}
+
+// preserve inner spaces
+export function getAsCommaSeparatedList(value: string): string[] | undefined {
+  // trim the value
+  const trimmed: string = value.trim();
+  return trimmed !== "" ? trimmed.split(",").map(v => v.trim()) : undefined; 
+}
+
+export function getAsSemicolonSeparatedList(value: string): string[] | undefined {
+  // trim the value
+  const trimmed: string = value.trim();
+  return trimmed !== "" ? trimmed.split(";").map(v => v.trim()) : undefined; 
+}
+
+export function getAsBooleanOrDefault(value: string): boolean | undefined {
+  const trimmed = value.trim();
+  return trimmed !== "" ? trimmed.toLowerCase() === "true" : undefined;
 }

src/service/args/args.types.ts

@@ -1,8 +1,9 @@
 /**
- * Input arguments
+ * Tool's input arguments interface
  */
 export interface Args {
-  targetBranch: string,  // branch on the target repo where the change should be backported to
+  // NOTE: keep targetBranch as singular and of type string for backward compatibilities
+  targetBranch: string,  // comma separated list of branches on the target repo where the change should be backported to
   pullRequest: string, // url of the pull request to backport
   dryRun?: boolean, // if enabled do not push anything remotely
   auth?: string, // git service auth, like github token
@@ -12,8 +13,15 @@ export interface Args {
   title?: string, // backport pr title, default original pr title prefixed by target branch
   body?: string, // backport pr title, default original pr body prefixed by bodyPrefix
   bodyPrefix?: string, // backport pr body prefix, default `backport <original-pr-link>`
-  bpBranchName?: string, // backport pr branch name, default computed from commit
+  // NOTE: keep bpBranchName as singular and of type string for backward compatibilities
+  bpBranchName?: string, // comma separated list of backport pr branch names, default computed from commit and target branches
   reviewers?: string[], // backport pr reviewers
   assignees?: string[], // backport pr assignees
   inheritReviewers?: boolean, // if true and reviewers == [] then inherit reviewers from original pr
+  labels?: string[], // backport pr labels
+  inheritLabels?: boolean, // if true inherit labels from original pr
+  squash?: boolean, // if false use squashed/merged commit otherwise backport all commits as part of the pr
+  strategy?: string, // cherry-pick merge strategy
+  strategyOption?: string, // cherry-pick merge strategy option
+  comments?: string[], // additional comments to be posted
 }

src/service/args/cli/cli-args-parser.ts

@@ -2,13 +2,7 @@ import ArgsParser from "@bp/service/args/args-parser";
 import { Args } from "@bp/service/args/args.types";
 import { Command } from "commander";
 import { name, version, description } from "@bp/../package.json";
-import { readConfigFile } from "@bp/service/args/args-utils";
-
-function commaSeparatedList(value: string, _prev: unknown): string[] {
-  // remove all whitespaces
-  const cleanedValue: string = value.trim();
-  return cleanedValue !== "" ? cleanedValue.replace(/\s/g, "").split(",") : [];
-}
+import { getAsCleanedCommaSeparatedList, getAsCommaSeparatedList, getAsSemicolonSeparatedList, readConfigFile } from "@bp/service/args/args-utils";
 
 export default class CLIArgsParser extends ArgsParser {
 
@@ -16,21 +10,27 @@ export default class CLIArgsParser extends ArgsParser {
     return new Command(name)
       .version(version)
       .description(description)
-      .option("-tb, --target-branch <branch>", "branch where changes must be backported to.")
-      .option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/lampajr/backporting/pull/1.")
+      .option("-tb, --target-branch <branches>", "comma separated list of branches where changes must be backported to")
+      .option("-pr, --pull-request <pr-url>", "pull request url, e.g., https://github.com/kiegroup/git-backporting/pull/1")
       .option("-d, --dry-run", "if enabled the tool does not create any pull request nor push anything remotely")
-      .option("-a, --auth <auth>", "git service authentication string, e.g., github token.")
-      .option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'.")
-      .option("-ge, --git-email <git-email>", "local git user email, default is 'noreply@github.com'.")
-      .option("-f, --folder <folder>", "local folder where the repo will be checked out, e.g., /tmp/folder.")
-      .option("--title <bp-title>", "backport pr title, default original pr title prefixed by target branch.")
-      .option("--body <bp-body>", "backport pr title, default original pr body prefixed by bodyPrefix.")
-      .option("--body-prefix <bp-body-prefix>", "backport pr body prefix, default `backport <original-pr-link>`.")
-      .option("--bp-branch-name <bp-branch-name>", "backport pr branch name, default auto-generated by the commit.")
-      .option("--reviewers <reviewers>", "comma separated list of reviewers for the backporting pull request.", commaSeparatedList)
-      .option("--assignees <assignees>", "comma separated list of assignees for the backporting pull request.", commaSeparatedList)
+      .option("-a, --auth <auth>", "git authentication string, if not provided fallback by looking for existing env variables like GITHUB_TOKEN")
+      .option("-gu, --git-user <git-user>", "local git user name, default is 'GitHub'")
+      .option("-ge, --git-email <git-email>", "local git user email, default is 'noreply@github.com'")
+      .option("-f, --folder <folder>", "local folder where the repo will be checked out, e.g., /tmp/folder")
+      .option("--title <bp-title>", "backport pr title, default original pr title prefixed by target branch")
+      .option("--body <bp-body>", "backport pr title, default original pr body prefixed by bodyPrefix")
+      .option("--body-prefix <bp-body-prefix>", "backport pr body prefix, default `backport <original-pr-link>`")
+      .option("--bp-branch-name <bp-branch-names>", "comma separated list of backport pr branch names, default auto-generated by the commit and target branch")
+      .option("--reviewers <reviewers>", "comma separated list of reviewers for the backporting pull request", getAsCleanedCommaSeparatedList)
+      .option("--assignees <assignees>", "comma separated list of assignees for the backporting pull request", getAsCleanedCommaSeparatedList)
       .option("--no-inherit-reviewers", "if provided and reviewers option is empty then inherit them from original pull request")
-      .option("-cf, --config-file <config-file>", "configuration file containing all valid options, the json must match Args interface.");
+      .option("--labels <labels>", "comma separated list of labels to be assigned to the backported pull request", getAsCommaSeparatedList)
+      .option("--inherit-labels", "if true the backported pull request will inherit labels from the original one")
+      .option("--no-squash", "if provided the tool will backport all commits as part of the pull request")
+      .option("--strategy <strategy>", "cherry-pick merge strategy, default to 'recursive'", undefined)
+      .option("--strategy-option <strategy-option>", "cherry-pick merge strategy option, default to 'theirs'")
+      .option("--comments <comments>", "semicolon separated list of additional comments to be posted to the backported pull request", getAsSemicolonSeparatedList)
+      .option("-cf, --config-file <config-file>", "configuration file containing all valid options, the json must match Args interface");
   }
 
   readArgs(): Args {
@@ -58,6 +58,12 @@ export default class CLIArgsParser extends ArgsParser {
         reviewers: opts.reviewers,
         assignees: opts.assignees,
         inheritReviewers: opts.inheritReviewers,
+        labels: opts.labels,
+        inheritLabels: opts.inheritLabels,
+        squash: opts.squash,
+        strategy: opts.strategy,
+        strategyOption: opts.strategyOption,
+        comments: opts.comments,
       };
     }
 

src/service/args/gha/gha-args-parser.ts

@@ -1,53 +1,38 @@
 import ArgsParser from "@bp/service/args/args-parser";
 import { Args } from "@bp/service/args/args.types";
 import { getInput } from "@actions/core";
-import { readConfigFile } from "@bp/service/args/args-utils";
+import { getAsBooleanOrDefault, getAsCleanedCommaSeparatedList, getAsCommaSeparatedList, getAsSemicolonSeparatedList, getOrUndefined, readConfigFile } from "@bp/service/args/args-utils";
 
 export default class GHAArgsParser extends ArgsParser {
 
-  /**
-   * Return the input only if it is not a blank or null string, otherwise returns undefined
-   * @param key input key
-   * @returns the value or undefined
-   */
-  public getOrUndefined(key: string): string | undefined {
-    const value = getInput(key);
-    return value !== "" ? value : undefined;
-  }
-
-  public getAsCommaSeparatedList(key: string): string[] | undefined {
-    // trim the value
-    const value: string = (getInput(key) ?? "").trim();
-    return value !== "" ? value.replace(/\s/g, "").split(",") : undefined; 
-  }
-
-  private getAsBooleanOrDefault(key: string): boolean | undefined {
-    const value = getInput(key).trim();
-    return value !== "" ? value.toLowerCase() === "true" : undefined;
-  }
-
   readArgs(): Args {
-    const configFile = this.getOrUndefined("config-file");
+    const configFile = getOrUndefined(getInput("config-file"));
 
     let args: Args; 
     if (configFile) {
       args = readConfigFile(configFile);
     } else {
       args = {
-        dryRun: this.getAsBooleanOrDefault("dry-run"),
-        auth: this.getOrUndefined("auth"),
+        dryRun: getAsBooleanOrDefault(getInput("dry-run")),
+        auth: getOrUndefined(getInput("auth")),
         pullRequest: getInput("pull-request"),
         targetBranch: getInput("target-branch"),
-        folder: this.getOrUndefined("folder"),
-        gitUser: this.getOrUndefined("git-user"),
-        gitEmail: this.getOrUndefined("git-email"),
-        title: this.getOrUndefined("title"),
-        body: this.getOrUndefined("body"),
-        bodyPrefix: this.getOrUndefined("body-prefix"),
-        bpBranchName: this.getOrUndefined("bp-branch-name"),
-        reviewers: this.getAsCommaSeparatedList("reviewers"),
-        assignees: this.getAsCommaSeparatedList("assignees"),
-        inheritReviewers: !this.getAsBooleanOrDefault("no-inherit-reviewers"),
+        folder: getOrUndefined(getInput("folder")),
+        gitUser: getOrUndefined(getInput("git-user")),
+        gitEmail: getOrUndefined(getInput("git-email")),
+        title: getOrUndefined(getInput("title")),
+        body: getOrUndefined(getInput("body", { trimWhitespace: false })),
+        bodyPrefix: getOrUndefined(getInput("body-prefix", { trimWhitespace: false })),
+        bpBranchName: getOrUndefined(getInput("bp-branch-name")),
+        reviewers: getAsCleanedCommaSeparatedList(getInput("reviewers")),
+        assignees: getAsCleanedCommaSeparatedList(getInput("assignees")),
+        inheritReviewers: !getAsBooleanOrDefault(getInput("no-inherit-reviewers")),
+        labels: getAsCommaSeparatedList(getInput("labels")),
+        inheritLabels: getAsBooleanOrDefault(getInput("inherit-labels")),
+        squash: !getAsBooleanOrDefault(getInput("no-squash")),
+        strategy: getOrUndefined(getInput("strategy")),
+        strategyOption: getOrUndefined(getInput("strategy-option")),
+        comments: getAsSemicolonSeparatedList(getInput("comments")),
       };
     }
 

src/service/configs/configs-parser.ts

@@ -1,7 +1,8 @@
 import { Args } from "@bp/service/args/args.types";
-import { Configs } from "@bp/service/configs/configs.types";
+import { AuthTokenId, Configs } from "@bp/service/configs/configs.types";
 import LoggerService from "../logger/logger-service";
 import LoggerServiceFactory from "../logger/logger-service-factory";
+import { GitClientType } from "../git/git.types";
 
 /**
  * Abstract configuration parser class in charge to parse 
@@ -24,14 +25,52 @@ import LoggerServiceFactory from "../logger/logger-service-factory";
     
     // if pr is opened check if the there exists one single commit
     if (configs.originalPullRequest.state == "open") {
-      this.logger.warn("Trying to backport an open pull request!");
+      this.logger.warn("Trying to backport an open pull request");
     }
 
-    // if PR is closed and not merged log a warning
+    // if PR is closed and not merged throw an error
     if (configs.originalPullRequest.state == "closed" && !configs.originalPullRequest.merged) {
-      throw new Error("Provided pull request is closed and not merged!");
+      throw new Error("Provided pull request is closed and not merged");
     }
 
     return Promise.resolve(configs);
   }
+
+  /**
+   * Retrieve the git token from env variable, the default is taken from GIT_TOKEN env.
+   * All specific git env variable have precedence and override the default one.
+   * @param gitType 
+   * @returns tuple where 
+   *      - the first element is the corresponding env value
+   *      - the second element is true if the value is not undefined nor empty
+   */
+  public getGitTokenFromEnv(gitType: GitClientType): string | undefined {
+    let [token] = this.getEnv(AuthTokenId.GIT_TOKEN);
+    let [specToken, specOk]: [string | undefined, boolean] = [undefined, false];
+    if (GitClientType.GITHUB == gitType) {
+      [specToken, specOk] = this.getEnv(AuthTokenId.GITHUB_TOKEN);
+    } else if (GitClientType.GITLAB == gitType) {
+      [specToken, specOk] = this.getEnv(AuthTokenId.GITLAB_TOKEN);
+    } else if (GitClientType.CODEBERG == gitType) {
+      [specToken, specOk] = this.getEnv(AuthTokenId.CODEBERG_TOKEN);
+    }
+
+    if (specOk) {
+      token = specToken;
+    }
+
+    return token;
+  }
+
+  /**
+   * Get process env variable given the input key string
+   * @param key 
+   * @returns tuple where 
+   *      - the first element is the corresponding env value
+   *      - the second element is true if the value is not undefined nor empty
+   */
+  public getEnv(key: string): [string | undefined, boolean] {
+    const val = process.env[key];
+    return [val, val !== undefined && val !== ""];
+  }
 }

src/service/configs/configs.types.ts

@@ -1,6 +1,6 @@
 
 
-import { GitPullRequest } from "@bp/service/git/git.types";
+import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
 
 export interface LocalGit {
   user: string, // local git user
@@ -15,8 +15,19 @@ export interface Configs {
   auth?: string,
   git: LocalGit,
   folder: string,
-  targetBranch: string,
+  mergeStrategy?: string, // cherry-pick merge strategy
+  mergeStrategyOption?: string, // cherry-pick merge strategy option
   originalPullRequest: GitPullRequest,
-  backportPullRequest: GitPullRequest,
+  backportPullRequests: BackportPullRequest[],
  }
 
+export enum AuthTokenId {
+  // github specific token
+  GITHUB_TOKEN = "GITHUB_TOKEN",
+  // gitlab specific token
+  GITLAB_TOKEN = "GITLAB_TOKEN",
+  // codeberg specific token
+  CODEBERG_TOKEN = "CODEBERG_TOKEN",
+  // generic git token
+  GIT_TOKEN = "GIT_TOKEN",
+}

src/service/configs/pullrequest/pr-configs-parser.ts

@@ -1,9 +1,10 @@
+import { getAsCleanedCommaSeparatedList, getAsCommaSeparatedList } from "@bp/service/args/args-utils";
 import { Args } from "@bp/service/args/args.types";
 import ConfigsParser from "@bp/service/configs/configs-parser";
 import { Configs } from "@bp/service/configs/configs.types";
 import GitClient from "@bp/service/git/git-client";
 import GitClientFactory from "@bp/service/git/git-client-factory";
-import { GitPullRequest } from "@bp/service/git/git.types";
+import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
 
 export default class PullRequestConfigsParser extends ConfigsParser {
 
@@ -17,7 +18,7 @@ export default class PullRequestConfigsParser extends ConfigsParser {
   public async parse(args: Args): Promise<Configs> {
     let pr: GitPullRequest; 
     try {
-      pr = await this.gitClient.getPullRequestFromUrl(args.pullRequest);
+      pr = await this.gitClient.getPullRequestFromUrl(args.pullRequest, args.squash!);
     } catch(error) {
       this.logger.error("Something went wrong retrieving pull request");
       throw error;
@@ -25,13 +26,31 @@ export default class PullRequestConfigsParser extends ConfigsParser {
 
     const folder: string = args.folder ?? this.getDefaultFolder();
 
+    const targetBranches: string[] = [...new Set(getAsCommaSeparatedList(args.targetBranch)!)];
+    const bpBranchNames: string[] = [...new Set(args.bpBranchName ? (getAsCleanedCommaSeparatedList(args.bpBranchName) ?? []) : [])];
+
+    if (bpBranchNames.length > 1 && bpBranchNames.length != targetBranches.length) {
+      throw new Error(`The number of backport branch names, if provided, must match the number of target branches or just one, provided ${bpBranchNames.length} branch names instead`);
+    }
+
+    // setup the auth token
+    let token = args.auth;
+    if (token === undefined) {
+      this.logger.info("Auth argument not provided, checking available tokens from env..");
+      token = this.getGitTokenFromEnv(this.gitClient.getClientType());
+      if (!token) {
+        this.logger.info("Git token not set in the env");
+      }
+    }
+
     return {
       dryRun: args.dryRun!,
-      auth: args.auth,
+      auth: token,
       folder: `${folder.startsWith("/") ? "" : process.cwd() + "/"}${args.folder ?? this.getDefaultFolder()}`,
-      targetBranch: args.targetBranch,
+      mergeStrategy: args.strategy,
+      mergeStrategyOption: args.strategyOption,
       originalPullRequest: pr,
-      backportPullRequest: this.getDefaultBackportPullRequest(pr, args),
+      backportPullRequests: this.generateBackportPullRequestsData(pr, args, targetBranches, bpBranchNames),
       git: {
         user: args.gitUser ?? this.gitClient.getDefaultGitUser(),
         email: args.gitEmail ?? this.gitClient.getDefaultGitEmail(),
@@ -50,7 +69,13 @@ export default class PullRequestConfigsParser extends ConfigsParser {
    * @param targetBranch target branch where the backport should be applied
    * @returns {GitPullRequest}
    */
-  private getDefaultBackportPullRequest(originalPullRequest: GitPullRequest, args: Args): GitPullRequest {
+  private generateBackportPullRequestsData(
+    originalPullRequest: GitPullRequest, 
+    args: Args, 
+    targetBranches: string[], 
+    bpBranchNames: string[]
+  ): BackportPullRequest[] {
+
     const reviewers = args.reviewers ?? [];
     if (reviewers.length == 0 && args.inheritReviewers) {
       // inherit only if args.reviewers is empty and args.inheritReviewers set to true
@@ -61,17 +86,45 @@ export default class PullRequestConfigsParser extends ConfigsParser {
     }
 
     const bodyPrefix = args.bodyPrefix ?? `**Backport:** ${originalPullRequest.htmlUrl}\r\n\r\n`;
-    const body = args.body ?? `${originalPullRequest.body}`;
+    const body = bodyPrefix + (args.body ?? `${originalPullRequest.body}`);
     
-    return {
-      author: args.gitUser ?? this.gitClient.getDefaultGitUser(),
-      title: args.title ?? `[${args.targetBranch}] ${originalPullRequest.title}`, 
-      body: `${bodyPrefix}${body}`,
-      reviewers: [...new Set(reviewers)],
-      assignees: [...new Set(args.assignees)],
-      targetRepo: originalPullRequest.targetRepo,
-      sourceRepo: originalPullRequest.targetRepo,
-      branchName: args.bpBranchName,
-    };
+    const labels = args.labels ?? [];
+    if (args.inheritLabels) {
+      labels.push(...originalPullRequest.labels);
+    }
+
+    return targetBranches.map((tb, idx) => {
+
+      // if there multiple branch names take the corresponding one, otherwise get the the first one if it exists
+      let backportBranch = bpBranchNames.length > 1 ? bpBranchNames[idx] : bpBranchNames[0];
+      if (backportBranch === undefined || backportBranch.trim() === "") {
+        // for each commit takes the first 7 chars that are enough to uniquely identify them in most of the projects
+        const concatenatedCommits: string = originalPullRequest.commits!.map(c => c.slice(0, 7)).join("-");
+        backportBranch = `bp-${tb}-${concatenatedCommits}`;
+      } else if (bpBranchNames.length == 1 && targetBranches.length > 1) {
+        // multiple targets and single custom backport branch name we need to differentiate branch names
+        // so append "-${tb}" to the provided name
+        backportBranch = backportBranch + `-${tb}`;
+      }
+  
+      if (backportBranch.length > 250) {
+        this.logger.warn(`Backport branch (length=${backportBranch.length}) exceeded the max length of 250 chars, branch name truncated!`);
+        backportBranch = backportBranch.slice(0, 250);
+      }
+
+      return {
+        owner: originalPullRequest.targetRepo.owner,
+        repo: originalPullRequest.targetRepo.project,
+        head: backportBranch,
+        base: tb,
+        title: args.title ?? `[${tb}] ${originalPullRequest.title}`,
+        // preserve new line chars
+        body: body.replace(/\\n/g, "\n").replace(/\\r/g, "\r"),
+        reviewers: [...new Set(reviewers)],
+        assignees: [...new Set(args.assignees)],
+        labels: [...new Set(labels)],
+        comments: args.comments?.map(c => c.replace(/\\n/g, "\n").replace(/\\r/g, "\r")) ?? [],
+      };
+    }) as BackportPullRequest[];
   }
 }

src/service/git/git-cli.ts

@@ -32,7 +32,7 @@ export default class GitCLIService {
 
   /**
    * Update the provided remote URL by adding the auth token if not empty
-   * @param remoteURL remote link, e.g., https://github.com/lampajr/backporting-example.git
+   * @param remoteURL remote link, e.g., https://github.com/kiegroup/git-backporting-example.git
    */
   private remoteWithAuth(remoteURL: string): string {
     if (this.auth && this.gitData.user) {
@@ -60,12 +60,16 @@ export default class GitCLIService {
    * @param branch branch which should be cloned
    */
   async clone(from: string, to: string, branch: string): Promise<void> {
-    this.logger.info(`Cloning repository ${from} to ${to}.`);
+    this.logger.info(`Cloning repository ${from} to ${to}`);
     if (!fs.existsSync(to)) {
       await simpleGit().clone(this.remoteWithAuth(from), to, ["--quiet", "--shallow-submodules", "--no-tags", "--branch", branch]);
-    } else {
-      this.logger.warn(`Folder ${to} already exist. Won't clone`);
+      return;
     }
+    
+    this.logger.info(`Folder ${to} already exist. Won't clone`);
+    // checkout to the proper branch
+    this.logger.info(`Checking out branch ${branch}`);
+    await this.git(to).checkout(branch);
   }
 
   /**
@@ -74,7 +78,7 @@ export default class GitCLIService {
    * @param newBranch new branch name
    */
   async createLocalBranch(cwd: string, newBranch: string): Promise<void> {
-    this.logger.info(`Creating branch ${newBranch}.`);
+    this.logger.info(`Creating branch ${newBranch}`);
     await this.git(cwd).checkoutLocalBranch(newBranch);
   }
 
@@ -85,7 +89,7 @@ export default class GitCLIService {
    * @param remoteName [optional] name of the remote, by default 'fork' is used 
    */
   async addRemote(cwd: string, remote: string, remoteName = "fork"): Promise<void> {
-    this.logger.info(`Adding new remote ${remote}.`);
+    this.logger.info(`Adding new remote ${remote}`);
     await this.git(cwd).addRemote(remoteName, this.remoteWithAuth(remote));
   }
 
@@ -96,7 +100,7 @@ export default class GitCLIService {
    * @param remote [optional] the remote to fetch, by default origin
    */
   async fetch(cwd: string, branch: string, remote = "origin"): Promise<void> {
-    this.logger.info(`Fetching ${remote} ${branch}.`);
+    this.logger.info(`Fetching ${remote} ${branch}`);
     await this.git(cwd).fetch(remote, branch, ["--quiet"]);
   }
 
@@ -105,9 +109,20 @@ export default class GitCLIService {
    * @param cwd repository in which the sha should be cherry picked to
    * @param sha commit sha
    */
-  async cherryPick(cwd: string, sha: string): Promise<void> {
-    this.logger.info(`Cherry picking ${sha}.`);
-    await this.git(cwd).raw(["cherry-pick", "-m", "1", "--strategy=recursive", "--strategy-option=theirs", sha]);
+  async cherryPick(cwd: string, sha: string, strategy = "recursive", strategyOption = "theirs"): Promise<void> {
+    this.logger.info(`Cherry picking ${sha}`);
+    
+    const options = ["cherry-pick", "-m", "1", `--strategy=${strategy}`, `--strategy-option=${strategyOption}`, sha];
+    try {
+      await this.git(cwd).raw(options);
+    } catch(error) {
+      const diff = await this.git(cwd).diff();
+      if (diff) {
+        throw new Error(`${error}\r\nShowing git diff:\r\n` + diff);
+      }
+
+      throw error;
+    }
   }
 
   /**
@@ -117,7 +132,7 @@ export default class GitCLIService {
    * @param remote [optional] remote to which the branch should be pushed to, by default 'origin'
    */
   async push(cwd: string, branch: string, remote = "origin", force = false): Promise<void> {
-    this.logger.info(`Pushing ${branch} to ${remote}.`);
+    this.logger.info(`Pushing ${branch} to ${remote}`);
     
     const options = ["--quiet"];
     if (force) {

src/service/git/git-client-factory.ts

@@ -13,9 +13,10 @@ export default class GitClientFactory {
   private static logger: LoggerService = LoggerServiceFactory.getLogger();
   private static instance?: GitClient;
 
+  // this method assumes there already exists a singleton client instance, otherwise it will fail
   public static getClient(): GitClient {
     if (!GitClientFactory.instance) {
-      throw new Error("You must call `getOrCreate` method first!");
+      throw new Error("You must call `getOrCreate` method first");
     }
 
     return GitClientFactory.instance;
@@ -29,7 +30,7 @@ export default class GitClientFactory {
   public static getOrCreate(type: GitClientType, authToken: string | undefined, apiUrl: string): GitClient {
 
     if (GitClientFactory.instance) {
-      GitClientFactory.logger.warn("Git service already initialized!");
+      GitClientFactory.logger.warn("Git service already initialized");
       return GitClientFactory.instance;
     }
 
@@ -42,6 +43,9 @@ export default class GitClientFactory {
       case GitClientType.GITLAB:
         GitClientFactory.instance = new GitLabClient(authToken, apiUrl);
         break;
+      case GitClientType.CODEBERG:
+        GitClientFactory.instance = new GitHubService(authToken, apiUrl, true);
+        break;
       default:
         throw new Error(`Invalid git service type received: ${type}`);
     }
@@ -49,8 +53,9 @@ export default class GitClientFactory {
     return GitClientFactory.instance;
   }
 
+  // this is used for testing purposes
   public static reset(): void {
-    GitClientFactory.logger.warn("Resetting git service!");
+    GitClientFactory.logger.warn("Resetting git service");
     GitClientFactory.instance = undefined;
   }
 }

src/service/git/git-client.ts

@@ -1,4 +1,4 @@
-import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
+import { BackportPullRequest, GitClientType, GitPullRequest } from "@bp/service/git/git.types";
 
 /**
  * Git management service interface, which provides a common API for interacting 
@@ -6,6 +6,11 @@ import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
  */
  export default interface GitClient {
 
+  /**
+   * @returns {GitClientType} specific git client enum type
+   */
+  getClientType(): GitClientType
+
   // READ
   
   getDefaultGitUser(): string;
@@ -17,16 +22,18 @@ import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
    * @param owner repository's owner
    * @param repo repository's name
    * @param prNumber pull request number
+   * @param squash if true keep just one single commit, otherwise get the full list
    * @returns {Promise<PullRequest>}
    */
-  getPullRequest(owner: string, repo: string, prNumber: number): Promise<GitPullRequest>;
+  getPullRequest(owner: string, repo: string, prNumber: number, squash: boolean): Promise<GitPullRequest>;
 
   /**
    * Get a pull request object from the underneath git service
    * @param prUrl pull request html url
+   * @param squash if true keep just one single commit, otherwise get the full list
    * @returns {Promise<PullRequest>}
    */
-   getPullRequestFromUrl(prUrl: string): Promise<GitPullRequest>;
+   getPullRequestFromUrl(prUrl: string, squash: boolean): Promise<GitPullRequest>;
 
   // WRITE
 
@@ -36,4 +43,5 @@ import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
    * @returns {Promise<string>} the pull request url
    */
   createPullRequest(backport: BackportPullRequest): Promise<string>;
+
 }

src/service/git/git-mapper.ts

@@ -10,6 +10,7 @@ export default interface GitResponseMapper<PR, S> {
 
   mapPullRequest(
     pr: PR,
+    commits?: string[],
   ): Promise<GitPullRequest>;
 
   mapGitState(state: S): GitRepoState;

src/service/git/git-util.ts

@@ -16,6 +16,8 @@ export const inferGitClient = (prUrl: string): GitClientType => {
     return GitClientType.GITHUB;
   } else if (stdPrUrl.includes(GitClientType.GITLAB.toString())) {
     return GitClientType.GITLAB;
+  } else if (stdPrUrl.includes(GitClientType.CODEBERG.toString())) {
+    return GitClientType.CODEBERG;
   }
 
   throw new Error(`Remote git service not recognized from pr url: ${prUrl}`);
@@ -31,7 +33,7 @@ export const inferGitApiUrl = (prUrl: string, apiVersion = "v4"): string => {
   const url = new URL(prUrl);
   const baseUrl = `${url.protocol}//${url.host}`;
   
-  if (baseUrl.includes(PUBLIC_GITHUB_URL)) {
+  if (baseUrl.includes(PUBLIC_GITHUB_URL) || baseUrl.includes(PUBLIC_GITHUB_API)) {
     return PUBLIC_GITHUB_API;
   }
 

src/service/git/git.types.ts

@@ -10,10 +10,11 @@ export interface GitPullRequest {
   body: string,
   reviewers: string[],
   assignees: string[],
+  labels: string[],
   targetRepo: GitRepository,
   sourceRepo: GitRepository,
-  nCommits?: number, // number of commits in the pr
-  commits?: string[], // merge commit or last one
+  nCommits: number, // number of commits in the pr
+  commits: string[], // merge commit or last one
   branchName?: string,
 }
 
@@ -32,12 +33,15 @@ export interface BackportPullRequest {
   body: string, // pr body
   reviewers: string[], // pr list of reviewers
   assignees: string[], // pr list of assignees
-  branchName?: string,
+  labels: string[], // pr list of assigned labels
+  comments: string[], // pr list of additional comments
+  // branchName?: string,
 }
 
 export enum GitClientType {
   GITHUB = "github",
   GITLAB = "gitlab",
+  CODEBERG = "codeberg",
 }
 
 export enum GitRepoState {

src/service/git/github/github-client.ts

@@ -1,5 +1,5 @@
 import GitClient from "@bp/service/git/git-client";
-import { BackportPullRequest, GitPullRequest } from "@bp/service/git/git.types";
+import { BackportPullRequest, GitClientType, GitPullRequest } from "@bp/service/git/git.types";
 import GitHubMapper from "@bp/service/git/github/github-mapper";
 import OctokitFactory from "@bp/service/git/github/octokit-factory";
 import LoggerService from "@bp/service/logger/logger-service";
@@ -11,46 +11,68 @@ export default class GitHubClient implements GitClient {
   
   private logger: LoggerService;
   private apiUrl: string;
+  private isForCodeberg: boolean;
   private octokit: Octokit;
   private mapper: GitHubMapper;
 
-  constructor(token: string | undefined, apiUrl: string) {
+  constructor(token: string | undefined, apiUrl: string, isForCodeberg = false) {
     this.apiUrl = apiUrl;
+    this.isForCodeberg = isForCodeberg;
     this.logger = LoggerServiceFactory.getLogger();
     this.octokit = OctokitFactory.getOctokit(token, this.apiUrl);
     this.mapper = new GitHubMapper();
   }
 
+  getClientType(): GitClientType {
+    return this.isForCodeberg ? GitClientType.CODEBERG : GitClientType.GITHUB;
+  }
+
   // READ
 
   getDefaultGitUser(): string {
-    return "GitHub";
+    return this.apiUrl.includes(GitClientType.CODEBERG.toString()) ? "Codeberg" : "GitHub";
   }
   
   getDefaultGitEmail(): string {
     return "noreply@github.com";
   }
 
-  async getPullRequest(owner: string, repo: string, prNumber: number): Promise<GitPullRequest> {
-    this.logger.info(`Getting pull request ${owner}/${repo}/${prNumber}.`);
+  async getPullRequest(owner: string, repo: string, prNumber: number, squash = true): Promise<GitPullRequest> {
+    this.logger.debug(`Fetching pull request ${owner}/${repo}/${prNumber}`);
     const { data } = await this.octokit.rest.pulls.get({
       owner: owner,
       repo: repo,
-      pull_number: prNumber
+      pull_number: prNumber,
     });
 
-    return this.mapper.mapPullRequest(data as PullRequest);
+    const commits: string[] = [];
+    if (!squash) {
+      // fetch all commits
+      try {
+        const { data } = await this.octokit.rest.pulls.listCommits({
+          owner: owner,
+          repo: repo,
+          pull_number: prNumber,
+        });
+
+        commits.push(...data.map(c => c.sha));
+      } catch(error) {
+        throw new Error(`Failed to retrieve commits for pull request n. ${prNumber}`);
+      }
+    }
+
+    return this.mapper.mapPullRequest(data as PullRequest, commits);
   }
 
-  async getPullRequestFromUrl(prUrl: string): Promise<GitPullRequest> {
+  async getPullRequestFromUrl(prUrl: string, squash = true): Promise<GitPullRequest> {
     const { owner, project, id } = this.extractPullRequestData(prUrl);
-    return this.getPullRequest(owner, project, id);
+    return this.getPullRequest(owner, project, id, squash);
   }
 
   // WRITE
   
   async createPullRequest(backport: BackportPullRequest): Promise<string> {
-    this.logger.info(`Creating pull request ${backport.head} -> ${backport.base}.`);
+    this.logger.info(`Creating pull request ${backport.head} -> ${backport.base}`);
     this.logger.info(`${JSON.stringify(backport, null, 2)}`);
 
     const { data } = await this.octokit.pulls.create({
@@ -59,39 +81,63 @@ export default class GitHubClient implements GitClient {
       head: backport.head,
       base: backport.base,
       title: backport.title,
-      body: backport.body
+      body: backport.body,
     });
 
     if (!data) {
       throw new Error("Pull request creation failed");
     }
 
+    const promises = [];
+
+    if (backport.labels.length > 0) {
+      promises.push(
+        this.octokit.issues.addLabels({
+          owner: backport.owner,
+          repo: backport.repo,
+          issue_number: (data as PullRequest).number,
+          labels: backport.labels,
+        }).catch(error => this.logger.error(`Error setting labels: ${error}`))
+      );
+    }
+
     if (backport.reviewers.length > 0) {
-      try {
-        await this.octokit.pulls.requestReviewers({
+      promises.push(
+        this.octokit.pulls.requestReviewers({
           owner: backport.owner,
           repo: backport.repo,
           pull_number: (data as PullRequest).number,
           reviewers: backport.reviewers,
-        });
-      } catch (error) {
-        this.logger.error(`Error requesting reviewers: ${error}`);
-      }
+        }).catch(error => this.logger.error(`Error requesting reviewers: ${error}`))
+      );
     }
 
     if (backport.assignees.length > 0) {
-      try {
-        await this.octokit.issues.addAssignees({
+      promises.push(
+        this.octokit.issues.addAssignees({
           owner: backport.owner,
           repo: backport.repo,
           issue_number: (data as PullRequest).number,
           assignees: backport.assignees,
-        });
-      } catch (error) {
-        this.logger.error(`Error setting assignees: ${error}`);
-      }
+        }).catch(error => this.logger.error(`Error setting assignees: ${error}`))
+      );
     }
 
+    if (backport.comments.length > 0) {
+      backport.comments.forEach(c => {
+        promises.push(
+          this.octokit.issues.createComment({
+            owner: backport.owner,
+            repo: backport.repo,
+            issue_number: (data as PullRequest).number,
+            body: c,
+          }).catch(error => this.logger.error(`Error posting comment: ${error}`))
+        );
+      });
+    }
+
+    await Promise.all(promises);
+
     return data.html_url;
   }
 

src/service/git/github/github-mapper.ts

@@ -13,7 +13,7 @@ export default class GitHubMapper implements GitResponseMapper<PullRequest, "ope
     }
   }
 
-  async mapPullRequest(pr: PullRequest): Promise<GitPullRequest> {
+  async mapPullRequest(pr: PullRequest, commits?: string[]): Promise<GitPullRequest> {
     return {
       number: pr.number,
       author: pr.user.login,
@@ -24,16 +24,22 @@ export default class GitHubMapper implements GitResponseMapper<PullRequest, "ope
       state: this.mapGitState(pr.state), // TODO fix using custom mapper
       merged: pr.merged ?? false,
       mergedBy: pr.merged_by?.login,
-      reviewers: pr.requested_reviewers.filter(r => "login" in r).map((r => (r as User)?.login)),
-      assignees: pr.assignees.filter(r => "login" in r).map(r => r.login),
+      reviewers: pr.requested_reviewers?.filter(r => "login" in r).map((r => (r as User)?.login)) ?? [],
+      assignees: pr.assignees?.filter(r => "login" in r).map(r => r.login) ?? [],
+      labels: pr.labels?.map(l => l.name) ?? [],
       sourceRepo: await this.mapSourceRepo(pr),
       targetRepo: await this.mapTargetRepo(pr),
       nCommits: pr.commits,
-      // if pr is open use latest commit sha otherwise use merge_commit_sha
-      commits: pr.state === "open" ? [pr.head.sha] : [pr.merge_commit_sha as string]
+      // if commits is provided use them, otherwise fetch the single sha representing the whole pr
+      commits: (commits && commits.length > 0) ? commits : this.getSha(pr),
     };
   }
 
+  private getSha(pr: PullRequest) {
+    // if pr is open use latest commit sha otherwise use merge_commit_sha
+    return pr.state === "open" ? [pr.head.sha] : [pr.merge_commit_sha as string];
+  }
+
   async mapSourceRepo(pr: PullRequest): Promise<GitRepository> {
     return Promise.resolve({
       owner: pr.head.repo.full_name.split("/")[0],

src/service/git/github/octokit-factory.ts

@@ -12,10 +12,9 @@ export default class OctokitFactory {
 
   public static getOctokit(token: string | undefined, apiUrl: string): Octokit {
     if (!OctokitFactory.octokit) {
-      OctokitFactory.logger.info("Creating octokit instance.");
       OctokitFactory.octokit = new Octokit({
         auth: token,
-        userAgent: "lampajr/backporting",
+        userAgent: "kiegroup/git-backporting",
         baseUrl: apiUrl
       });
     }

src/service/git/gitlab/gitlab-client.ts

@@ -1,8 +1,8 @@
 import LoggerService from "@bp/service/logger/logger-service";
 import GitClient from "@bp/service/git/git-client";
-import { GitPullRequest, BackportPullRequest } from "@bp/service/git/git.types";
+import { GitPullRequest, BackportPullRequest, GitClientType } from "@bp/service/git/git.types";
 import LoggerServiceFactory from "@bp/service/logger/logger-service-factory";
-import { MergeRequestSchema, UserSchema } from "@gitbeaker/rest";
+import { CommitSchema, MergeRequestSchema, UserSchema } from "@gitbeaker/rest";
 import GitLabMapper from "@bp/service/git/gitlab/gitlab-mapper";
 import axios, { Axios } from "axios";
 import https from "https";
@@ -21,7 +21,7 @@ export default class GitLabClient implements GitClient {
       baseURL: this.apiUrl,
       headers: {
         Authorization: token ? `Bearer ${token}` : "",
-        "User-Agent": "lampajr/backporting",
+        "User-Agent": "kiegroup/git-backporting",
       },
       httpsAgent: new https.Agent({  
         rejectUnauthorized
@@ -30,6 +30,10 @@ export default class GitLabClient implements GitClient {
     this.mapper = new GitLabMapper(this.client);
   }
 
+  getClientType(): GitClientType {
+    return GitClientType.GITLAB;
+  }
+
   getDefaultGitUser(): string {
     return "Gitlab";
   }
@@ -40,23 +44,36 @@ export default class GitLabClient implements GitClient {
 
   // READ
 
-  // example: <host>/api/v4/projects/alampare%2Fbackporting-example/merge_requests/1
-  async getPullRequest(namespace: string, repo: string, mrNumber: number): Promise<GitPullRequest> {
+  // example: <host>/api/v4/projects/<namespace>%2Fbackporting-example/merge_requests/1
+  async getPullRequest(namespace: string, repo: string, mrNumber: number, squash = true): Promise<GitPullRequest> {
     const projectId = this.getProjectId(namespace, repo);
     const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`);
 
-    return this.mapper.mapPullRequest(data as MergeRequestSchema);
+    const commits: string[] = [];
+    if (!squash) {
+      // fetch all commits
+      try {
+        const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}/commits`);
+
+        // gitlab returns them in reverse order
+        commits.push(...(data as CommitSchema[]).map(c => c.id).reverse());
+      } catch(error) {
+        throw new Error(`Failed to retrieve commits for merge request n. ${mrNumber}`);
+      }
+    }
+
+    return this.mapper.mapPullRequest(data as MergeRequestSchema, commits);
   }
 
-  getPullRequestFromUrl(mrUrl: string): Promise<GitPullRequest> {
+  getPullRequestFromUrl(mrUrl: string, squash = true): Promise<GitPullRequest> {
     const { namespace, project, id } = this.extractMergeRequestData(mrUrl);
-    return this.getPullRequest(namespace, project, id);
+    return this.getPullRequest(namespace, project, id, squash);
   }
   
   // WRITE
   
   async createPullRequest(backport: BackportPullRequest): Promise<string> {
-    this.logger.info(`Creating pull request ${backport.head} -> ${backport.base}.`);
+    this.logger.info(`Creating pull request ${backport.head} -> ${backport.base}`);
     this.logger.info(`${JSON.stringify(backport, null, 2)}`);
 
     const projectId = this.getProjectId(backport.owner, backport.repo);
@@ -71,57 +88,75 @@ export default class GitLabClient implements GitClient {
     });
     
     const mr = data as MergeRequestSchema;
+    const promises = [];
 
-    // reviewers
-    const reviewerIds: number[] = [];
-    for(const r of backport.reviewers) {
-      try {
-        this.logger.debug("Retrieving user: " + r);
-        const user = await this.getUser(r);
-        reviewerIds.push(user.id);
-      } catch(error) {
-        this.logger.warn(`Failed to retrieve reviewer ${r}`);
-      }
+    // labels
+    if (backport.labels.length > 0) {
+      this.logger.info("Setting labels: " + backport.labels);
+      promises.push(
+        this.client.put(`/projects/${projectId}/merge_requests/${mr.iid}`, {
+          labels: backport.labels.join(","),
+        }).catch(error => this.logger.warn("Failure trying to update labels. " + error))
+      );
     }
 
+    // comments
+    if (backport.comments.length > 0) {
+      this.logger.info("Posting comments: " + backport.comments);
+      backport.comments.forEach(c => {
+        promises.push(
+          this.client.post(`/projects/${projectId}/merge_requests/${mr.iid}/notes`, {
+            body: c,
+          }).catch(error => this.logger.warn("Failure trying to post comment. " + error))
+        );
+      });
+    }
+
+    // reviewers
+    const reviewerIds = await Promise.all(backport.reviewers.map(async r => {
+      this.logger.debug("Retrieving user: " + r);
+      return this.getUser(r).then(user => user.id).catch(
+        () => {
+          this.logger.warn(`Failed to retrieve reviewer ${r}`);
+          return undefined;
+        }
+      );
+    }));
+
     if (reviewerIds.length > 0) {
-      try {
-        this.logger.info("Setting reviewers: " + reviewerIds);
-        await this.client.put(`/projects/${projectId}/merge_requests/${mr.iid}`, {
+      this.logger.info("Setting reviewers: " + reviewerIds);
+      promises.push(
+        this.client.put(`/projects/${projectId}/merge_requests/${mr.iid}`, {
           reviewer_ids: reviewerIds.filter(r => r !== undefined),
-        });
-      } catch(error) {
-        this.logger.warn("Failure trying to update reviewers. " + error);
-      }
+        }).catch(error => this.logger.warn("Failure trying to update reviewers. " + error))
+      );
     }
 
     // assignees
-    const assigneeIds: number[] = [];
-    for(const a of backport.assignees) {
-      try {
-        this.logger.debug("Retrieving user: " + a);
-        const user = await this.getUser(a);
-        assigneeIds.push(user.id);
-      } catch(error) {
-        this.logger.warn(`Failed to retrieve assignee ${a}`);
-      }
-    }
+    const assigneeIds = await Promise.all(backport.assignees.map(async a => {
+      this.logger.debug("Retrieving user: " + a);
+      return this.getUser(a).then(user => user.id).catch(
+        () => {
+          this.logger.warn(`Failed to retrieve assignee ${a}`);
+          return undefined;
+        }
+      );
+    }));
     
     if (assigneeIds.length > 0) {
-      try {
-        this.logger.info("Setting assignees: " + assigneeIds);
-        await this.client.put(`/projects/${projectId}/merge_requests/${mr.iid}`, {
+      this.logger.info("Setting assignees: " + assigneeIds);
+      promises.push(
+        this.client.put(`/projects/${projectId}/merge_requests/${mr.iid}`, {
           assignee_ids: assigneeIds.filter(a => a !== undefined),
-        });
-      } catch(error) {
-        this.logger.warn("Failure trying to update assignees. " + error);
-      }
+        }).catch(error => this.logger.warn("Failure trying to update assignees. " + error))
+      );
     }
 
+    await Promise.all(promises);
+
     return mr.web_url;
   }
 
-
   /**
    * Retrieve a gitlab user given its username
    * @param username 
@@ -144,15 +179,24 @@ export default class GitLabClient implements GitClient {
 
   /**
    * Extract repository namespace, project and mr number from the merge request url
-   * example: <host>/alampare/backporting-example/-/merge_requests/1
+   * example: <host>/<namespace>/backporting-example/-/merge_requests/1
    * note: "-/" could be omitted
    * @param mrUrl merge request url
    * @returns {{owner: string, project: string}}
    */
   private extractMergeRequestData(mrUrl: string): {namespace: string, project: string, id: number} {
-    const elems: string[] = mrUrl.replace("/-/", "/").split("/");
+    const { pathname } = new URL(mrUrl);
+    const elems: string[] = pathname.substring(1).replace("/-/", "/").split("/");
+    let namespace = "";
+
+    for (let i = 0; i < elems.length - 3; i++) {
+      namespace += elems[i] + "/";
+    }
+
+    namespace = namespace.substring(0, namespace.length - 1);
+
     return {
-      namespace: elems[elems.length - 4],
+      namespace: namespace,
       project: elems[elems.length - 3],
       id: parseInt(mrUrl.substring(mrUrl.lastIndexOf("/") + 1, mrUrl.length)),
     };

src/service/git/gitlab/gitlab-mapper.ts

@@ -24,8 +24,7 @@ export default class GitLabMapper implements GitResponseMapper<MergeRequestSchem
     }
   }
   
-  async mapPullRequest(mr: MergeRequestSchema): Promise<GitPullRequest> {
-    // throw new Error("Method not implemented.");
+  async mapPullRequest(mr: MergeRequestSchema, commits?: string[]): Promise<GitPullRequest> {
     return {
       number: mr.iid,
       author: mr.author.username,
@@ -38,14 +37,20 @@ export default class GitLabMapper implements GitResponseMapper<MergeRequestSchem
       mergedBy: mr.merged_by?.username,
       reviewers: mr.reviewers?.map((r => r.username)) ?? [],
       assignees: mr.assignees?.map((r => r.username)) ?? [],
+      labels: mr.labels ?? [],
       sourceRepo: await this.mapSourceRepo(mr),
       targetRepo: await this.mapTargetRepo(mr),
-      nCommits: 1, // info not present on mr
-      // if mr is merged, use merge_commit_sha otherwise use sha
-      // what is the difference between sha and diff_refs.head_sha?
-      commits: this.isMerged(mr) ? [mr.squash_commit_sha ? mr.squash_commit_sha : mr.merge_commit_sha as string] : [mr.sha]
+      // if commits list is provided use that as source
+      nCommits: (commits && commits.length > 1) ? commits.length : 1,
+      commits: (commits && commits.length > 1) ? commits : this.getSha(mr)
     };
   }
+  
+  private getSha(mr: MergeRequestSchema) {
+    // if mr is merged, use merge_commit_sha otherwise use sha
+    // what is the difference between sha and diff_refs.head_sha?
+    return this.isMerged(mr) ? [mr.squash_commit_sha ? mr.squash_commit_sha : mr.merge_commit_sha as string] : [mr.sha];
+  }
 
   async mapSourceRepo(mr: MergeRequestSchema): Promise<GitRepository> {
     const project: ProjectSchema = await this.getProject(mr.source_project_id);

src/service/logger/console-logger-service.ts

@@ -5,32 +5,44 @@ export default class ConsoleLoggerService implements LoggerService {
 
   private readonly logger: Logger;
   private readonly verbose: boolean;
+  private context?: string;
 
   constructor(verbose = true) {
     this.logger = new Logger();
     this.verbose = verbose;
   }
+
+  setContext(newContext: string) {
+    this.context = newContext;
+  }
+
+  clearContext() {
+    this.context = undefined;
+  }
   
   trace(message: string): void {
-    this.logger.log("[TRACE]", message);
+    this.logger.log("TRACE", this.fromContext(message));
   }
   
   debug(message: string): void {
     if (this.verbose) {
-      this.logger.log("[DEBUG]", message);
+      this.logger.log("DEBUG", this.fromContext(message));
     }
   }
   
   info(message: string): void {
-    this.logger.log("[INFO]", message);
+    this.logger.log("INFO", this.fromContext(message));
   }
   
   warn(message: string): void {
-    this.logger.log("[WARN]", message);
+    this.logger.log("WARN", this.fromContext(message));
   }
   
   error(message: string): void {
-    this.logger.log("[ERROR]", message);
+    this.logger.log("ERROR", this.fromContext(message));
   }
 
+  private fromContext(msg: string): string {
+    return this.context ? `[${this.context}] ${msg}` : msg;
+  }
 }

src/service/logger/logger-service.ts

@@ -3,6 +3,10 @@
  */
 export default interface LoggerService {
 
+  setContext(newContext: string): void;
+
+  clearContext(): void;
+
   trace(message: string): void;
 
   debug(message: string): void;

src/service/logger/logger.ts

@@ -6,7 +6,7 @@
 
   log(prefix: string, ...str: string[]) {
     // eslint-disable-next-line no-console
-    console.log.apply(console, [prefix, ...str]);
+    console.log.apply(console, [`[${prefix.padEnd(5)}]`, ...str]);
   }
 
   emptyLine() {

src/service/runner/runner.ts

@@ -10,6 +10,12 @@ import LoggerService from "@bp/service/logger/logger-service";
 import LoggerServiceFactory from "@bp/service/logger/logger-service-factory";
 import { inferGitClient, inferGitApiUrl } from "@bp/service/git/git-util";
 
+interface Git {
+  gitClientType: GitClientType;
+  gitClientApi: GitClient;
+  gitCli: GitCLIService;
+}
+
 /**
  * Main runner implementation, it implements the core logic flow
  */
@@ -30,13 +36,13 @@ export default class Runner {
     try {
       await this.execute();
 
-      this.logger.info("Process succeeded!");
+      this.logger.info("Process succeeded");
       process.exit(0);
 
     } catch (error) {
       this.logger.error(`${error}`);
       
-      this.logger.info("Process failed!");
+      this.logger.info("Process failed");
       process.exit(1);
     }
   }
@@ -50,70 +56,85 @@ export default class Runner {
     const args: Args = this.argsParser.parse();
 
     if (args.dryRun) {
-      this.logger.warn("Dry run enabled!");
+      this.logger.warn("Dry run enabled");
     }
 
     // 2. init git service
     const gitClientType: GitClientType = inferGitClient(args.pullRequest);
-    // right now the apiVersion is set to v4
-    const apiUrl = inferGitApiUrl(args.pullRequest);
+    // the api version is ignored in case of github
+    const apiUrl = inferGitApiUrl(args.pullRequest, gitClientType === GitClientType.CODEBERG ? "v1" : undefined);
     const gitApi: GitClient = GitClientFactory.getOrCreate(gitClientType, args.auth, apiUrl);
 
     // 3. parse configs
     this.logger.debug("Parsing configs..");
     const configs: Configs = await new PullRequestConfigsParser().parseAndValidate(args);
-    const originalPR: GitPullRequest = configs.originalPullRequest;
-    const backportPR: GitPullRequest = configs.backportPullRequest;
+    const backportPRs: BackportPullRequest[] = configs.backportPullRequests;
 
     // start local git operations
     const git: GitCLIService = new GitCLIService(configs.auth, configs.git);
     
+    const failures: string[] = [];
+    // we need sequential backporting as they will operate on the same folder
+    // avoid cloning the same repo multiple times
+    for(const pr of backportPRs) {
+      try {
+        await this.executeBackport(configs, pr, {
+          gitClientType: gitClientType,
+          gitClientApi: gitApi,
+          gitCli: git,
+        });
+      } catch(error) {
+        this.logger.error(`Something went wrong backporting to ${pr.base}: ${error}`);
+        failures.push(error as string);
+      }
+    }
+
+    if (failures.length > 0) {
+      throw new Error(`Failure occurred during one of the backports: [${failures.join(" ; ")}]`);
+    }
+  }
+
+  async executeBackport(configs: Configs, backportPR: BackportPullRequest, git: Git): Promise<void> {
+    this.logger.setContext(backportPR.base);
+
+    const originalPR: GitPullRequest = configs.originalPullRequest;
+
     // 4. clone the repository
     this.logger.debug("Cloning repo..");
-    await git.clone(configs.originalPullRequest.targetRepo.cloneUrl, configs.folder, configs.targetBranch);
+    await git.gitCli.clone(configs.originalPullRequest.targetRepo.cloneUrl, configs.folder, backportPR.base);
 
     // 5. create new branch from target one and checkout
     this.logger.debug("Creating local branch..");
-    const backportBranch = backportPR.branchName ?? `bp-${configs.targetBranch}-${originalPR.commits!.join("-")}`;
-    await git.createLocalBranch(configs.folder, backportBranch);
+
+    await git.gitCli.createLocalBranch(configs.folder, backportPR.head);
 
     // 6. fetch pull request remote if source owner != target owner or pull request still open
     if (configs.originalPullRequest.sourceRepo.owner !== configs.originalPullRequest.targetRepo.owner || 
         configs.originalPullRequest.state === "open") {
           this.logger.debug("Fetching pull request remote..");
-      const prefix = gitClientType === GitClientType.GITHUB ? "pull" : "merge-requests"; // default is for gitlab
-      await git.fetch(configs.folder, `${prefix}/${configs.originalPullRequest.number}/head:pr/${configs.originalPullRequest.number}`);
+      const prefix = git.gitClientType === GitClientType.GITLAB ? "merge-requests" : "pull" ; // default is for gitlab
+      await git.gitCli.fetch(configs.folder, `${prefix}/${configs.originalPullRequest.number}/head:pr/${configs.originalPullRequest.number}`);
     }
 
     // 7. apply all changes to the new branch
     this.logger.debug("Cherry picking commits..");
     for (const sha of originalPR.commits!) {
-      await git.cherryPick(configs.folder, sha);
+      await git.gitCli.cherryPick(configs.folder, sha, configs.mergeStrategy, configs.mergeStrategyOption);
     }
 
-    const backport: BackportPullRequest = {
-      owner: originalPR.targetRepo.owner,
-      repo: originalPR.targetRepo.project,
-      head: backportBranch,
-      base: configs.targetBranch,
-      title: backportPR.title,
-      body: backportPR.body,
-      reviewers: backportPR.reviewers,
-      assignees: backportPR.assignees,
-    };
-
     if (!configs.dryRun) {
       // 8. push the new branch to origin
-      await git.push(configs.folder, backportBranch);
+      await git.gitCli.push(configs.folder, backportPR.head);
 
       // 9. create pull request new branch -> target branch (using octokit)
-      const prUrl = await gitApi.createPullRequest(backport);
+      const prUrl = await git.gitClientApi.createPullRequest(backportPR);
       this.logger.info(`Pull request created: ${prUrl}`);
 
     } else {
-      this.logger.warn("Pull request creation and remote push skipped!");
-      this.logger.info(`${JSON.stringify(backport, null, 2)}`);
+      this.logger.warn("Pull request creation and remote push skipped");
+      this.logger.info(`${JSON.stringify(backportPR, null, 2)}`);
     }
-  }
 
+    this.logger.clearContext();
+  }
 }

test/service/args/args-utils.test.ts

@@ -1,5 +1,6 @@
-import { parseArgs, readConfigFile } from "@bp/service/args/args-utils";
-import { createTestFile, removeTestFile } from "../../support/utils";
+import { getAsCleanedCommaSeparatedList, getAsCommaSeparatedList, getOrUndefined, parseArgs, readConfigFile } from "@bp/service/args/args-utils";
+import { createTestFile, expectArrayEqual, removeTestFile, spyGetInput } from "../../support/utils";
+import { getInput } from "@actions/core";
 
 const RANDOM_CONFIG_FILE_CONTENT_PATHNAME = "./args-utils-test-random-config-file.json";
 const RANDOM_CONFIG_FILE_CONTENT = {
@@ -39,4 +40,39 @@ describe("args utils test suite", () => {
   test("check readConfigFile function", () => {
     expect(readConfigFile(RANDOM_CONFIG_FILE_CONTENT_PATHNAME)).toStrictEqual(RANDOM_CONFIG_FILE_CONTENT);
   });
+
+  test("gha getOrUndefined", () => {
+    spyGetInput({
+      "present": "value",
+      "empty": "",
+    });
+    expect(getOrUndefined(getInput("empty"))).toStrictEqual(undefined);
+    expect(getOrUndefined(getInput("present"))).toStrictEqual("value");
+  });
+
+  test("gha getAsCleanedCommaSeparatedList", () => {
+    spyGetInput({
+      "present": "value1, value2 ,   value3",
+      "empty": "",
+      "blank": "   ",
+      "inner": " inner spaces ",
+    });
+    expectArrayEqual(getAsCleanedCommaSeparatedList(getInput("present"))!, ["value1", "value2", "value3"]);
+    expect(getAsCleanedCommaSeparatedList(getInput("empty"))).toStrictEqual(undefined);
+    expect(getAsCleanedCommaSeparatedList(getInput("blank"))).toStrictEqual(undefined);
+    expect(getAsCleanedCommaSeparatedList(getInput("inner"))).toStrictEqual(["innerspaces"]);
+  });
+
+  test("gha getAsCommaSeparatedList", () => {
+    spyGetInput({
+      "present": "value1, value2 ,   value3",
+      "empty": "",
+      "blank": "   ",
+      "inner": " inner spaces ",
+    });
+    expectArrayEqual(getAsCommaSeparatedList(getInput("present"))!, ["value1", "value2", "value3"]);
+    expect(getAsCommaSeparatedList(getInput("empty"))).toStrictEqual(undefined);
+    expect(getAsCommaSeparatedList(getInput("blank"))).toStrictEqual(undefined);
+    expectArrayEqual(getAsCommaSeparatedList(getInput("inner"))!, ["inner spaces"]);
+  });
 });

test/service/args/cli/cli-args-parser.test.ts

@@ -24,6 +24,8 @@ const RANDOM_CONFIG_FILE_CONTENT = {
   "reviewers": ["reviewer1", "reviewer2"],
   "assignees": ["assignee1", "assignee2"],
   "inheritReviewers": true,
+  "labels": ["cherry-pick :cherries:"],
+  "inheritLabels": true,
 };
 
 describe("cli args parser", () => {
@@ -42,11 +44,11 @@ describe("cli args parser", () => {
   });
 
   beforeEach(() => {
-    // create a fresh new instance every time
-    parser = new CLIArgsParser();
-
     // reset process.env variables
     resetProcessArgs();
+
+    // create a fresh new instance every time
+    parser = new CLIArgsParser();
   });
 
   test("valid execution [default, short]", () => {
@@ -72,6 +74,11 @@ describe("cli args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("with config file [default, short]", () => {
@@ -95,6 +102,11 @@ describe("cli args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("valid execution [default, long]", () => {
@@ -120,6 +132,11 @@ describe("cli args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("with config file [default, long]", () => {
@@ -143,6 +160,11 @@ describe("cli args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("valid execution [override, short]", () => {
@@ -175,6 +197,11 @@ describe("cli args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("valid execution [override, long]", () => {
@@ -203,6 +230,9 @@ describe("cli args parser", () => {
       "--assignees",
       " pippo,pluto, paperino",
       "--no-inherit-reviewers",
+      "--labels",
+      "cherry-pick :cherries:, another spaced label",
+      "--inherit-labels",
     ]);
 
     const args: Args = parser.parse();
@@ -220,6 +250,11 @@ describe("cli args parser", () => {
     expectArrayEqual(args.reviewers!, ["al", "john", "jack"]);
     expectArrayEqual(args.assignees!, ["pippo", "pluto", "paperino"]);
     expect(args.inheritReviewers).toEqual(false);
+    expectArrayEqual(args.labels!, ["cherry-pick :cherries:", "another spaced label"]);
+    expect(args.inheritLabels).toEqual(true);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("override using config file", () => {
@@ -243,6 +278,11 @@ describe("cli args parser", () => {
     expectArrayEqual(args.reviewers!, ["reviewer1", "reviewer2"]);
     expectArrayEqual(args.assignees!,["assignee1", "assignee2"]);
     expect(args.inheritReviewers).toEqual(true);
+    expectArrayEqual(args.labels!, ["cherry-pick :cherries:"]);
+    expect(args.inheritLabels).toEqual(true);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("ignore custom option when config file is set", () => {
@@ -273,6 +313,9 @@ describe("cli args parser", () => {
       "--assignees",
       " pippo,pluto, paperino",
       "--no-inherit-reviewers",
+      "--labels",
+      "cherry-pick :cherries:, another spaced label",
+      "--inherit-labels",
     ]);
 
     const args: Args = parser.parse();
@@ -290,5 +333,163 @@ describe("cli args parser", () => {
     expectArrayEqual(args.reviewers!, ["reviewer1", "reviewer2"]);
     expectArrayEqual(args.assignees!,["assignee1", "assignee2"]);
     expect(args.inheritReviewers).toEqual(true);
+    expectArrayEqual(args.labels!, ["cherry-pick :cherries:"]);
+    expect(args.inheritLabels).toEqual(true);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
+  });
+
+  test("override squash to false", () => {
+    addProcessArgs([
+      "--target-branch",
+      "target",
+      "--pull-request",
+      "https://localhost/whatever/pulls/1",
+      "--no-squash"
+    ]);
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.bodyPrefix).toEqual(undefined);
+    expect(args.bpBranchName).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(false);
+  });
+
+  test("override cherry pick strategies", () => {
+    addProcessArgs([
+      "--target-branch",
+      "target",
+      "--pull-request",
+      "https://localhost/whatever/pulls/1",
+      "--strategy",
+      "ort",
+      "--strategy-option",
+      "ours",
+    ]);
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.bodyPrefix).toEqual(undefined);
+    expect(args.bpBranchName).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual("ort");
+    expect(args.strategyOption).toEqual("ours");
+  });
+
+  test("additional pr comments", () => {
+    addProcessArgs([
+      "--target-branch",
+      "target",
+      "--pull-request",
+      "https://localhost/whatever/pulls/1",
+      "--comments",
+      "first comment;second comment",
+    ]);
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.bodyPrefix).toEqual(undefined);
+    expect(args.bpBranchName).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expectArrayEqual(args.comments!,["first comment", "second comment"]);
+  });
+
+  test("valid execution with multiple branches", () => {
+    addProcessArgs([
+      "-tb",
+      "target, old",
+      "-pr",
+      "https://localhost/whatever/pulls/1"
+    ]);
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target, old");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.bodyPrefix).toEqual(undefined);
+    expect(args.bpBranchName).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
+  });
+
+  test("invalid execution with empty target branch", () => {
+    addProcessArgs([
+      "-tb",
+      " ",
+      "-pr",
+      "https://localhost/whatever/pulls/1"
+    ]);
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
+  });
+
+  test("invalid execution with missing mandatory target branch", () => {
+    addProcessArgs([
+      "-pr",
+      "https://localhost/whatever/pulls/1"
+    ]);
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
+  });
+
+  test("invalid execution with missin mandatory pull request", () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+    ]);
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
   });
 });

test/service/args/gha/gha-args-parser.test.ts

@@ -24,6 +24,8 @@ const RANDOM_CONFIG_FILE_CONTENT = {
   "reviewers": ["reviewer1", "reviewer2"],
   "assignees": ["assignee1", "assignee2"],
   "inheritReviewers": true,
+  "labels": ["cherry-pick :cherries:"],
+  "inheritLabels": true,
 };
 
 describe("gha args parser", () => {
@@ -46,30 +48,6 @@ describe("gha args parser", () => {
     parser = new GHAArgsParser();
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test("getOrUndefined", () => {
-    spyGetInput({
-      "present": "value",
-      "empty": "",
-    });
-    expect(parser.getOrUndefined("empty")).toStrictEqual(undefined);
-    expect(parser.getOrUndefined("present")).toStrictEqual("value");
-  });
-
-  test("getAsCommaSeparatedList", () => {
-    spyGetInput({
-      "present": "value1, value2 ,   value3",
-      "empty": "",
-      "blank": "   ",
-    });
-    expectArrayEqual(parser.getAsCommaSeparatedList("present")!, ["value1", "value2", "value3"]);
-    expect(parser.getAsCommaSeparatedList("empty")).toStrictEqual(undefined);
-    expect(parser.getAsCommaSeparatedList("blank")).toStrictEqual(undefined);
-  });
-
   test("valid execution [default]", () => {
     spyGetInput({
       "target-branch": "target",
@@ -89,6 +67,11 @@ describe("gha args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("valid execution [override]", () => {
@@ -106,6 +89,8 @@ describe("gha args parser", () => {
       "reviewers": "al , john,  jack",
       "assignees": " pippo,pluto, paperino",
       "no-inherit-reviewers": "true",
+      "labels": "cherry-pick :cherries:, another spaced label",
+      "inherit-labels": "true"
     });
 
     const args: Args = parser.parse();
@@ -123,6 +108,11 @@ describe("gha args parser", () => {
     expectArrayEqual(args.reviewers!, ["al", "john", "jack"]);
     expectArrayEqual(args.assignees!, ["pippo", "pluto", "paperino"]);
     expect(args.inheritReviewers).toEqual(false);
+    expectArrayEqual(args.labels!, ["cherry-pick :cherries:", "another spaced label"]);
+    expect(args.inheritLabels).toEqual(true);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("using config file", () => {
@@ -145,6 +135,11 @@ describe("gha args parser", () => {
     expect(args.reviewers).toEqual([]);
     expect(args.assignees).toEqual([]);
     expect(args.inheritReviewers).toEqual(true);
+    expectArrayEqual(args.labels!, []);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
   });
 
   test("ignore custom options when using config file", () => {
@@ -163,6 +158,8 @@ describe("gha args parser", () => {
       "reviewers": "al , john,  jack",
       "assignees": " pippo,pluto, paperino",
       "no-inherit-reviewers": "true",
+      "labels": "cherry-pick :cherries:, another spaced label",
+      "inherit-labels": "false"
     });
 
     const args: Args = parser.parse();
@@ -180,5 +177,141 @@ describe("gha args parser", () => {
     expectArrayEqual(args.reviewers!, ["reviewer1", "reviewer2"]);
     expectArrayEqual(args.assignees!,["assignee1", "assignee2"]);
     expect(args.inheritReviewers).toEqual(true);
+    expectArrayEqual(args.labels!, ["cherry-pick :cherries:"]);
+    expect(args.inheritLabels).toEqual(true);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
+  });
+
+  test("override squash to false", () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://localhost/whatever/pulls/1",
+      "no-squash": "true",
+    });
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(false);
+  });
+
+  test("override cherry pick strategy", () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://localhost/whatever/pulls/1",
+      "strategy": "ort",
+      "strategy-option": "ours",
+    });
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual("ort");
+    expect(args.strategyOption).toEqual("ours");
+  });
+
+  test("additional pr comments", () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://localhost/whatever/pulls/1",
+      "comments": "first comment;second comment",
+    });
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expectArrayEqual(args.comments!,["first comment", "second comment"]);
+  });
+
+  test("valid execution with multiple branches", () => {
+    spyGetInput({
+      "target-branch": "target,old",
+      "pull-request": "https://localhost/whatever/pulls/1"
+    });
+
+    const args: Args = parser.parse();
+    expect(args.dryRun).toEqual(false);
+    expect(args.auth).toEqual(undefined);
+    expect(args.gitUser).toEqual(undefined);
+    expect(args.gitEmail).toEqual(undefined);
+    expect(args.folder).toEqual(undefined);
+    expect(args.targetBranch).toEqual("target,old");
+    expect(args.pullRequest).toEqual("https://localhost/whatever/pulls/1");
+    expect(args.title).toEqual(undefined);
+    expect(args.body).toEqual(undefined);
+    expect(args.reviewers).toEqual([]);
+    expect(args.assignees).toEqual([]);
+    expect(args.inheritReviewers).toEqual(true);
+    expect(args.labels).toEqual([]);
+    expect(args.inheritLabels).toEqual(false);
+    expect(args.squash).toEqual(true);
+    expect(args.strategy).toEqual(undefined);
+    expect(args.strategyOption).toEqual(undefined);
+  });
+
+
+  test("invalid execution with empty target branch", () => {
+    spyGetInput({
+      "target-branch": "  ",
+      "pull-request": "https://localhost/whatever/pulls/1"
+    });
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
+  });
+
+  test("invalid execution with missing mandatory target branch", () => {
+    spyGetInput({
+      "pull-request": "https://localhost/whatever/pulls/1"
+    });
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
+  });
+
+  test("invalid execution with missin mandatory pull request", () => {
+    spyGetInput({
+      "target-branch": "target,old",
+    });
+
+    expect(() => parser.parse()).toThrowError("Missing option: pull request and target branches must be provided");
   });
 });

test/service/configs/pullrequest/github-pr-configs-parser-multiple.test.ts

@@ -0,0 +1,425 @@
+import { Args } from "@bp/service/args/args.types";
+import { Configs } from "@bp/service/configs/configs.types";
+import PullRequestConfigsParser from "@bp/service/configs/pullrequest/pr-configs-parser";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { GitClientType } from "@bp/service/git/git.types";
+import { mockGitHubClient } from "../../../support/mock/git-client-mock-support";
+import { resetEnvTokens, resetProcessArgs } from "../../../support/utils";
+import { MERGED_PR_FIXTURE, REPO, TARGET_OWNER, MULT_COMMITS_PR_FIXTURE } from "../../../support/mock/github-data";
+import GitHubMapper from "@bp/service/git/github/github-mapper";
+import GitHubClient from "@bp/service/git/github/github-client";
+
+jest.spyOn(GitHubMapper.prototype, "mapPullRequest");
+jest.spyOn(GitHubClient.prototype, "getPullRequest");
+
+describe("github pull request config parser", () => {
+
+  const mergedPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MERGED_PR_FIXTURE.number}`;
+  const multipleCommitsPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MULT_COMMITS_PR_FIXTURE.number}`;
+  
+  let configParser: PullRequestConfigsParser;
+
+  beforeAll(() => {
+    GitClientFactory.reset();
+    GitClientFactory.getOrCreate(GitClientType.GITHUB, "whatever", "http://localhost/api/v3");
+  });
+
+  beforeEach(() => {
+    // reset process.env variables
+    resetProcessArgs();
+
+    // reset env tokens
+    resetEnvTokens();
+    
+    // mock octokit
+    mockGitHubClient("http://localhost/api/v3");
+
+    // create a fresh new instance every time
+    configParser = new PullRequestConfigsParser();
+  });
+
+  test("multiple backports", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v1-28f63db", 
+          base: "v1", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v2-28f63db", 
+          base: "v2", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v3-28f63db", 
+          base: "v3", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+      ])
+    );
+  });
+
+  test("multiple backports ignore duplicates", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v1-28f63db", 
+          base: "v1", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v2-28f63db", 
+          base: "v2", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v3-28f63db", 
+          base: "v3", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+      ])
+    );
+  });
+
+  test("multiple backports with custom branch name", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom-branch",
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch-v1", 
+          base: "v1", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch-v2", 
+          base: "v2", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch-v3", 
+          base: "v3", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+      ])
+    );
+  });
+
+  test("multiple backports with multiple custom branch names", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom-branch1, custom-branch2, custom-branch3",
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch1", 
+          base: "v1", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch2", 
+          base: "v2", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "custom-branch3", 
+          base: "v3", 
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+      ])
+    );
+  });
+
+  test("multiple backports with incorrect number of bp branch names", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom-branch1, custom-branch2",
+    };
+
+    await expect(() => configParser.parseAndValidate(args)).rejects.toThrow("The number of backport branch names, if provided, must match the number of target branches or just one, provided 2 branch names instead");
+  });
+
+  test("multiple backports and multiple commits", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: multipleCommitsPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "GitHub",
+      gitEmail: "noreply@github.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+      squash: false,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 8632, false);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), ["0404fb922ab75c3a8aecad5c97d9af388df04695", "11da4e38aa3e577ffde6d546f1c52e53b04d3151"]);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
+    });
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v1-0404fb9-11da4e3", 
+          base: "v1", 
+          title: "[v1] PR Title",
+          body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+          reviewers: ["gh-user", "that-s-a-user"],
+          assignees: [],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v2-0404fb9-11da4e3", 
+          base: "v2", 
+          title: "[v2] PR Title",
+          body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+          reviewers: ["gh-user", "that-s-a-user"],
+          assignees: [],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "owner", 
+          repo: "reponame", 
+          head: "bp-v3-0404fb9-11da4e3", 
+          base: "v3",
+          title: "[v3] PR Title",
+          body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+          reviewers: ["gh-user", "that-s-a-user"],
+          assignees: [],
+          labels: [],
+          comments: [],
+        },
+      ])
+    );
+  });
+  
+});

test/service/configs/pullrequest/github-pr-configs-parser.test.ts

@@ -1,24 +1,26 @@
 import { Args } from "@bp/service/args/args.types";
-import { Configs } from "@bp/service/configs/configs.types";
+import { AuthTokenId, Configs } from "@bp/service/configs/configs.types";
 import PullRequestConfigsParser from "@bp/service/configs/pullrequest/pr-configs-parser";
 import GitClientFactory from "@bp/service/git/git-client-factory";
 import { GitClientType } from "@bp/service/git/git.types";
 import { mockGitHubClient } from "../../../support/mock/git-client-mock-support";
-import { addProcessArgs, createTestFile, removeTestFile, resetProcessArgs } from "../../../support/utils";
-import { mergedPullRequestFixture, openPullRequestFixture, notMergedPullRequestFixture, repo, targetOwner } from "../../../support/mock/github-data";
+import { addProcessArgs, createTestFile, removeTestFile, resetEnvTokens, resetProcessArgs } from "../../../support/utils";
+import { MERGED_PR_FIXTURE, OPEN_PR_FIXTURE, NOT_MERGED_PR_FIXTURE, REPO, TARGET_OWNER, MULT_COMMITS_PR_FIXTURE } from "../../../support/mock/github-data";
 import CLIArgsParser from "@bp/service/args/cli/cli-args-parser";
+import GitHubMapper from "@bp/service/git/github/github-mapper";
+import GitHubClient from "@bp/service/git/github/github-client";
 
 const GITHUB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT_PATHNAME = "./github-pr-configs-parser-simple-pr-merged.json";
 const GITHUB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT = {
   "targetBranch": "prod",
-  "pullRequest": `https://github.com/${targetOwner}/${repo}/pull/${mergedPullRequestFixture.number}`,
+  "pullRequest": `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MERGED_PR_FIXTURE.number}`,
 };
 
 const GITHUB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT_PATHNAME = "./github-pr-configs-parser-complex-pr-merged.json";
 const GITHUB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
   "dryRun": false,
   "auth": "my-auth-token",
-  "pullRequest": `https://github.com/${targetOwner}/${repo}/pull/${mergedPullRequestFixture.number}`,
+  "pullRequest": `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MERGED_PR_FIXTURE.number}`,
   "targetBranch": "prod",
   "gitUser": "Me",
   "gitEmail": "me@email.com",
@@ -28,13 +30,19 @@ const GITHUB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
   "reviewers": ["user1", "user2"],
   "assignees": ["user3", "user4"],
   "inheritReviewers": true, // not taken into account
+  "labels": ["cherry-pick :cherries:"],
+  "inheritLabels": true,
 };
 
+jest.spyOn(GitHubMapper.prototype, "mapPullRequest");
+jest.spyOn(GitHubClient.prototype, "getPullRequest");
+
 describe("github pull request config parser", () => {
 
-  const mergedPRUrl = `https://github.com/${targetOwner}/${repo}/pull/${mergedPullRequestFixture.number}`;
-  const openPRUrl = `https://github.com/${targetOwner}/${repo}/pull/${openPullRequestFixture.number}`;
-  const notMergedPRUrl = `https://github.com/${targetOwner}/${repo}/pull/${notMergedPullRequestFixture.number}`;
+  const mergedPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MERGED_PR_FIXTURE.number}`;
+  const openPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${OPEN_PR_FIXTURE.number}`;
+  const notMergedPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${NOT_MERGED_PR_FIXTURE.number}`;
+  const multipleCommitsPRUrl = `https://github.com/${TARGET_OWNER}/${REPO}/pull/${MULT_COMMITS_PR_FIXTURE.number}`;
   
   let argsParser: CLIArgsParser;
   let configParser: PullRequestConfigsParser;
@@ -55,24 +63,23 @@ describe("github pull request config parser", () => {
   });
 
   beforeEach(() => {
-    mockGitHubClient("http://localhost/api/v3");
-
     // reset process.env variables
     resetProcessArgs();
 
+    // reset env tokens
+    resetEnvTokens();
+
+    // mock octokit
+    mockGitHubClient("http://localhost/api/v3");
+
     // create a fresh new instance every time
     argsParser = new CLIArgsParser();
     configParser = new PullRequestConfigsParser();
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
   test("parse configs from pull request", async () => {
     const args: Args = {
       dryRun: false,
-      auth: "",
       pullRequest: mergedPRUrl,
       targetBranch: "prod",
       gitUser: "GitHub",
@@ -84,13 +91,17 @@ describe("github pull request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "GitHub",
       email: "noreply@github.com"
     });
-    expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
+    expect(configs.auth).toEqual(undefined);
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -104,6 +115,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -117,25 +129,18 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "GitHub",
-      url: undefined,
-      htmlUrl: undefined,
-      title: "[prod] PR Title",
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
+      title: "[prod] PR Title", 
       body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
       reviewers: ["gh-user", "that-s-a-user"],
       assignees: [],
-      targetRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      sourceRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -157,7 +162,6 @@ describe("github pull request config parser", () => {
 
     expect(configs.dryRun).toEqual(true);
     expect(configs.auth).toEqual("whatever");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual("/tmp/test");
     expect(configs.git).toEqual({
       user: "GitHub",
@@ -180,9 +184,13 @@ describe("github pull request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 4444, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(true);
     expect(configs.auth).toEqual("whatever");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.git).toEqual({
       user: "GitHub",
       email: "noreply@github.com"
@@ -199,6 +207,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["gh-user"],
       assignees: [],
+      labels: [],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -229,11 +238,10 @@ describe("github pull request config parser", () => {
       inheritReviewers: true,
     };
 
-    expect(async () => await configParser.parseAndValidate(args)).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => configParser.parseAndValidate(args)).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
-  
-  test("override backport pr data inherting reviewers", async () => {
+  test("override backport pr data inheriting reviewers", async () => {
     const args: Args = {
       dryRun: false,
       auth: "",
@@ -247,17 +255,22 @@ describe("github pull request config parser", () => {
       reviewers: [],
       assignees: [],
       inheritReviewers: true,
+      bpBranchName: "custom-branch"
     };
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -271,6 +284,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -285,25 +299,60 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "custom-branch", 
+      base: "prod", 
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: ["gh-user", "that-s-a-user"],
       assignees: [],
-      targetRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      sourceRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
+    });
+  });
+
+  test("override backport with empty bp branch name", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+      bpBranchName: "  "
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
+      title: "New Title",
+      body: "New Body Prefix -New Body",
+      reviewers: ["gh-user", "that-s-a-user"],
+      assignees: [],
+      labels: [],
+      comments: [],
     });
   });
 
@@ -325,13 +374,17 @@ describe("github pull request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -345,6 +398,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -359,25 +413,18 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: ["user1", "user2"],
       assignees: ["user3", "user4"],
-      targetRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      sourceRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -399,13 +446,17 @@ describe("github pull request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -419,6 +470,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -433,44 +485,52 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: [],
       assignees: ["user3", "user4"],
-      targetRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      sourceRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
-  
-  test("using simple config file", async () => {
-    addProcessArgs([
-      "-cf",
-      GITHUB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT_PATHNAME,
-    ]);
 
-    const args: Args = argsParser.parse();
+  test("override backport pr custom labels with duplicates", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: ["custom-label", "original-label"], // also include the one inherited
+      inheritLabels: true,
+    };
+
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
-      user: "GitHub",
-      email: "noreply@github.com"
+      user: "Me",
+      email: "me@email.com"
     });
-    expect(configs.auth).toEqual(undefined);
-    expect(configs.targetBranch).toEqual("prod");
+    expect(configs.auth).toEqual("");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -484,6 +544,70 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
+      targetRepo: {
+        owner: "owner",
+        project: "reponame",
+        cloneUrl: "https://github.com/owner/reponame.git"
+      },
+      sourceRepo: {
+        owner: "fork",
+        project: "reponame",
+        cloneUrl: "https://github.com/fork/reponame.git"
+      },
+      bpBranchName: undefined,
+      nCommits: 2,
+      commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
+      title: "New Title",
+      body: "New Body Prefix -New Body",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      labels: ["custom-label", "original-label"],
+      comments: [],
+    });
+  });
+  
+  test("using simple config file", async () => {
+    addProcessArgs([
+      "-cf",
+      GITHUB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT_PATHNAME,
+    ]);
+
+    const args: Args = argsParser.parse();
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
+    });
+    expect(configs.auth).toEqual(undefined);
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.originalPullRequest).toEqual({
+      number: 2368,
+      author: "gh-user",
+      url: "https://api.github.com/repos/owner/reponame/pulls/2368",
+      htmlUrl: "https://github.com/owner/reponame/pull/2368",
+      state: "closed",
+      merged: true,
+      mergedBy: "that-s-a-user",
+      title: "PR Title",
+      body: "Please review and merge",
+      reviewers: ["requested-gh-user", "gh-user"],
+      assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -497,25 +621,18 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "GitHub",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame",
+      head: "bp-prod-28f63db",
+      base: "prod",
       title: "[prod] PR Title",
       body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
       reviewers: ["gh-user", "that-s-a-user"],
       assignees: [],
-      targetRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      sourceRepo: {
-        owner: "owner",
-        project: "reponame",
-        cloneUrl: "https://github.com/owner/reponame.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -528,13 +645,17 @@ describe("github pull request config parser", () => {
     const args: Args = argsParser.parse();
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("my-auth-token");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 2368,
@@ -548,6 +669,7 @@ describe("github pull request config parser", () => {
       body: "Please review and merge",
       reviewers: ["requested-gh-user", "gh-user"],
       assignees: [],
+      labels: ["original-label"],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -562,14 +684,62 @@ describe("github pull request config parser", () => {
       nCommits: 2,
       commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame",
+      head: "bp-prod-28f63db",
+      base: "prod",
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: ["user1", "user2"],
       assignees: ["user3", "user4"],
+      labels: ["cherry-pick :cherries:", "original-label"],
+      comments: [],
+    });
+  });
+
+  test("parse configs from pull request without squashing with multiple commits", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: multipleCommitsPRUrl,
+      targetBranch: "prod",
+      gitUser: "GitHub",
+      gitEmail: "noreply@github.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+      squash: false,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 8632, false);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), ["0404fb922ab75c3a8aecad5c97d9af388df04695", "11da4e38aa3e577ffde6d546f1c52e53b04d3151"]);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
+    });
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.originalPullRequest).toEqual({
+      number: 8632,
+      author: "gh-user",
+      url: "https://api.github.com/repos/owner/reponame/pulls/8632",
+      htmlUrl: "https://github.com/owner/reponame/pull/8632",
+      state: "closed",
+      merged: true,
+      mergedBy: "that-s-a-user",
+      title: "PR Title",
+      body: "Please review and merge",
+      reviewers: ["requested-gh-user", "gh-user"],
+      assignees: [],
+      labels: [],
       targetRepo: {
         owner: "owner",
         project: "reponame",
@@ -580,7 +750,174 @@ describe("github pull request config parser", () => {
         project: "reponame",
         cloneUrl: "https://github.com/owner/reponame.git"
       },
+      nCommits: 2,
+      commits: ["0404fb922ab75c3a8aecad5c97d9af388df04695", "11da4e38aa3e577ffde6d546f1c52e53b04d3151"]
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame",
+      head: "bp-prod-0404fb9-11da4e3",
+      base: "prod",
+      title: "[prod] PR Title",
+      body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+      reviewers: ["gh-user", "that-s-a-user"],
+      assignees: [],
+      labels: [],
+      comments: [],
+    });
+  });
+
+  test("override backport pr with additional comments", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: ["First comment", "Second comment"],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.getPullRequest).toBeCalledWith("owner", "reponame", 2368, true);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitHubMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "Me",
+      email: "me@email.com"
+    });
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.originalPullRequest).toEqual({
+      number: 2368,
+      author: "gh-user",
+      url: "https://api.github.com/repos/owner/reponame/pulls/2368",
+      htmlUrl: "https://github.com/owner/reponame/pull/2368",
+      state: "closed",
+      merged: true,
+      mergedBy: "that-s-a-user",
+      title: "PR Title",
+      body: "Please review and merge",
+      reviewers: ["requested-gh-user", "gh-user"],
+      assignees: [],
+      labels: ["original-label"],
+      targetRepo: {
+        owner: "owner",
+        project: "reponame",
+        cloneUrl: "https://github.com/owner/reponame.git"
+      },
+      sourceRepo: {
+        owner: "fork",
+        project: "reponame",
+        cloneUrl: "https://github.com/fork/reponame.git"
+      },
       bpBranchName: undefined,
+      nCommits: 2,
+      commits: ["28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc"],
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "owner", 
+      repo: "reponame", 
+      head: "bp-prod-28f63db", 
+      base: "prod", 
+      title: "New Title",
+      body: "New Body Prefix -New Body",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      labels: [],
+      comments: ["First comment", "Second comment"],
+    });
+  });
+
+  test("override token using auth arg", async () => {
+    process.env[AuthTokenId.GITHUB_TOKEN] = "mygithubtoken";
+    const args: Args = {
+      dryRun: true,
+      auth: "whatever",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "GitHub",
+      gitEmail: "noreply@github.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual("whatever");
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
+    });
+  });
+
+  test("auth using GITHUB_TOKEN has precedence over GIT_TOKEN env variable", async () => {
+    process.env[AuthTokenId.GIT_TOKEN] = "mygittoken";
+    process.env[AuthTokenId.GITHUB_TOKEN] = "mygithubtoken";
+    const args: Args = {
+      dryRun: true,
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "GitHub",
+      gitEmail: "noreply@github.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual("mygithubtoken");
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
+    });
+  });
+
+  test("ignore env variables related to other git platforms", async () => {
+    process.env[AuthTokenId.GITLAB_TOKEN] = "mygitlabtoken";
+    process.env[AuthTokenId.CODEBERG_TOKEN] = "mycodebergtoken";
+    const args: Args = {
+      dryRun: true,
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "GitHub",
+      gitEmail: "noreply@github.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual(undefined);
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "GitHub",
+      email: "noreply@github.com"
     });
   });
 });

test/service/configs/pullrequest/gitlab-pr-configs-parser-multiple.test.ts

@@ -0,0 +1,353 @@
+import { Args } from "@bp/service/args/args.types";
+import { Configs } from "@bp/service/configs/configs.types";
+import PullRequestConfigsParser from "@bp/service/configs/pullrequest/pr-configs-parser";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { GitClientType } from "@bp/service/git/git.types";
+import { getAxiosMocked } from "../../../support/mock/git-client-mock-support";
+import { MERGED_SQUASHED_MR } from "../../../support/mock/gitlab-data";
+import GitLabClient from "@bp/service/git/gitlab/gitlab-client";
+import GitLabMapper from "@bp/service/git/gitlab/gitlab-mapper";
+import { resetEnvTokens } from "../../../support/utils";
+
+jest.spyOn(GitLabMapper.prototype, "mapPullRequest");
+jest.spyOn(GitLabClient.prototype, "getPullRequest");
+
+jest.mock("axios", () => {
+  return {
+    create: jest.fn(() => ({
+      get: getAxiosMocked,
+    })),
+  };
+});
+
+describe("gitlab merge request config parser", () => {
+
+  const mergedPRUrl = `https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/${MERGED_SQUASHED_MR.iid}`;
+
+  let configParser: PullRequestConfigsParser;
+
+  beforeAll(() => {
+    GitClientFactory.reset();
+    GitClientFactory.getOrCreate(GitClientType.GITLAB, "whatever", "my.gitlab.host.com");
+  });
+
+  beforeEach(() => {
+    // reset env tokens
+    resetEnvTokens();
+
+    configParser = new PullRequestConfigsParser();
+  });
+
+  test("multiple backports", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v1-ebb1eca", 
+          base: "v1",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v2-ebb1eca", 
+          base: "v2",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v3-ebb1eca", 
+          base: "v3",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        }
+      ])
+    );
+  });
+
+  test("multiple backports ignore duplicates", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3, v1",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v1-ebb1eca", 
+          base: "v1",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v2-ebb1eca", 
+          base: "v2",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "bp-v3-ebb1eca", 
+          base: "v3",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        }
+      ])
+    );
+  });
+  
+  test("multiple backports with custom branch name", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom-branch"
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom-branch-v1", 
+          base: "v1",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom-branch-v2", 
+          base: "v2",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom-branch-v3", 
+          base: "v3",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        }
+      ])
+    );
+  });
+
+  test("multiple backports with multiple custom branch names", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom1, custom2, custom3"
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.backportPullRequests.length).toEqual(3);
+    expect(configs.backportPullRequests).toEqual(
+      expect.arrayContaining([
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom1", 
+          base: "v1",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom2", 
+          base: "v2",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        },
+        {
+          owner: "superuser", 
+          repo: "backporting-example", 
+          head: "custom3", 
+          base: "v3",
+          title: "New Title",
+          body: "New Body Prefix -New Body",
+          reviewers: [],
+          assignees: ["user3", "user4"],
+          labels: [],
+          comments: [],
+        }
+      ])
+    );
+  });
+
+  test("multiple backports with incorrect number of bp branch names", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "v1, v2, v3",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: [],
+      bpBranchName: "custom-branch1, custom-branch2, custom-branch2, custom-branch3, custom-branch4",
+    };
+
+    await expect(() => configParser.parseAndValidate(args)).rejects.toThrow("The number of backport branch names, if provided, must match the number of target branches or just one, provided 4 branch names instead");
+  });
+});

test/service/configs/pullrequest/gitlab-pr-configs-parser.test.ts

@@ -1,12 +1,14 @@
 import { Args } from "@bp/service/args/args.types";
-import { Configs } from "@bp/service/configs/configs.types";
+import { AuthTokenId, Configs } from "@bp/service/configs/configs.types";
 import PullRequestConfigsParser from "@bp/service/configs/pullrequest/pr-configs-parser";
 import GitClientFactory from "@bp/service/git/git-client-factory";
 import { GitClientType } from "@bp/service/git/git.types";
 import { getAxiosMocked } from "../../../support/mock/git-client-mock-support";
 import { CLOSED_NOT_MERGED_MR, MERGED_SQUASHED_MR, OPEN_MR } from "../../../support/mock/gitlab-data";
 import GHAArgsParser from "@bp/service/args/gha/gha-args-parser";
-import { createTestFile, removeTestFile, spyGetInput } from "../../../support/utils";
+import { createTestFile, removeTestFile, resetEnvTokens, spyGetInput } from "../../../support/utils";
+import GitLabClient from "@bp/service/git/gitlab/gitlab-client";
+import GitLabMapper from "@bp/service/git/gitlab/gitlab-mapper";
 
 const GITLAB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT_PATHNAME = "./gitlab-pr-configs-parser-simple-pr-merged.json";
 const GITLAB_MERGED_PR_SIMPLE_CONFIG_FILE_CONTENT = {
@@ -28,8 +30,12 @@ const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
   "reviewers": [],
   "assignees": ["user3", "user4"],
   "inheritReviewers": false,
+  "labels": ["cherry-pick :cherries:"],
+  "inheritLabels": true,
 };
 
+jest.spyOn(GitLabMapper.prototype, "mapPullRequest");
+jest.spyOn(GitLabClient.prototype, "getPullRequest");
 
 jest.mock("axios", () => {
   return {
@@ -64,14 +70,13 @@ describe("gitlab merge request config parser", () => {
   });
 
   beforeEach(() => {
+    // reset env tokens
+    resetEnvTokens();
+    
     argsParser = new GHAArgsParser();
     configParser = new PullRequestConfigsParser();
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
   test("parse configs from merge request", async () => {
     const args: Args = {
       dryRun: false,
@@ -87,13 +92,17 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Gitlab",
       email: "noreply@gitlab.com"
     });
     expect(configs.auth).toEqual(undefined);
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -107,6 +116,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -120,25 +130,18 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Gitlab",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "[prod] Update test.txt",
       body: "**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1\r\n\r\nThis is the body",
       reviewers: ["superuser"],
       assignees: [],
-      targetRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      sourceRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -159,9 +162,13 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(true);
     expect(configs.auth).toEqual("whatever");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual("/tmp/test");
     expect(configs.git).toEqual({
       user: "Gitlab",
@@ -184,9 +191,13 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 2, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(true);
     expect(configs.auth).toEqual("whatever");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.git).toEqual({
       user: "Gitlab",
       email: "noreply@gitlab.com"
@@ -203,6 +214,7 @@ describe("gitlab merge request config parser", () => {
       body: "Still opened mr body",
       reviewers: ["superuser"],
       assignees: ["superuser"],
+      labels: [],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -233,10 +245,10 @@ describe("gitlab merge request config parser", () => {
       inheritReviewers: true,
     };
 
-    expect(async () => await configParser.parseAndValidate(args)).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => configParser.parseAndValidate(args)).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
-  test("override backport pr data inherting reviewers", async () => {
+  test("override backport pr data inheriting reviewers", async () => {
     const args: Args = {
       dryRun: false,
       auth: "",
@@ -254,13 +266,17 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -274,6 +290,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -287,25 +304,18 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: ["superuser"],
       assignees: [],
-      targetRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      sourceRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -327,13 +337,17 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -347,6 +361,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -360,25 +375,18 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: ["user1", "user2"],
       assignees: ["user3", "user4"],
-      targetRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      sourceRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -400,13 +408,17 @@ describe("gitlab merge request config parser", () => {
 
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -420,6 +432,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -433,14 +446,66 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: [],
       assignees: ["user3", "user4"],
+      labels: [],
+      comments: [],
+    });
+  });
+
+  test("override backport pr custom labels with duplicates", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: ["custom-label", "gitlab-original-label"], // also include the one inherited
+      inheritLabels: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "Me",
+      email: "me@email.com"
+    });
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.originalPullRequest).toEqual({
+      number: 1,
+      author: "superuser",
+      url: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      htmlUrl: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      state: "merged",
+      merged: true,
+      mergedBy: "superuser",
+      title: "Update test.txt",
+      body: "This is the body",
+      reviewers: ["superuser1", "superuser2"],
+      assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -451,10 +516,23 @@ describe("gitlab merge request config parser", () => {
         project: "backporting-example",
         cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
       },
-      bpBranchName: undefined,
+      nCommits: 1,
+      commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
+      title: "New Title",
+      body: "New Body Prefix -New Body",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      labels: ["custom-label", "gitlab-original-label"],
+      comments: [],
     });
   });
-
     
   test("using simple config file", async () => {
     spyGetInput({
@@ -464,13 +542,17 @@ describe("gitlab merge request config parser", () => {
     const args: Args = argsParser.parse();
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Gitlab",
       email: "noreply@gitlab.com"
     });
     expect(configs.auth).toEqual(undefined);
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -484,6 +566,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -497,25 +580,18 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Gitlab",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "[prod] Update test.txt",
       body: "**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1\r\n\r\nThis is the body",
       reviewers: ["superuser"],
       assignees: [],
-      targetRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      sourceRepo: {
-        owner: "superuser",
-        project: "backporting-example",
-        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
-      },
-      bpBranchName: undefined,
+      labels: [],
+      comments: [],
     });
   });
 
@@ -527,13 +603,17 @@ describe("gitlab merge request config parser", () => {
     const args: Args = argsParser.parse();
     const configs: Configs = await configParser.parseAndValidate(args);
 
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
     expect(configs.dryRun).toEqual(false);
     expect(configs.git).toEqual({
       user: "Me",
       email: "me@email.com"
     });
     expect(configs.auth).toEqual("my-token");
-    expect(configs.targetBranch).toEqual("prod");
     expect(configs.folder).toEqual(process.cwd() + "/bp");
     expect(configs.originalPullRequest).toEqual({
       number: 1,
@@ -547,6 +627,7 @@ describe("gitlab merge request config parser", () => {
       body: "This is the body",
       reviewers: ["superuser1", "superuser2"],
       assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -560,14 +641,61 @@ describe("gitlab merge request config parser", () => {
       nCommits: 1,
       commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
     });
-    expect(configs.backportPullRequest).toEqual({
-      author: "Me",
-      url: undefined,
-      htmlUrl: undefined,
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
       title: "New Title",
       body: "New Body Prefix -New Body",
       reviewers: [],
       assignees: ["user3", "user4"],
+      labels: ["cherry-pick :cherries:", "gitlab-original-label"],
+      comments: [],
+    });
+  });
+
+  test("still open pull request without squash", async () => {
+    const args: Args = {
+      dryRun: true,
+      auth: "whatever",
+      pullRequest: openPRUrl,
+      targetBranch: "prod",
+      gitUser: "Gitlab",
+      gitEmail: "noreply@gitlab.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+      squash: false,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 2, false);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), ["e4dd336a4a20f394df6665994df382fb1d193a11", "974519f65c9e0ed65277cd71026657a09fca05e7"]);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual("whatever");
+    expect(configs.git).toEqual({
+      user: "Gitlab",
+      email: "noreply@gitlab.com"
+    });
+    expect(configs.originalPullRequest).toEqual({
+      number: 2,
+      author: "superuser",
+      url: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2",
+      htmlUrl: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2",
+      state: "open",
+      merged: false,
+      mergedBy: undefined,
+      title: "Update test.txt opened",
+      body: "Still opened mr body",
+      reviewers: ["superuser"],
+      assignees: ["superuser"],
+      labels: [],
       targetRepo: {
         owner: "superuser",
         project: "backporting-example",
@@ -579,6 +707,188 @@ describe("gitlab merge request config parser", () => {
         cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
       },
       bpBranchName: undefined,
+      nCommits: 2,
+      commits: ["e4dd336a4a20f394df6665994df382fb1d193a11", "974519f65c9e0ed65277cd71026657a09fca05e7"]
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-e4dd336-974519f", 
+      base: "prod",
+      title: "[prod] Update test.txt opened",
+      body: "**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2\r\n\r\nStill opened mr body",
+      reviewers: ["superuser"],
+      assignees: [],
+      labels: [],
+      comments: [],
+    });
+  });
+
+  test("override backport pr with additional comments", async () => {
+    const args: Args = {
+      dryRun: false,
+      auth: "",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      gitUser: "Me",
+      gitEmail: "me@email.com",
+      title: "New Title",
+      body: "New Body",
+      bodyPrefix: "New Body Prefix -",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      inheritReviewers: false,
+      labels: [],
+      inheritLabels: false,
+      comments: ["First comment", "Second comment"],
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(false);
+    expect(configs.git).toEqual({
+      user: "Me",
+      email: "me@email.com"
+    });
+    expect(configs.auth).toEqual("");
+    expect(configs.folder).toEqual(process.cwd() + "/bp");
+    expect(configs.originalPullRequest).toEqual({
+      number: 1,
+      author: "superuser",
+      url: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      htmlUrl: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      state: "merged",
+      merged: true,
+      mergedBy: "superuser",
+      title: "Update test.txt",
+      body: "This is the body",
+      reviewers: ["superuser1", "superuser2"],
+      assignees: ["superuser"],
+      labels: ["gitlab-original-label"],
+      targetRepo: {
+        owner: "superuser",
+        project: "backporting-example",
+        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
+      },
+      sourceRepo: {
+        owner: "superuser",
+        project: "backporting-example",
+        cloneUrl: "https://my.gitlab.host.com/superuser/backporting-example.git"
+      },
+      nCommits: 1,
+      commits: ["ebb1eca696c42fd067658bd9b5267709f78ef38e"]
+    });
+    expect(configs.backportPullRequests.length).toEqual(1);
+    expect(configs.backportPullRequests[0]).toEqual({
+      owner: "superuser", 
+      repo: "backporting-example", 
+      head: "bp-prod-ebb1eca", 
+      base: "prod",
+      title: "New Title",
+      body: "New Body Prefix -New Body",
+      reviewers: [],
+      assignees: ["user3", "user4"],
+      labels: [],
+      comments: ["First comment", "Second comment"],
+    });
+  });
+
+  test("override token using auth arg", async () => {
+    process.env[AuthTokenId.GITLAB_TOKEN] = "mygitlabtoken";
+    const args: Args = {
+      dryRun: true,
+      auth: "whatever",
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "Gitlab",
+      gitEmail: "noreply@gitlab.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual("whatever");
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "Gitlab",
+      email: "noreply@gitlab.com"
+    });
+  });
+
+  test("auth using GITLAB_TOKEN has precedence over GIT_TOKEN env variable", async () => {
+    process.env[AuthTokenId.GIT_TOKEN] = "mygittoken";
+    process.env[AuthTokenId.GITLAB_TOKEN] = "mygitlabtoken";
+    const args: Args = {
+      dryRun: true,
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "Gitlab",
+      gitEmail: "noreply@gitlab.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual("mygitlabtoken");
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "Gitlab",
+      email: "noreply@gitlab.com"
+    });
+  });
+  
+  test("ignore env variables related to other git platforms", async () => {
+    process.env[AuthTokenId.CODEBERG_TOKEN] = "mycodebergtoken";
+    process.env[AuthTokenId.GITHUB_TOKEN] = "mygithubtoken";
+    const args: Args = {
+      dryRun: true,
+      pullRequest: mergedPRUrl,
+      targetBranch: "prod",
+      folder: "/tmp/test",
+      gitUser: "Gitlab",
+      gitEmail: "noreply@gitlab.com",
+      reviewers: [],
+      assignees: [],
+      inheritReviewers: true,
+    };
+
+    const configs: Configs = await configParser.parseAndValidate(args);
+
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.getPullRequest).toBeCalledWith("superuser", "backporting-example", 1, true);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledTimes(1);
+    expect(GitLabMapper.prototype.mapPullRequest).toBeCalledWith(expect.anything(), []);
+
+    expect(configs.dryRun).toEqual(true);
+    expect(configs.auth).toEqual(undefined);
+    expect(configs.folder).toEqual("/tmp/test");
+    expect(configs.git).toEqual({
+      user: "Gitlab",
+      email: "noreply@gitlab.com"
     });
   });
 });

test/service/git/git-cli.test.ts

@@ -114,4 +114,13 @@ describe("git cli service", () => {
     const output = spawnSync("git", ["cherry", "-v"], { cwd }).stdout.toString();
     expect(output.includes(expressionToTest)).toBe(false);
   });
+
+
+  test("git clone on already created repo", async () => {
+    await git.clone("remote", cwd, "tbranch");
+    
+    // use rev-parse to double check the current branch is the expected one
+    const post = spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd }).stdout.toString().trim();
+    expect(post).toEqual("tbranch");
+  });
 });

test/service/git/git-client-factory.test.ts

@@ -20,6 +20,11 @@ describe("git client factory test", () => {
     expect(client).toBeInstanceOf(GitLabClient);
   });
 
+  test("correctly create codeberg client", () => {
+    const client = GitClientFactory.getOrCreate(GitClientType.CODEBERG, "auth", "apiurl");
+    expect(client).toBeInstanceOf(GitHubClient);
+  });
+
   test("check get service github", () => {
     const create = GitClientFactory.getOrCreate(GitClientType.GITHUB, "auth", "apiurl");
     const get = GitClientFactory.getClient();
@@ -31,4 +36,10 @@ describe("git client factory test", () => {
     const get = GitClientFactory.getClient();
     expect(create).toStrictEqual(get);
   });
+
+  test("check get service codeberg", () => {
+    const create = GitClientFactory.getOrCreate(GitClientType.CODEBERG, "auth", "apiurl");
+    const get = GitClientFactory.getClient();
+    expect(create).toStrictEqual(get);
+  });
 });

test/service/git/git-util.test.ts

@@ -23,15 +23,35 @@ describe("check git utilities", () => {
     expect(inferGitApiUrl("http://github.acme-inc.com/superuser/backporting-example/pull/4", "v3")).toStrictEqual("http://github.acme-inc.com/api/v3");
   });
 
+  test("check infer github api from github api url", ()=> {
+    expect(inferGitApiUrl("https://api.github.com/repos/owner/repo/pulls/1")).toStrictEqual("https://api.github.com");
+  });
+
+  test("check infer codeberg api", ()=> {
+    expect(inferGitApiUrl("https://codeberg.org/lampajr/backporting-example/pulls/1", "v1")).toStrictEqual("https://codeberg.org/api/v1");
+  });
+
+  test("check infer codeberg api", ()=> {
+    expect(inferGitApiUrl("https://codeberg.org/lampajr/backporting-example/pulls/1", undefined)).toStrictEqual("https://codeberg.org/api/v4");
+  });
+
   test("check infer github client", ()=> {
-    expect(inferGitClient("https://github.com/superuser/backporting-example/-/merge_requests/4")).toStrictEqual(GitClientType.GITHUB);
+    expect(inferGitClient("https://github.com/superuser/backporting-example/pull/4")).toStrictEqual(GitClientType.GITHUB);
   });
 
   test("check infer gitlab client", ()=> {
     expect(inferGitClient("https://my.gitlab.awesome.com/superuser/backporting-example/-/merge_requests/4")).toStrictEqual(GitClientType.GITLAB);
   });
 
-  test("Not recognized git client type", ()=> {
+  test("not recognized git client type", ()=> {
     expect(() => inferGitClient("https://not.recognized/superuser/backporting-example/-/merge_requests/4")).toThrowError("Remote git service not recognized from pr url: https://not.recognized/superuser/backporting-example/-/merge_requests/4");
   });
+
+  test("check infer github client using github api", ()=> {
+    expect(inferGitClient("https://api.github.com/repos/owner/repo/pulls/1")).toStrictEqual(GitClientType.GITHUB);
+  });
+
+  test("check infer codeberg client", ()=> {
+    expect(inferGitClient("https://codeberg.org/lampajr/backporting-example/pulls/1")).toStrictEqual(GitClientType.CODEBERG);
+  });
 });

test/service/git/github/github-client.test.ts

@@ -1,7 +1,7 @@
 import GitClientFactory from "@bp/service/git/git-client-factory";
 import { GitPullRequest, GitClientType } from "@bp/service/git/git.types";
 import GitHubClient from "@bp/service/git/github/github-client";
-import { mergedPullRequestFixture, repo, targetOwner } from "../../../support/mock/github-data";
+import { MERGED_PR_FIXTURE, REPO, TARGET_OWNER } from "../../../support/mock/github-data";
 import { mockGitHubClient } from "../../../support/mock/git-client-mock-support";
 
 describe("github service", () => {
@@ -22,7 +22,7 @@ describe("github service", () => {
   });
 
   test("get pull request: success", async () => {
-    const res: GitPullRequest = await gitClient.getPullRequest(targetOwner, repo, mergedPullRequestFixture.number);
+    const res: GitPullRequest = await gitClient.getPullRequest(TARGET_OWNER, REPO, MERGED_PR_FIXTURE.number);
     expect(res.sourceRepo).toEqual({
       owner: "fork",
       project: "reponame",

test/service/git/gitlab/gitlab-client.test.ts

@@ -29,11 +29,7 @@ describe("github service", () => {
     GitClientFactory.reset();
     gitClient = GitClientFactory.getOrCreate(GitClientType.GITLAB, "whatever", "apiUrl") as GitLabClient;
   });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
+  
   test("get merged pull request", async () => {
     const res: GitPullRequest = await gitClient.getPullRequest("superuser", "backporting-example", 1);
     
@@ -92,6 +88,8 @@ describe("github service", () => {
       head: "bp-branch",
       reviewers: [],
       assignees: [],
+      labels: [],
+      comments: [],
     };
     
     const url: string = await gitClient.createPullRequest(backport);
@@ -121,6 +119,8 @@ describe("github service", () => {
       head: "bp-branch",
       reviewers: ["superuser", "invalid"],
       assignees: [],
+      labels: [],
+      comments: [],
     };
     
     const url: string = await gitClient.createPullRequest(backport);
@@ -155,6 +155,8 @@ describe("github service", () => {
       head: "bp-branch",
       reviewers: [],
       assignees: ["superuser", "invalid"],
+      labels: [],
+      comments: [],
     };
     
     const url: string = await gitClient.createPullRequest(backport);
@@ -189,6 +191,8 @@ describe("github service", () => {
       head: "bp-branch-2",
       reviewers: ["superuser", "invalid"],
       assignees: [],
+      labels: [],
+      comments: [],
     };
     
     const url: string = await gitClient.createPullRequest(backport);
@@ -223,6 +227,8 @@ describe("github service", () => {
       head: "bp-branch-2",
       reviewers: [],
       assignees: ["superuser", "invalid"],
+      labels: [],
+      comments: [],
     };
     
     const url: string = await gitClient.createPullRequest(backport);
@@ -246,4 +252,100 @@ describe("github service", () => {
       assignee_ids: [14041],
     });
   });
+
+  test("create backport pull request with custom labels", async () => {
+    const backport: BackportPullRequest = {
+      title: "Backport Title",
+      body: "Backport Body",
+      owner: "superuser",
+      repo: "backporting-example",
+      base: "old/branch",
+      head: "bp-branch-2",
+      reviewers: [],
+      assignees: [],
+      labels: ["label1", "label2"],
+      comments: [],
+    };
+    
+    const url: string = await gitClient.createPullRequest(backport);
+    expect(url).toStrictEqual("https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/" + SECOND_NEW_GITLAB_MR_ID);
+
+    // check axios invocation
+    expect(axiosInstanceSpy.post).toBeCalledTimes(1);
+    expect(axiosInstanceSpy.post).toBeCalledWith("/projects/superuser%2Fbackporting-example/merge_requests", expect.objectContaining({
+      source_branch: "bp-branch-2",
+      target_branch: "old/branch",
+      title: "Backport Title",
+      description: "Backport Body",
+      reviewer_ids: [],
+      assignee_ids: [],
+    }));
+    expect(axiosInstanceSpy.get).toBeCalledTimes(0);
+    expect(axiosInstanceSpy.put).toBeCalledTimes(1); // just labels
+    expect(axiosInstanceSpy.put).toBeCalledWith("/projects/superuser%2Fbackporting-example/merge_requests/" + SECOND_NEW_GITLAB_MR_ID, {
+      labels: "label1,label2",
+    });
+  });
+
+  test("create backport pull request with post comments", async () => {
+    const backport: BackportPullRequest = {
+      title: "Backport Title",
+      body: "Backport Body",
+      owner: "superuser",
+      repo: "backporting-example",
+      base: "old/branch",
+      head: "bp-branch-2",
+      reviewers: [],
+      assignees: [],
+      labels: [],
+      comments: ["this is first comment", "this is second comment"],
+    };
+    
+    const url: string = await gitClient.createPullRequest(backport);
+    expect(url).toStrictEqual("https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/" + SECOND_NEW_GITLAB_MR_ID);
+
+    // check axios invocation
+    expect(axiosInstanceSpy.post).toBeCalledTimes(3); // also comments
+    expect(axiosInstanceSpy.post).toBeCalledWith("/projects/superuser%2Fbackporting-example/merge_requests", expect.objectContaining({
+      source_branch: "bp-branch-2",
+      target_branch: "old/branch",
+      title: "Backport Title",
+      description: "Backport Body",
+      reviewer_ids: [],
+      assignee_ids: [],
+    }));
+    expect(axiosInstanceSpy.get).toBeCalledTimes(0);
+    
+    expect(axiosInstanceSpy.post).toBeCalledWith("/projects/superuser%2Fbackporting-example/merge_requests/" + SECOND_NEW_GITLAB_MR_ID + "/notes", {
+      body: "this is first comment",
+    });
+    expect(axiosInstanceSpy.post).toBeCalledWith("/projects/superuser%2Fbackporting-example/merge_requests/" + SECOND_NEW_GITLAB_MR_ID + "/notes", {
+      body: "this is second comment",
+    });
+  });
+
+  test("get pull request for nested namespaces", async () => {
+    const res: GitPullRequest = await gitClient.getPullRequestFromUrl("https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example/-/merge_requests/4");
+    
+    // check content
+    expect(res.sourceRepo).toEqual({
+      owner: "superuser",
+      project: "backporting-example",
+      cloneUrl: "https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example.git"
+    });
+    expect(res.targetRepo).toEqual({
+      owner: "superuser",
+      project: "backporting-example",
+      cloneUrl: "https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example.git"
+    });
+    expect(res.title).toBe("Update test.txt");
+    expect(res.commits!.length).toBe(1);
+    expect(res.commits).toEqual(["ebb1eca696c42fd067658bd9b5267709f78ef38e"]);
+    
+    // check axios invocation
+    expect(axiosInstanceSpy.get).toBeCalledTimes(3); // merge request and 2 repos
+    expect(axiosInstanceSpy.get).toBeCalledWith("/projects/mysuperorg%2F6%2Fmysuperproduct%2Fmysuperunit%2Fbackporting-example/merge_requests/4");
+    expect(axiosInstanceSpy.get).toBeCalledWith("/projects/1645");
+    expect(axiosInstanceSpy.get).toBeCalledWith("/projects/1645");
+  });
 });

test/service/runner/cli-github-runner.test.ts

@@ -5,6 +5,8 @@ import GitHubClient from "@bp/service/git/github/github-client";
 import CLIArgsParser from "@bp/service/args/cli/cli-args-parser";
 import { addProcessArgs, createTestFile, removeTestFile, resetProcessArgs } from "../../support/utils";
 import { mockGitHubClient } from "../../support/mock/git-client-mock-support";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { BackportPullRequest, GitClientType } from "@bp/service/git/git.types";
 
 const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT_PATHNAME = "./cli-github-runner-pr-merged-with-overrides.json";
 const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT = {
@@ -21,10 +23,13 @@ const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT = {
   "reviewers": [],
   "assignees": ["user3", "user4"],
   "inheritReviewers": false,
+  "labels": ["cli github cherry pick :cherries:"],
+  "inheritLabels": true,
 };
 
 jest.mock("@bp/service/git/git-cli");
 jest.spyOn(GitHubClient.prototype, "createPullRequest");
+jest.spyOn(GitClientFactory, "getOrCreate");
 
 let parser: ArgsParser;
 let runner: Runner;
@@ -40,6 +45,10 @@ afterAll(() => {
 });
 
 beforeEach(() => {
+  // reset process.env variables
+  resetProcessArgs();
+
+  // mock octokit
   mockGitHubClient();
 
   // create CLI arguments parser
@@ -49,13 +58,6 @@ beforeEach(() => {
   runner = new Runner(parser);
 });
 
-afterEach(() => {
-  jest.clearAllMocks();
-  
-  // reset process.env variables
-  resetProcessArgs();
-});
-
 describe("cli runner", () => {
 
   test("with dry run", async () => {
@@ -71,17 +73,20 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -104,13 +109,13 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -131,17 +136,20 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/folder";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.addRemote).toBeCalledTimes(0);
     expect(GitCLIService.prototype.addRemote).toBeCalledTimes(0);
@@ -165,17 +173,20 @@ describe("cli runner", () => {
 
     const cwd = "/tmp/folder";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -193,33 +204,39 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
 
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
         owner: "owner", 
         repo: "reponame", 
-        head: "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", 
+        head: "bp-target-28f63db", 
         base: "target", 
         title: "[target] PR Title", 
-        body: expect.stringContaining("**Backport:** https://github.com/owner/reponame/pull/2368"),
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
         reviewers: ["gh-user", "that-s-a-user"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("same owner", async () => {
@@ -234,32 +251,38 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
 
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
         owner: "owner", 
         repo: "reponame", 
-        head: "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", 
+        head: "bp-target-28f63db", 
         base: "target", 
         title: "[target] PR Title", 
-        body: expect.stringContaining("**Backport:** https://github.com/owner/reponame/pull/8632"),
+        body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
         reviewers: ["gh-user", "that-s-a-user"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("closed and not merged pull request", async () => {
@@ -270,7 +293,7 @@ describe("cli runner", () => {
       "https://github.com/owner/reponame/pull/6666"
     ]);
 
-    expect(async () => await runner.execute()).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => runner.execute()).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
   test("open pull request", async () => {
@@ -285,33 +308,39 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9174896");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/4444/head:pr/4444");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "91748965051fae1330ad58d15cf694e103267c87", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9174896");
 
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
         owner: "owner", 
         repo: "reponame", 
-        head: "bp-target-91748965051fae1330ad58d15cf694e103267c87", 
+        head: "bp-target-9174896", 
         base: "target", 
         title: "[target] PR Title", 
-        body: expect.stringContaining("**Backport:** https://github.com/owner/reponame/pull/4444"),
+        body: "**Backport:** https://github.com/owner/reponame/pull/4444\r\n\r\nPlease review and merge",
         reviewers: ["gh-user"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("override backporting pr data", async () => {
@@ -325,19 +354,22 @@ describe("cli runner", () => {
       "--body",
       "New Body",
       "--body-prefix",
-      "New Body Prefix - ",
+      "New Body Prefix\\r\\n\\r\\n",
       "--bp-branch-name",
       "bp_branch_name",
       "--reviewers",
       "user1,user2",
       "--assignees",
-      "user3,user4"
+      "user3,user4",
     ]);
     
     await runner.execute();
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -348,7 +380,7 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -360,11 +392,14 @@ describe("cli runner", () => {
         head: "bp_branch_name", 
         base: "target", 
         title: "New Title", 
-        body: "New Body Prefix - New Body",
+        body: "New Body Prefix\r\n\r\nNew Body",
         reviewers: ["user1", "user2"],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("set empty reviewers", async () => {
@@ -390,6 +425,9 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -400,7 +438,7 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -415,8 +453,110 @@ describe("cli runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("set custom labels with inheritance", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "--labels",
+      "cherry-pick :cherries:, original-label",
+      "--inherit-labels",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "original-label"],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("set custom labels without inheritance", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "--labels",
+      "first-label, second-label ",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: ["first-label", "second-label"],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("using config file with overrides", async () => {
@@ -429,6 +569,9 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, "my-auth-token", "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -439,7 +582,7 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -454,7 +597,511 @@ describe("cli runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: ["cli github cherry pick :cherries:", "original-label"],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  // to check: https://github.com/kiegroup/git-backporting/issues/52
+  test("using github api url instead of html one", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://api.github.com/repos/owner/reponame/pulls/2368"
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("multiple commits pr", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/8632",
+      "--no-squash",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-0404fb9-11da4e3", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("too long bp branch name", async () => {
+    // 260 chars
+    const tooLongBranchName = "too-long-branch-name".repeat(13);
+
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "--bp-branch-name",
+      tooLongBranchName,
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    const truncatedBranch = tooLongBranchName.slice(0, 250);
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, truncatedBranch);
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, truncatedBranch);
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: truncatedBranch, 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("multiple commits pr with different strategy", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/8632",
+      "--no-squash",
+      "--strategy",
+      "ort",
+      "--strategy-option",
+      "find-renames",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", "ort", "find-renames");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", "ort", "find-renames");
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-0404fb9-11da4e3", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("additional pr comments", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://github.com/owner/reponame/pull/8632",
+      "--comments",
+      "first comment; second comment",
+      "--body",
+      "New body"
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nNew body",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: ["first comment", "second comment"],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("with multiple target branches", async () => {
+    addProcessArgs([
+      "-tb",
+      "v1, v2, v3",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "-f",
+      "/tmp/folder"
+    ]);
+    
+    await runner.execute();
+
+    const cwd = "/tmp/folder";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v1");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v2");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v3");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v1-28f63db");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v2-28f63db");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v3-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v1-28f63db");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v2-28f63db");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v3-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(3);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v1-28f63db", 
+        base: "v1", 
+        title: "[v1] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v2-28f63db", 
+        base: "v2", 
+        title: "[v2] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v3-28f63db", 
+        base: "v3", 
+        title: "[v3] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(3);
+  });
+
+  test("with multiple target branches and multiple bp names", async () => {
+    addProcessArgs([
+      "-tb",
+      "v1, v2, v3",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "-f",
+      "/tmp/folder",
+      "--bp-branch-name",
+      "custom1, custom1, custom2, custom3",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = "/tmp/folder";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v1");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v2");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v3");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom1");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom2");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom1");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom2");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(3);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom1", 
+        base: "v1", 
+        title: "[v1] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom2", 
+        base: "v2", 
+        title: "[v2] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom3", 
+        base: "v3", 
+        title: "[v3] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(3);
+  });
+
+  test("with multiple target branches and one failure", async () => {
+    jest.spyOn(GitHubClient.prototype, "createPullRequest").mockImplementation((_backport: BackportPullRequest) => {
+      
+      throw new Error("Mocked error");
+    });
+
+    addProcessArgs([
+      "-tb",
+      "v1, v2, v3",
+      "-pr",
+      "https://github.com/owner/reponame/pull/2368",
+      "-f",
+      "/tmp/folder",
+      "--bp-branch-name",
+      "custom-failure-head",
+    ]);
+    
+    await expect(() => runner.execute()).rejects.toThrowError("Failure occurred during one of the backports: [Error: Mocked error ; Error: Mocked error ; Error: Mocked error]");
+
+    const cwd = "/tmp/folder";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v1");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v2");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v3");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-failure-head-v1");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-failure-head-v2");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-failure-head-v3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-failure-head-v1");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-failure-head-v2");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-failure-head-v3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(3);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-failure-head-v1", 
+        base: "v1", 
+        title: "[v1] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-failure-head-v2", 
+        base: "v2", 
+        title: "[v2] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-failure-head-v3", 
+        base: "v3", 
+        title: "[v3] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toThrowError();
   });
 });

test/service/runner/cli-gitlab-runner.test.ts

@@ -6,6 +6,8 @@ import CLIArgsParser from "@bp/service/args/cli/cli-args-parser";
 import { addProcessArgs, createTestFile, removeTestFile, resetProcessArgs } from "../../support/utils";
 import { getAxiosMocked } from "../../support/mock/git-client-mock-support";
 import { MERGED_SQUASHED_MR } from "../../support/mock/gitlab-data";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { GitClientType } from "@bp/service/git/git.types";
 
 const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT_PATHNAME = "./cli-gitlab-runner-pr-merged-with-overrides.json";
 const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
@@ -21,6 +23,8 @@ const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
   "reviewers": [],
   "assignees": ["user3", "user4"],
   "inheritReviewers": false,
+  "labels": ["cli gitlab cherry pick :cherries:"],
+  "inheritLabels": true,
 };
 
 jest.mock("axios", () => {
@@ -32,13 +36,14 @@ jest.mock("axios", () => {
           iid: 1, // FIXME: I am not testing this atm
         }
       }),
-      put: jest.fn(),
+      put: async () => undefined,
     }),
   };
 });
 
 jest.mock("@bp/service/git/git-cli");
 jest.spyOn(GitLabClient.prototype, "createPullRequest");
+jest.spyOn(GitClientFactory, "getOrCreate");
 
 
 let parser: ArgsParser;
@@ -55,6 +60,9 @@ afterAll(() => {
 });
 
 beforeEach(() => {
+  // reset process.env variables
+  resetProcessArgs();
+
   // create CLI arguments parser
   parser = new CLIArgsParser();
 
@@ -62,15 +70,7 @@ beforeEach(() => {
   runner = new Runner(parser);
 });
 
-afterEach(() => {
-  jest.clearAllMocks();
-  
-  // reset process.env variables
-  resetProcessArgs();
-});
-
 describe("cli runner", () => {
-
   test("with dry run", async () => {
     addProcessArgs([
       "-d",
@@ -84,17 +84,20 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -115,17 +118,20 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/folder";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.addRemote).toBeCalledTimes(0);
     expect(GitCLIService.prototype.addRemote).toBeCalledTimes(0);
@@ -146,31 +152,36 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9e15674");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644", 
+        head: "bp-target-9e15674", 
         base: "target", 
         title: "[target] Update test.txt opened", 
         body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2"),
         reviewers: ["superuser"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -183,7 +194,7 @@ describe("cli runner", () => {
       "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/3"
     ]);
 
-    expect(async () => await runner.execute()).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => runner.execute()).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
   test("merged pull request", async () => {
@@ -198,32 +209,37 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
     
     // 0 occurrences as the mr is already merged and the owner is the same for
     // both source and target repositories
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e", 
+        head: "bp-target-ebb1eca", 
         base: "target", 
         title: "[target] Update test.txt", 
         body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
         reviewers: ["superuser"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -253,6 +269,9 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
@@ -263,7 +282,7 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -278,6 +297,8 @@ describe("cli runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: ["user1", "user2"],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -305,6 +326,9 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
@@ -315,7 +339,7 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -330,6 +354,107 @@ describe("cli runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
+      }
+    );
+  });
+
+  test("set custom labels with inheritance", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      "--labels",
+      "cherry-pick :cherries:, another-label",
+      "--inherit-labels",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
+    
+    // 0 occurrences as the mr is already merged and the owner is the same for
+    // both source and target repositories
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-ebb1eca", 
+        base: "target", 
+        title: "[target] Update test.txt", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label", "gitlab-original-label"],
+        comments: [],
+      }
+    );
+  });
+
+  test("set custom labels without inheritance", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      "--labels",
+      "cherry-pick :cherries:, another-label",
+    ]);
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
+    
+    // 0 occurrences as the mr is already merged and the owner is the same for
+    // both source and target repositories
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-ebb1eca", 
+        base: "target", 
+        title: "[target] Update test.txt", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label"],
+        comments: [],
       }
     );
   });
@@ -344,32 +469,85 @@ describe("cli runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, "my-token", "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "prod");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-prod-ebb1eca");
     
     // 0 occurrences as the mr is already merged and the owner is the same for
     // both source and target repositories
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-prod-ebb1eca");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e", 
+        head: "bp-prod-ebb1eca", 
         base: "prod", 
         title: "New Title", 
         body: expect.stringContaining("**This is a backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: ["cli gitlab cherry pick :cherries:", "gitlab-original-label"],
+        comments: [],
+      }
+    );
+  });
+
+  test("multiple commits without squash", async () => {
+    addProcessArgs([
+      "-tb",
+      "target",
+      "-pr",
+      "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2",
+      "--no-squash",
+    ]);
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-e4dd336-974519f");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "974519f65c9e0ed65277cd71026657a09fca05e7", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-e4dd336-974519f");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-e4dd336-974519f",
+        base: "target", 
+        title: "[target] Update test.txt opened", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });

test/service/runner/gha-github-runner.test.ts

@@ -5,6 +5,8 @@ import GitHubClient from "@bp/service/git/github/github-client";
 import GHAArgsParser from "@bp/service/args/gha/gha-args-parser";
 import { createTestFile, removeTestFile, spyGetInput } from "../../support/utils";
 import { mockGitHubClient } from "../../support/mock/git-client-mock-support";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { GitClientType } from "@bp/service/git/git.types";
 
 const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT_PATHNAME = "./gha-github-runner-pr-merged-with-overrides.json";
 const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT = {
@@ -21,11 +23,14 @@ const GITHUB_MERGED_PR_W_OVERRIDES_CONFIG_FILE_CONTENT = {
   "reviewers": [],
   "assignees": ["user3", "user4"],
   "inheritReviewers": false,
+  "labels": ["gha github cherry pick :cherries:"],
+  "inheritLabels": true,
 };
 
 
 jest.mock("@bp/service/git/git-cli");
 jest.spyOn(GitHubClient.prototype, "createPullRequest");
+jest.spyOn(GitClientFactory, "getOrCreate");
 
 let parser: ArgsParser;
 let runner: Runner;
@@ -50,10 +55,6 @@ beforeEach(() => {
   runner = new Runner(parser);
 });
 
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
 describe("gha runner", () => {
   test("with dry run", async () => {
     spyGetInput({
@@ -66,17 +67,20 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -92,33 +96,39 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
 
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
         owner: "owner", 
         repo: "reponame", 
-        head: "bp-target-28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", 
+        head: "bp-target-28f63db", 
         base: "target", 
         title: "[target] PR Title", 
-        body: expect.stringContaining("**Backport:** https://github.com/owner/reponame/pull/2368"),
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
         reviewers: ["gh-user", "that-s-a-user"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("closed and not merged pull request", async () => {
@@ -127,7 +137,7 @@ describe("gha runner", () => {
       "pull-request": "https://github.com/owner/reponame/pull/6666"
     });
 
-    expect(async () => await runner.execute()).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => runner.execute()).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
   test("open pull request", async () => {
@@ -140,33 +150,39 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9174896");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/4444/head:pr/4444");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "91748965051fae1330ad58d15cf694e103267c87", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-91748965051fae1330ad58d15cf694e103267c87");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9174896");
 
     expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
         owner: "owner", 
         repo: "reponame", 
-        head: "bp-target-91748965051fae1330ad58d15cf694e103267c87", 
+        head: "bp-target-9174896", 
         base: "target", 
         title: "[target] PR Title", 
-        body: expect.stringContaining("**Backport:** https://github.com/owner/reponame/pull/4444"),
+        body: "**Backport:** https://github.com/owner/reponame/pull/4444\r\n\r\nPlease review and merge",
         reviewers: ["gh-user"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("override backporting pr data", async () => {
@@ -175,7 +191,7 @@ describe("gha runner", () => {
       "pull-request": "https://github.com/owner/reponame/pull/2368",
       "title": "New Title",
       "body": "New Body",
-      "body-prefix": "New Body Prefix - ",
+      "body-prefix": "New Body Prefix\\r\\n\\r\\n",
       "bp-branch-name": "bp_branch_name",
       "reviewers": "user1, user2",
       "assignees": "user3, user4",
@@ -185,6 +201,9 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -195,7 +214,7 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -207,11 +226,14 @@ describe("gha runner", () => {
         head: "bp_branch_name", 
         base: "target", 
         title: "New Title", 
-        body: "New Body Prefix - New Body",
+        body: "New Body Prefix\r\n\r\nNew Body",
         reviewers: ["user1", "user2"],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("set empty reviewers", async () => {
@@ -231,6 +253,9 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -241,7 +266,7 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -256,8 +281,105 @@ describe("gha runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("set custom labels with inheritance", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://github.com/owner/reponame/pull/2368",
+      "labels": "cherry-pick :cherries:, another-label",
+      "inherit-labels": "true",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label", "original-label"],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("set custom labels without inheritance", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://github.com/owner/reponame/pull/2368",
+      "labels": "cherry-pick :cherries:, another-label",
+      "inherit-labels": "false",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label"],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
   });
 
   test("using config file with overrides", async () => {
@@ -269,6 +391,9 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, "my-auth-token", "https://api.github.com");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
 
@@ -279,7 +404,7 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -294,7 +419,350 @@ describe("gha runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: ["gha github cherry pick :cherries:", "original-label"],
+        comments: [],
       }
     );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  // to check: https://github.com/kiegroup/git-backporting/issues/52
+  test("using github api url instead of html one", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://api.github.com/repos/owner/reponame/pulls/2368"
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("multiple commits pr", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://api.github.com/repos/owner/reponame/pulls/8632",
+      "no-squash": "true",
+    });
+    
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-0404fb9-11da4e3", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/8632\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("using github api url and different strategy", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://api.github.com/repos/owner/reponame/pulls/2368",
+      "strategy": "ort",
+      "strategy-option": "ours",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", "ort", "ours");
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("additional pr comments", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://github.com/owner/reponame/pull/2368",
+      "comments": "first comment; second comment",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-target-28f63db", 
+        base: "target", 
+        title: "[target] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: ["first comment", "second comment"],
+      }
+    );
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(1);
+  });
+
+  test("with multiple target branches", async () => {
+    spyGetInput({
+      "target-branch": "v1, v2, v3",
+      "pull-request": "https://github.com/owner/reponame/pull/2368",
+      "folder": "/tmp/folder",
+    });
+    
+    await runner.execute();
+
+    const cwd = "/tmp/folder";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v1");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v2");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v3");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v1-28f63db");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v2-28f63db");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-v3-28f63db");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v1-28f63db");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v2-28f63db");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-v3-28f63db");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(3);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v1-28f63db", 
+        base: "v1", 
+        title: "[v1] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v2-28f63db", 
+        base: "v2", 
+        title: "[v2] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "bp-v3-28f63db", 
+        base: "v3", 
+        title: "[v3] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(3);
+  });
+
+  test("with multiple target branches and single custom bp branch", async () => {
+    spyGetInput({
+      "target-branch": "v1, v2, v3",
+      "pull-request": "https://github.com/owner/reponame/pull/2368",
+      "folder": "/tmp/folder",
+      "bp-branch-name": "custom"
+    });
+    
+    await runner.execute();
+
+    const cwd = "/tmp/folder";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITHUB, undefined, "https://api.github.com");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v1");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v2");
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://github.com/owner/reponame.git", cwd, "v3");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-v1");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-v2");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "custom-v3");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/2368/head:pr/2368");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(3);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-v1");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-v2");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "custom-v3");
+
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledTimes(3);
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-v1", 
+        base: "v1", 
+        title: "[v1] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-v2", 
+        base: "v2", 
+        title: "[v2] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "owner", 
+        repo: "reponame", 
+        head: "custom-v3", 
+        base: "v3", 
+        title: "[v3] PR Title", 
+        body: "**Backport:** https://github.com/owner/reponame/pull/2368\r\n\r\nPlease review and merge",
+        reviewers: ["gh-user", "that-s-a-user"],
+        assignees: [],
+        labels: [],
+        comments: [],
+    });
+    expect(GitHubClient.prototype.createPullRequest).toReturnTimes(3);
   });
 });

test/service/runner/gha-gitlab-runner.test.ts

@@ -6,6 +6,8 @@ import GHAArgsParser from "@bp/service/args/gha/gha-args-parser";
 import { createTestFile, removeTestFile, spyGetInput } from "../../support/utils";
 import { getAxiosMocked } from "../../support/mock/git-client-mock-support";
 import { MERGED_SQUASHED_MR } from "../../support/mock/gitlab-data";
+import GitClientFactory from "@bp/service/git/git-client-factory";
+import { GitClientType } from "@bp/service/git/git.types";
 
 const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT_PATHNAME = "./gha-gitlab-runner-pr-merged-with-overrides.json";
 const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
@@ -21,6 +23,8 @@ const GITLAB_MERGED_PR_COMPLEX_CONFIG_FILE_CONTENT = {
   "reviewers": [],
   "assignees": ["user3", "user4"],
   "inheritReviewers": false,
+  "labels": ["gha gitlab cherry pick :cherries:"],
+  "inheritLabels": true,
 };
 
 jest.mock("axios", () => {
@@ -32,13 +36,14 @@ jest.mock("axios", () => {
           iid: 1, // FIXME: I am not testing this atm
         }
       }),
-      put: jest.fn(),
+      put: async () => undefined, // make it async so that .catch doesn't throw an error
     }),
   };
 });
 
 jest.mock("@bp/service/git/git-cli");
 jest.spyOn(GitLabClient.prototype, "createPullRequest");
+jest.spyOn(GitClientFactory, "getOrCreate");
 
 let parser: ArgsParser;
 let runner: Runner;
@@ -61,10 +66,6 @@ beforeEach(() => {
   runner = new Runner(parser);
 });
 
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
 describe("gha runner", () => {
   test("with dry run", async () => {
     spyGetInput({
@@ -77,17 +78,20 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(0);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(0);
@@ -103,31 +107,36 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-9e15674");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-9e15674");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-target-9e15674ebd48e05c6e428a1fa31dbb60a778d644", 
+        head: "bp-target-9e15674", 
         base: "target", 
         title: "[target] Update test.txt opened", 
         body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2"),
         reviewers: ["superuser"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -138,7 +147,7 @@ describe("gha runner", () => {
       "pull-request": "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/3"
     });
 
-    expect(async () => await runner.execute()).rejects.toThrow("Provided pull request is closed and not merged!");
+    await expect(() => runner.execute()).rejects.toThrow("Provided pull request is closed and not merged");
   });
 
   test("merged pull request", async () => {
@@ -151,30 +160,35 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
     
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-target-ebb1eca696c42fd067658bd9b5267709f78ef38e", 
+        head: "bp-target-ebb1eca", 
         base: "target", 
         title: "[target] Update test.txt", 
         body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
         reviewers: ["superuser"],
         assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -195,6 +209,9 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
@@ -205,7 +222,7 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -220,6 +237,8 @@ describe("gha runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: ["user1", "user2"],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
       }
     );
   });
@@ -241,6 +260,9 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
 
@@ -251,7 +273,7 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "9e15674ebd48e05c6e428a1fa31dbb60a778d644", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp_branch_name");
@@ -266,6 +288,97 @@ describe("gha runner", () => {
         body: "New Body Prefix - New Body",
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: [],
+        comments: [],
+      }
+    );
+  });
+
+  test("set custom labels with inheritance", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      "labels": "cherry-pick :cherries:, another-label",
+      "inherit-labels": "true",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-ebb1eca", 
+        base: "target", 
+        title: "[target] Update test.txt", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label", "gitlab-original-label"],
+        comments: [],
+      }
+    );
+  });
+
+  test("set custom labels without inheritance", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1",
+      "labels": "cherry-pick :cherries:, another-label",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-ebb1eca");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-ebb1eca");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-ebb1eca", 
+        base: "target", 
+        title: "[target] Update test.txt", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: ["cherry-pick :cherries:", "another-label"],
+        comments: [],
       }
     );
   });
@@ -279,32 +392,83 @@ describe("gha runner", () => {
 
     const cwd = process.cwd() + "/bp";
 
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, "my-token", "https://my.gitlab.host.com/api/v4");
+
     expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
     expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "prod");
 
     expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-prod-ebb1eca");
     
     // 0 occurrences as the mr is already merged and the owner is the same for
     // both source and target repositories
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "ebb1eca696c42fd067658bd9b5267709f78ef38e", undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e");
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-prod-ebb1eca");
 
     expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
     expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
         owner: "superuser", 
         repo: "backporting-example", 
-        head: "bp-prod-ebb1eca696c42fd067658bd9b5267709f78ef38e", 
+        head: "bp-prod-ebb1eca", 
         base: "prod", 
         title: "New Title", 
         body: expect.stringContaining("**This is a backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/1"),
         reviewers: [],
         assignees: ["user3", "user4"],
+        labels: ["gha gitlab cherry pick :cherries:", "gitlab-original-label"],
+        comments: [],
+      }
+    );
+  });
+
+  test("multiple commits without squash", async () => {
+    spyGetInput({
+      "target-branch": "target",
+      "pull-request": "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2",
+      "no-squash": "true",
+    });
+
+    await runner.execute();
+
+    const cwd = process.cwd() + "/bp";
+
+    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
+    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
+
+    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
+
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-e4dd336-974519f");
+    
+    expect(GitCLIService.prototype.fetch).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
+
+    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "974519f65c9e0ed65277cd71026657a09fca05e7", undefined, undefined);
+
+    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
+    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-e4dd336-974519f");
+
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
+    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
+        owner: "superuser", 
+        repo: "backporting-example", 
+        head: "bp-target-e4dd336-974519f",
+        base: "target", 
+        title: "[target] Update test.txt opened", 
+        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/2"),
+        reviewers: ["superuser"],
+        assignees: [],
+        labels: [],
+        comments: [],
       }
     );
   });

test/support/mock/git-client-mock-support.ts

@@ -1,7 +1,11 @@
 import LoggerServiceFactory from "@bp/service/logger/logger-service-factory";
 import { Moctokit } from "@kie/mock-github";
-import { targetOwner, repo, mergedPullRequestFixture, openPullRequestFixture, notMergedPullRequestFixture, notFoundPullRequestNumber, sameOwnerPullRequestFixture } from "./github-data";
-import { CLOSED_NOT_MERGED_MR, MERGED_SQUASHED_MR, OPEN_MR, PROJECT_EXAMPLE, SUPERUSER} from "./gitlab-data";
+import { TARGET_OWNER, REPO, MERGED_PR_FIXTURE, OPEN_PR_FIXTURE, NOT_MERGED_PR_FIXTURE, NOT_FOUND_PR_NUMBER, MULT_COMMITS_PR_FIXTURE, MULT_COMMITS_PR_COMMITS, NEW_PR_URL, NEW_PR_NUMBER } from "./github-data";
+import { CLOSED_NOT_MERGED_MR, MERGED_SQUASHED_MR, NESTED_NAMESPACE_MR, OPEN_MR, OPEN_PR_COMMITS, PROJECT_EXAMPLE, NESTED_PROJECT_EXAMPLE, SUPERUSER} from "./gitlab-data";
+
+// high number, for each test we are not expecting 
+// to send more than 3 reqs per api endpoint
+const REPEAT = 20;
 
 const logger = LoggerServiceFactory.getLogger();
 
@@ -18,10 +22,16 @@ export const getAxiosMocked = (url: string) => {
     data = OPEN_MR;
   } else if (url.endsWith("merge_requests/3")) {
     data = CLOSED_NOT_MERGED_MR;
+  }  else if (url.endsWith("merge_requests/4")) {
+    data = NESTED_NAMESPACE_MR;
   } else if (url.endsWith("projects/76316")) {
     data = PROJECT_EXAMPLE;
+  } else if (url.endsWith("projects/1645")) {
+    data = NESTED_PROJECT_EXAMPLE;
   } else if (url.endsWith("users?username=superuser")) {
     data = [SUPERUSER];
+  } else if (url.endsWith("merge_requests/2/commits")) {
+    data = OPEN_PR_COMMITS;
   }
 
   return {
@@ -32,18 +42,24 @@ export const getAxiosMocked = (url: string) => {
 
 export const NEW_GITLAB_MR_ID = 999;
 export const SECOND_NEW_GITLAB_MR_ID = 1000;
-export const postAxiosMocked = (_url: string, data?: {source_branch: string,}) => {
+export const postAxiosMocked = async (url: string, data?: {source_branch: string,}) => {
   let responseData = undefined;
 
   // gitlab
 
-  if (data?.source_branch === "bp-branch") {
+  if (url.includes("notes")) {
+    // creating comments
+    responseData = {
+      // we do not need the whole response
+      iid: NEW_GITLAB_MR_ID,
+    };
+  } else if (data?.source_branch === "bp-branch") {
     responseData = {
       // we do not need the whole response
       iid: NEW_GITLAB_MR_ID,
       web_url: "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/" + NEW_GITLAB_MR_ID
     };
-  } if (data?.source_branch === "bp-branch-2") {
+  } else if (data?.source_branch === "bp-branch-2") {
     responseData = {
       // we do not need the whole response
       iid: SECOND_NEW_GITLAB_MR_ID,
@@ -57,7 +73,7 @@ export const postAxiosMocked = (_url: string, data?: {source_branch: string,}) =
   };
 };
 
-export const putAxiosMocked = (url: string, _data?: unknown) => {
+export const putAxiosMocked = async (url: string, _data?: unknown) => {
   const responseData = undefined;
 
   // gitlab
@@ -77,7 +93,7 @@ export const putAxiosMocked = (url: string, _data?: unknown) => {
 // GITHUB - OCTOKIT
 
 export const mockGitHubClient = (apiUrl = "https://api.github.com"): Moctokit => {
-  logger.debug("Setting up moctokit.");
+  logger.debug("Setting up moctokit..");
   
   const mock = new Moctokit(apiUrl);
 
@@ -86,83 +102,116 @@ export const mockGitHubClient = (apiUrl = "https://api.github.com"): Moctokit =>
   // valid requests
   mock.rest.pulls
     .get({
-      owner: targetOwner,
-      repo: repo,
-      pull_number: mergedPullRequestFixture.number
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: MERGED_PR_FIXTURE.number
     })
     .reply({
       status: 200,
-      data: mergedPullRequestFixture
+      data: MERGED_PR_FIXTURE
     });
 
-  mock.rest.pulls
-  .get({
-    owner: targetOwner,
-    repo: repo,
-    pull_number: sameOwnerPullRequestFixture.number
-  })
-  .reply({
-    status: 200,
-    data: sameOwnerPullRequestFixture
-  });
-  
   mock.rest.pulls
     .get({
-      owner: targetOwner,
-      repo: repo,
-      pull_number: openPullRequestFixture.number
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: MULT_COMMITS_PR_FIXTURE.number
     })
     .reply({
       status: 200,
-      data: openPullRequestFixture
+      data: MULT_COMMITS_PR_FIXTURE
     });
   
   mock.rest.pulls
-  .get({
-    owner: targetOwner,
-    repo: repo,
-    pull_number: notMergedPullRequestFixture.number
-  })
-  .reply({
-    status: 200,
-    data: notMergedPullRequestFixture
-  });
+    .get({
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: OPEN_PR_FIXTURE.number
+    })
+    .reply({
+      status: 200,
+      data: OPEN_PR_FIXTURE
+    });
+  
+  mock.rest.pulls
+    .get({
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: NOT_MERGED_PR_FIXTURE.number
+    })
+    .reply({
+      status: 200,
+      data: NOT_MERGED_PR_FIXTURE
+    });
+  
+  mock.rest.pulls
+    .listCommits({
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: MULT_COMMITS_PR_FIXTURE.number
+    })
+    .reply({
+      status: 200,
+      data: MULT_COMMITS_PR_COMMITS
+    });
   
   mock.rest.pulls
     .create()
     .reply({
+      repeat: REPEAT,
       status: 201,
-      data: mergedPullRequestFixture
+      data: {
+        number: NEW_PR_NUMBER,
+        html_url: NEW_PR_URL,
+      }
     });
 
   mock.rest.pulls
     .requestReviewers()
     .reply({
+      repeat: REPEAT,
       status: 201,
-      data: mergedPullRequestFixture
+      data: MERGED_PR_FIXTURE
     });
 
   mock.rest.issues
     .addAssignees()
     .reply({
+      repeat: REPEAT,
       status: 201,
       data: {}
     });
 
+  mock.rest.issues
+    .addLabels()
+    .reply({
+      repeat: REPEAT,
+      status: 200,
+      data: {}
+    });
+
+  mock.rest.issues
+    .createComment()
+    .reply({
+      repeat: REPEAT,
+      status: 201,
+      data: {}
+    });
 
   // invalid requests
   mock.rest.pulls
     .get({
-      owner: targetOwner,
-      repo: repo,
-      pull_number: notFoundPullRequestNumber
+      owner: TARGET_OWNER,
+      repo: REPO,
+      pull_number: NOT_FOUND_PR_NUMBER
     })
     .reply({
+      repeat: REPEAT,
       status: 404,
       data: {
         message: "Not found"
       }
     });
-    
+
   return mock;
 };

test/support/mock/github-data.ts

@@ -1,9 +1,11 @@
-export const targetOwner = "owner";
-export const sourceOwner = "fork";
-export const repo = "reponame";
-export const notFoundPullRequestNumber = 1;
+export const TARGET_OWNER = "owner";
+export const SOURCE_OWNER = "fork";
+export const REPO = "reponame";
+export const NOT_FOUND_PR_NUMBER = 1;
+export const NEW_PR_URL = "new_pr_url";
+export const NEW_PR_NUMBER = 9999;
 
-export const mergedPullRequestFixture = {
+export const MERGED_PR_FIXTURE = {
   "url": "https://api.github.com/repos/owner/reponame/pulls/2368",
   "id": 1137188271,
   "node_id": "PR_kwDOABTq6s5DyB2v",
@@ -91,7 +93,15 @@ export const mergedPullRequestFixture = {
 
   ],
   "labels": [
-
+    {
+      "id": 4901021057,
+      "node_id": "LA_kwDOImgs2354988AAAABJB-lgQ",
+      "url": "https://api.github.com/repos/owner/reponame/labels/original-label",
+      "name": "original-label",
+      "color": "AB975B",
+      "default": false,
+      "description": ""
+    }
   ],
   "milestone": null,
   "draft": false,
@@ -466,7 +476,7 @@ export const mergedPullRequestFixture = {
   "changed_files": 2
 };
 
-export const openPullRequestFixture = {
+export const OPEN_PR_FIXTURE = {
   "url": "https://api.github.com/repos/owner/reponame/pulls/4444",
   "id": 1137188271,
   "node_id": "PR_kwDOABTq6s5DyB2v",
@@ -890,7 +900,7 @@ export const openPullRequestFixture = {
   "changed_files": 2
 };
 
-export const notMergedPullRequestFixture = {
+export const NOT_MERGED_PR_FIXTURE = {
   "url": "https://api.github.com/repos/owner/reponame/pulls/6666",
   "id": 1137188271,
   "node_id": "PR_kwDOABTq6s5DyB2v",
@@ -1333,7 +1343,7 @@ export const notMergedPullRequestFixture = {
   "changed_files": 2
 };
 
-export const sameOwnerPullRequestFixture = {
+export const MULT_COMMITS_PR_FIXTURE = {
   "url": "https://api.github.com/repos/owner/reponame/pulls/8632",
   "id": 1137188271,
   "node_id": "PR_kwDOABTq6s5DyB2v",
@@ -1794,4 +1804,165 @@ export const sameOwnerPullRequestFixture = {
   "additions": 2,
   "deletions": 2,
   "changed_files": 2
-};
+};
+
+export const MULT_COMMITS_PR_COMMITS = [
+  {
+    "sha": "0404fb922ab75c3a8aecad5c97d9af388df04695",
+    "node_id": "C_kwDOImgs99oAKDA0MDRmYjkyMmFiNzVjM2E4YWVjYWQ1Yzk3ZDlhZjM4OGRmMDQ2OTU",
+    "commit": {
+      "author": {
+        "name": "owner",
+        "email": "owner@email.com",
+        "date": "2023-07-06T13:46:30Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2023-07-06T13:46:30Z"
+      },
+      "message": "Update file1.txt",
+      "tree": {
+        "sha": "50be1d7031b02a2ae609f432f2a1e0f818d827b2",
+        "url": "https://api.github.com/repos/owner/reponame/git/trees/50be1d7031b02a2ae609f432f2a1e0f818d827b2"
+      },
+      "url": "https://api.github.com/repos/owner/reponame/git/commits/0404fb922ab75c3a8aecad5c97d9af388df04695",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nno-signature=\n=fivd\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 50be1d7031b02a2ae609f432f2a1e0f818d827b2\nparent c85b8fcdb741814b3e90e6e5729455cf46ff26ea\nauthor Owner <owner@email.com> 1688651190 +0200\ncommitter GitHub <noreply@github.com> 1688651190 +0200\n\nUpdate file1.txt"
+      }
+    },
+    "url": "https://api.github.com/repos/owner/reponame/commits/0404fb922ab75c3a8aecad5c97d9af388df04695",
+    "html_url": "https://github.com/owner/reponame/commit/0404fb922ab75c3a8aecad5c97d9af388df04695",
+    "comments_url": "https://api.github.com/repos/owner/reponame/commits/0404fb922ab75c3a8aecad5c97d9af388df04695/comments",
+    "author": {
+      "login": "owner",
+      "id": 26715795,
+      "node_id": "MDQ6VXNlcjI2NzE1Nzk1",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26715795?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/owner",
+      "html_url": "https://github.com/owner",
+      "followers_url": "https://api.github.com/users/owner/followers",
+      "following_url": "https://api.github.com/users/owner/following{/other_user}",
+      "gists_url": "https://api.github.com/users/owner/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/owner/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/owner/subscriptions",
+      "organizations_url": "https://api.github.com/users/owner/orgs",
+      "repos_url": "https://api.github.com/users/owner/repos",
+      "events_url": "https://api.github.com/users/owner/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/owner/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "c85b8fcdb741814b3e90e6e5729455cf46ff26ea",
+        "url": "https://api.github.com/repos/owner/reponame/commits/c85b8fcdb741814b3e90e6e5729455cf46ff26ea",
+        "html_url": "https://github.com/owner/reponame/commit/c85b8fcdb741814b3e90e6e5729455cf46ff26ea"
+      }
+    ]
+  },
+  {
+    "sha": "11da4e38aa3e577ffde6d546f1c52e53b04d3151",
+    "node_id": "C_kwDOImgs99oAKDExZGE0ZTM4YWEzZTU3N2ZmZGU2ZDU0NmYxYzUyZTUzYjA0ZDMxNTE",
+    "commit": {
+      "author": {
+        "name": "Owner",
+        "email": "owner@email.com",
+        "date": "2023-07-10T13:23:44Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2023-07-10T13:23:44Z"
+      },
+      "message": "Update file2.txt",
+      "tree": {
+        "sha": "fdd16fb791eef26fd84c3bfa34fd89eb1f7a85be",
+        "url": "https://api.github.com/repos/owner/reponame/git/trees/fdd16fb791eef26fd84c3bfa34fd89eb1f7a85be"
+      },
+      "url": "https://api.github.com/repos/owner/reponame/git/commits/11da4e38aa3e577ffde6d546f1c52e53b04d3151",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nno-signature\n=//hm\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree fdd16fb791eef26fd84c3bfa34fd89eb1f7a85be\nparent 0404fb922ab75c3a8aecad5c97d9af388df04695\nauthor Owner <owner@email.com> 1688995424 +0200\ncommitter GitHub <noreply@github.com> 1688995424 +0200\n\nUpdate file2.txt"
+      }
+    },
+    "url": "https://api.github.com/repos/owner/reponame/commits/11da4e38aa3e577ffde6d546f1c52e53b04d3151",
+    "html_url": "https://github.com/owner/reponame/commit/11da4e38aa3e577ffde6d546f1c52e53b04d3151",
+    "comments_url": "https://api.github.com/repos/owner/reponame/commits/11da4e38aa3e577ffde6d546f1c52e53b04d3151/comments",
+    "author": {
+      "login": "owner",
+      "id": 26715795,
+      "node_id": "MDQ6VXNlcjI2NzE1Nzk1",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26715795?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/owner",
+      "html_url": "https://github.com/owner",
+      "followers_url": "https://api.github.com/users/owner/followers",
+      "following_url": "https://api.github.com/users/owner/following{/other_user}",
+      "gists_url": "https://api.github.com/users/owner/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/owner/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/owner/subscriptions",
+      "organizations_url": "https://api.github.com/users/owner/orgs",
+      "repos_url": "https://api.github.com/users/owner/repos",
+      "events_url": "https://api.github.com/users/owner/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/owner/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "0404fb922ab75c3a8aecad5c97d9af388df04695",
+        "url": "https://api.github.com/repos/owner/reponame/commits/0404fb922ab75c3a8aecad5c97d9af388df04695",
+        "html_url": "https://github.com/owner/reponame/commit/0404fb922ab75c3a8aecad5c97d9af388df04695"
+      }
+    ]
+  }
+];

test/support/mock/gitlab-data.ts

@@ -110,7 +110,7 @@ export const PROJECT_EXAMPLE = {
   "build_git_strategy":"fetch",
   "keep_latest_artifact":true,
   "restrict_user_defined_variables":false,
-  "runners_token":"GR13489419z7QQ54AUgJaNMFD5asU",
+  "runners_token":"TOKEN",
   "runner_token_expiration_interval":null,
   "group_runners_enabled":true,
   "auto_cancel_pending_pipelines":"enabled",
@@ -161,6 +161,166 @@ export const PROJECT_EXAMPLE = {
   }
 };
 
+export const NESTED_PROJECT_EXAMPLE = {
+   "id":1645,
+   "description":null,
+   "name":"Backporting Example",
+   "name_with_namespace":"Super User / Backporting Example",
+   "path":"backporting-example",
+   "path_with_namespace":"mysuperorg/6/mysuperproduct/mysuperunit/backporting-example",
+   "created_at":"2023-06-23T13:45:15.121Z",
+   "default_branch":"main",
+   "tag_list":[
+      
+   ],
+   "topics":[
+      
+   ],
+   "ssh_url_to_repo":"git@my.gitlab.host.com:mysuperorg/6/mysuperproduct/mysuperunit/backporting-example.git",
+   "http_url_to_repo":"https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example.git",
+   "web_url":"https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example",
+   "readme_url":"https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example/-/blob/main/README.md",
+   "forks_count":0,
+   "avatar_url":null,
+   "star_count":0,
+   "last_activity_at":"2023-06-28T14:05:42.596Z",
+   "namespace":{
+      "id":70747,
+      "name":"Super User",
+      "path":"superuser",
+      "kind":"user",
+      "full_path":"superuser",
+      "parent_id":null,
+      "avatar_url":"/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "_links":{
+      "self":"https://my.gitlab.host.com/api/v4/projects/1645",
+      "issues":"https://my.gitlab.host.com/api/v4/projects/1645/issues",
+      "merge_requests":"https://my.gitlab.host.com/api/v4/projects/1645/merge_requests",
+      "repo_branches":"https://my.gitlab.host.com/api/v4/projects/1645/repository/branches",
+      "labels":"https://my.gitlab.host.com/api/v4/projects/1645/labels",
+      "events":"https://my.gitlab.host.com/api/v4/projects/1645/events",
+      "members":"https://my.gitlab.host.com/api/v4/projects/1645/members",
+      "cluster_agents":"https://my.gitlab.host.com/api/v4/projects/1645/cluster_agents"
+   },
+   "packages_enabled":true,
+   "empty_repo":false,
+   "archived":false,
+   "visibility":"private",
+   "owner":{
+      "id":14041,
+      "username":"superuser",
+      "name":"Super User",
+      "state":"active",
+      "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "resolve_outdated_diff_discussions":false,
+   "container_expiration_policy":{
+      "cadence":"1d",
+      "enabled":false,
+      "keep_n":10,
+      "older_than":"90d",
+      "name_regex":".*",
+      "name_regex_keep":null,
+      "next_run_at":"2023-06-24T13:45:15.167Z"
+   },
+   "issues_enabled":true,
+   "merge_requests_enabled":true,
+   "wiki_enabled":true,
+   "jobs_enabled":true,
+   "snippets_enabled":true,
+   "container_registry_enabled":true,
+   "service_desk_enabled":false,
+   "service_desk_address":null,
+   "can_create_merge_request_in":true,
+   "issues_access_level":"enabled",
+   "repository_access_level":"enabled",
+   "merge_requests_access_level":"enabled",
+   "forking_access_level":"enabled",
+   "wiki_access_level":"enabled",
+   "builds_access_level":"enabled",
+   "snippets_access_level":"enabled",
+   "pages_access_level":"private",
+   "analytics_access_level":"enabled",
+   "container_registry_access_level":"enabled",
+   "security_and_compliance_access_level":"private",
+   "releases_access_level":"enabled",
+   "environments_access_level":"enabled",
+   "feature_flags_access_level":"enabled",
+   "infrastructure_access_level":"enabled",
+   "monitor_access_level":"enabled",
+   "emails_disabled":null,
+   "shared_runners_enabled":true,
+   "lfs_enabled":true,
+   "creator_id":14041,
+   "import_url":null,
+   "import_type":null,
+   "import_status":"none",
+   "import_error":null,
+   "open_issues_count":0,
+   "description_html":"",
+   "updated_at":"2023-06-28T14:05:42.596Z",
+   "ci_default_git_depth":20,
+   "ci_forward_deployment_enabled":true,
+   "ci_job_token_scope_enabled":false,
+   "ci_separated_caches":true,
+   "ci_allow_fork_pipelines_to_run_in_parent_project":true,
+   "build_git_strategy":"fetch",
+   "keep_latest_artifact":true,
+   "restrict_user_defined_variables":false,
+   "runners_token":"TOKEN",
+   "runner_token_expiration_interval":null,
+   "group_runners_enabled":true,
+   "auto_cancel_pending_pipelines":"enabled",
+   "build_timeout":3600,
+   "auto_devops_enabled":false,
+   "auto_devops_deploy_strategy":"continuous",
+   "ci_config_path":"",
+   "public_jobs":true,
+   "shared_with_groups":[
+      
+   ],
+   "only_allow_merge_if_pipeline_succeeds":false,
+   "allow_merge_on_skipped_pipeline":null,
+   "request_access_enabled":true,
+   "only_allow_merge_if_all_discussions_are_resolved":false,
+   "remove_source_branch_after_merge":true,
+   "printing_merge_request_link_enabled":true,
+   "merge_method":"merge",
+   "squash_option":"default_off",
+   "enforce_auth_checks_on_uploads":true,
+   "suggestion_commit_message":null,
+   "merge_commit_template":null,
+   "squash_commit_template":null,
+   "issue_branch_template":null,
+   "autoclose_referenced_issues":true,
+   "approvals_before_merge":0,
+   "mirror":false,
+   "external_authorization_classification_label":null,
+   "marked_for_deletion_at":null,
+   "marked_for_deletion_on":null,
+   "requirements_enabled":false,
+   "requirements_access_level":"enabled",
+   "security_and_compliance_enabled":true,
+   "compliance_frameworks":[
+      
+   ],
+   "issues_template":null,
+   "merge_requests_template":null,
+   "merge_pipelines_enabled":false,
+   "merge_trains_enabled":false,
+   "allow_pipeline_trigger_approve_deployment":false,
+   "permissions":{
+      "project_access":{
+         "access_level":50,
+         "notification_level":3
+      },
+      "group_access":null
+   }
+ };
+
 export const MERGED_SQUASHED_MR = {
   "id":807106,
   "iid":1,
@@ -241,7 +401,7 @@ export const MERGED_SQUASHED_MR = {
   "source_project_id":76316,
   "target_project_id":76316,
   "labels":[
-     
+     "gitlab-original-label"
   ],
   "draft":false,
   "work_in_progress":false,
@@ -529,6 +689,49 @@ export const CLOSED_NOT_MERGED_MR = {
   }
 };
 
+export const OPEN_PR_COMMITS = [
+   {
+      "id":"974519f65c9e0ed65277cd71026657a09fca05e7",
+      "short_id":"974519f6",
+      "created_at":"2023-07-10T19:23:04.000Z",
+      "parent_ids":[
+         
+      ],
+      "title":"Add another file",
+      "message":"Add another file",
+      "author_name":"Super User",
+      "author_email":"superuser@email.com",
+      "authored_date":"2023-07-10T19:23:04.000Z",
+      "committer_name":"Super User",
+      "committer_email":"superuser@email.com",
+      "committed_date":"2023-07-10T19:23:04.000Z",
+      "trailers":{
+         
+      },
+      "web_url":"https://gitlab.com/superuser/backporting-example/-/commit/974519f65c9e0ed65277cd71026657a09fca05e7"
+   },
+   {
+      "id":"e4dd336a4a20f394df6665994df382fb1d193a11",
+      "short_id":"e4dd336a",
+      "created_at":"2023-06-29T09:59:10.000Z",
+      "parent_ids":[
+         
+      ],
+      "title":"Add new file",
+      "message":"Add new file",
+      "author_name":"Super User",
+      "author_email":"superuser@email.com",
+      "authored_date":"2023-06-29T09:59:10.000Z",
+      "committer_name":"Super User",
+      "committer_email":"superuser@email.com",
+      "committed_date":"2023-06-29T09:59:10.000Z",
+      "trailers":{
+         
+      },
+      "web_url":"https://gitlab.com/superuser/backporting-example/-/commit/e4dd336a4a20f394df6665994df382fb1d193a11"
+   }
+];
+
 export const SUPERUSER = {
    "id":14041,
    "username":"superuser",
@@ -537,3 +740,138 @@ export const SUPERUSER = {
    "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
    "web_url":"https://my.gitlab.host.com/superuser"
 };
+
+export const NESTED_NAMESPACE_MR = {
+   "id":807106,
+   "iid":1,
+   "project_id":1645,
+   "title":"Update test.txt",
+   "description":"This is the body",
+   "state":"merged",
+   "created_at":"2023-06-28T14:32:40.943Z",
+   "updated_at":"2023-06-28T14:37:12.108Z",
+   "merged_by":{
+      "id":14041,
+      "username":"superuser",
+      "name":"Super User",
+      "state":"active",
+      "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "merge_user":{
+      "id":14041,
+      "username":"superuser",
+      "name":"Super User",
+      "state":"active",
+      "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "merged_at":"2023-06-28T14:37:11.667Z",
+   "closed_by":null,
+   "closed_at":null,
+   "target_branch":"main",
+   "source_branch":"feature",
+   "user_notes_count":0,
+   "upvotes":0,
+   "downvotes":0,
+   "author":{
+      "id":14041,
+      "username":"superuser",
+      "name":"Super User",
+      "state":"active",
+      "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "assignees":[
+      {
+         "id":14041,
+         "username":"superuser",
+         "name":"Super User",
+         "state":"active",
+         "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+         "web_url":"https://my.gitlab.host.com/superuser"
+      }
+   ],
+   "assignee":{
+      "id":14041,
+      "username":"superuser",
+      "name":"Super User",
+      "state":"active",
+      "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+      "web_url":"https://my.gitlab.host.com/superuser"
+   },
+   "reviewers":[
+      {
+         "id":1404188,
+         "username":"superuser1",
+         "name":"Super User",
+         "state":"active",
+         "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+         "web_url":"https://my.gitlab.host.com/superuser"
+      },
+      {
+         "id":1404199,
+         "username":"superuser2",
+         "name":"Super User",
+         "state":"active",
+         "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
+         "web_url":"https://my.gitlab.host.com/superuser"
+      }
+   ],
+   "source_project_id":1645,
+   "target_project_id":1645,
+   "labels":[
+      "gitlab-original-label"
+   ],
+   "draft":false,
+   "work_in_progress":false,
+   "milestone":null,
+   "merge_when_pipeline_succeeds":false,
+   "merge_status":"can_be_merged",
+   "detailed_merge_status":"not_open",
+   "sha":"9e15674ebd48e05c6e428a1fa31dbb60a778d644",
+   "merge_commit_sha":"4d369c3e9a8d1d5b7e56c892a8ab2a7666583ac3",
+   "squash_commit_sha":"ebb1eca696c42fd067658bd9b5267709f78ef38e",
+   "discussion_locked":null,
+   "should_remove_source_branch":true,
+   "force_remove_source_branch":true,
+   "reference":"!2",
+   "references":{
+      "short":"!2",
+      "relative":"!2",
+      "full":"superuser/backporting-example!2"
+   },
+   "web_url":"https://my.gitlab.host.com/mysuperorg/6/mysuperproduct/mysuperunit/backporting-example/-/merge_requests/4",
+   "time_stats":{
+      "time_estimate":0,
+      "total_time_spent":0,
+      "human_time_estimate":null,
+      "human_total_time_spent":null
+   },
+   "squash":true,
+   "squash_on_merge":true,
+   "task_completion_status":{
+      "count":0,
+      "completed_count":0
+   },
+   "has_conflicts":false,
+   "blocking_discussions_resolved":true,
+   "approvals_before_merge":null,
+   "subscribed":true,
+   "changes_count":"1",
+   "latest_build_started_at":null,
+   "latest_build_finished_at":null,
+   "first_deployed_to_production_at":null,
+   "pipeline":null,
+   "head_pipeline":null,
+   "diff_refs":{
+      "base_sha":"2c553a0c4c133a51806badce5fa4842b7253cb3b",
+      "head_sha":"9e15674ebd48e05c6e428a1fa31dbb60a778d644",
+      "start_sha":"2c553a0c4c133a51806badce5fa4842b7253cb3b"
+   },
+   "merge_error":null,
+   "first_contribution":false,
+   "user":{
+      "can_merge":true
+   }
+ };

test/support/utils.ts

@@ -1,4 +1,5 @@
 import * as core from "@actions/core";
+import { AuthTokenId } from "@bp/service/configs/configs.types";
 import * as fs from "fs";
 
 export const addProcessArgs = (args: string[]) => {
@@ -9,6 +10,13 @@ export const resetProcessArgs = () => {
   process.argv = ["node", "backporting"];
 };
 
+export const resetEnvTokens = () => {
+  delete process.env[AuthTokenId.GITHUB_TOKEN];
+  delete process.env[AuthTokenId.GITLAB_TOKEN];
+  delete process.env[AuthTokenId.CODEBERG_TOKEN];
+  delete process.env[AuthTokenId.GIT_TOKEN];
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const spyGetInput = (obj: any) => {
   const mock = jest.spyOn(core, "getInput");