scripts: west_commands: introduce ncs-cherry-pick

The west ncs-cherry-pick automates most of the manual, tedious work
required to cherry pick commits from an OSS upstream, be that
fromlisting commits from a PR, or selecting one or more fromtrees.

The command allows specifying which commits to cherry-pick, the
command will then automatically cherry-pick and revert any commits
required to cleanly cherry pick the commits from upstream.

Any conflicting commits from downstream will be listed for manual
reapplication.

Once a cherry-pick is ready, the command can also rebase/resync an
existing branch, so rebase on downstream main, remove now empty
fromtrees, and update the fromlisted commits from the PR, even
converting them to fromtrees if the PR got merged.

The script can cherry pick from and two specified branches as well,
for example picking from upstream main to downstream v3.2-branch
for manual backports.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>

Author: bjarki-andreasen

CODEOWNERS

@@ -736,8 +736,10 @@
 /scripts/west_commands/create_board/      @gmarull
 /scripts/west_commands/sbom/              @nrfconnect/ncs-co-scripts
 /scripts/west_commands/thingy91x_dfu.py   @nrfconnect/ncs-cia
+/scripts/west_commands/ncs_cherry_pick.py @nrfconnect/ncs-vestavind
 /scripts/west_commands/ncs_ironside_se_update.py @nrfconnect/ncs-aurora
 /scripts/west_commands/ncs_provision.py   @nrfconnect/ncs-eris
+/scripts/west_commands/tests/test_ncs_cherry_pick.py @nrfconnect/ncs-vestavind
 /scripts/bootloader/                      @nrfconnect/ncs-eris
 /scripts/reglock.py                       @nrfconnect/ncs-eris
 /scripts/ncs-docker-version.txt           @nrfconnect/ncs-ci

scripts/west-commands.yml

@@ -44,3 +44,8 @@ west-commands:
       - name: ncs-ironside-se-update
         class: NcsIronSideSEUpdate
         help: IronSide SE update utility
+  - file: scripts/west_commands/ncs_cherry_pick.py
+    commands:
+      - name: ncs-cherry-pick
+        class: NcsCherryPick
+        help: NCS cherry-pick utility