[Concept,0/9] pickman: Improve handling of large merges and add rewind

Message ID	20260212211626.167191-1-sjg@u-boot.org
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Thu, 12 Feb 2026 14:16:13 -0700 Message-ID: <20260212211626.167191-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: MRC3WYPQ2GRZKUA7RFJLANJIUQEJDPOF CC: Simon Glass <simon.glass@canonical.com> Precedence: list Subject: [Concept] [PATCH 0/9] pickman: Improve handling of large merges and add rewind Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/MRC3WYPQ2GRZKUA7RFJLANJIUQEJDPOF/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	pickman: Improve handling of large merges and add rewind \| [Concept,0/9] pickman: Improve handling of large merges and add rewind [Concept,1/9] pickman: Fix line-too-long pylint warnings in ftest [Concept,2/9] pickman: Extract build_applied_map() from execute_apply() [Concept,3/9] pickman: Group named-tuple declarations together [Concept,4/9] pickman: Rename error to err for local variables [Concept,5/9] pickman: Return NextCommitsInfo from get_next_commits() [Concept,6/9] pickman: Increase agent SDK buffer size to 10MB [Concept,7/9] pickman: Extract find_unprocessed_commits() from get_next_commits() [Concept,8/9] pickman: Decompose mega-merges into sub-merge batches [Concept,9/9] pickman: Add rewind command for stepping backwards

Message ID

20260212211626.167191-1-sjg@u-boot.org

Headers

From: Simon Glass <sjg@u-boot.org>
To: U-Boot Concept <concept@u-boot.org>
Date: Thu, 12 Feb 2026 14:16:13 -0700
Message-ID: <20260212211626.167191-1-sjg@u-boot.org>
MIME-Version: 1.0
Message-ID-Hash: MRC3WYPQ2GRZKUA7RFJLANJIUQEJDPOF
CC: Simon Glass <simon.glass@canonical.com>
Precedence: list
Subject: [Concept] [PATCH 0/9] pickman: Improve handling of large merges and
 add rewind
Archived-At: 
 <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/MRC3WYPQ2GRZKUA7RFJLANJIUQEJDPOF/>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Series

pickman: Improve handling of large merges and add rewind |

Message

Simon Glass Feb. 12, 2026, 9:16 p.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

This series adds three improvements to pickman:

- Increase the agent SDK buffer size from 1MB to 10MB to avoid
  fatal errors when processing large responses

- Decompose mega-merges (e.g. "Merge branch 'next'") into
  individual sub-merge batches, so the agent processes them
  one at a time instead of being overwhelmed by hundreds of
  commits at once

- Add a 'rewind' command for stepping the source position back
  by N merges, allowing a cherry-pick run to be retried from
  an earlier point

It also tidies up some pylint warnings.


Simon Glass (9):
  pickman: Fix line-too-long pylint warnings in ftest
  pickman: Extract build_applied_map() from execute_apply()
  pickman: Group named-tuple declarations together
  pickman: Rename error to err for local variables
  pickman: Return NextCommitsInfo from get_next_commits()
  pickman: Increase agent SDK buffer size to 10MB
  pickman: Extract find_unprocessed_commits() from get_next_commits()
  pickman: Decompose mega-merges into sub-merge batches
  pickman: Add rewind command for stepping backwards

 tools/pickman/__main__.py   |  10 +
 tools/pickman/agent.py      |   8 +-
 tools/pickman/control.py    | 634 ++++++++++++++++++-----
 tools/pickman/database.py   |   8 +
 tools/pickman/ftest.py      | 990 +++++++++++++++++++++++++++++++++---
 tools/pickman/gitlab_api.py |  22 +-
 6 files changed, 1470 insertions(+), 202 deletions(-)