git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: qgit idea: interface for cherry-picking

From
MCMarco Costalba <mcostalba@gmail.com>
Date
Jul 4, 2006, 11:21 UTC
Message-ID
<e5bfff550607040421id4e71efw38ee2bd773c949de@mail.gmail.com>
In-Reply-To
<7vk66tna71.fsf@assigned-by-dhcp.cox.net>
On 7/4/06, Junio C Hamano <junkio@cox.net> wrote:
Show 13 quoted lines
> "Marco Costalba" <mcostalba@gmail.com> writes:
>
>
> Yes, either you (1) need to make sure the user is aware what
> underlying git commands QGit runs for them, so that the user
> knows what workflow to follow when the procedure needs to go
> manual, or (2) hide the underlying git commands QGit runs for
> users, but then you need to make QGit aware of what workflow to
> follow when the procedure needs to go manual, and guide the user
> through that workflow.  I think either is fine approach;
> personally I prefer transparent tools that does (1), which is
> the impression I am getting from your description of QGit.
>

Yes, I prefer way (1) too. QGit as an error reporting infrastructure to always report by a message box arguments (starting from 0) of offending command, be it native git or not.

Show 15 quoted lines
> If you take route (1), using "am --fail" number of times
> involves QGit runs "am --fail" once, guide user to fix things up
> _and_ give control back to QGit, then you run the next "am
> --fail", etc, which would be quite cumbersome to implement.  But
> running multiple am and do reset soft to roll back needed number
> of parents might be easier option to implement in QGit, but you
> still have the same "you give the control to the user but then
> you have to take the control away to proceed" problem when the
> patch does not apply cleanly somewhere (you let the user to hand
> resolve and say "am --resolved", but then when the series is
> depleted, somebody has to run "reset --soft" to roll N commits
> back to realize what you wanted to do, so at that point QGit
> somehow needs to take control back).
>
>

I have started to implement the feature suggested by Jakub (patch in working dir only, not committed). The core is a loop of git-am, one for each patch to import, followed by a:

    git-reset --mixed HEAD~<Num of succesfully applied patches>

To note that the above git-reset command is _always_ run be the patch series apply successfully be it fails at some point, so that in any case the tree is not dirty up, and you have the working tree with the information you need in case of manual fixup.

I will plan to push as soon I'm able to reach a "pushable site" ;-)
Comments? could work? not consistent?
     Marco
Previous: Jakub NarebskiNext: Marco Costalba
Message 17 of 18 in “qgit idea: interface for cherry-picking”
  1. Jakub NarebskiJul 2, 2006
  2. Marco CostalbaJul 2, 2006
  3. Jakub NarebskiJul 2, 2006
  4. Marco CostalbaJul 2, 2006
  5. Jakub NarebskiJul 2, 2006
  6. Marco CostalbaJul 3, 2006
  7. Junio C HamanoJul 3, 2006
  8. Marco CostalbaJul 3, 2006
  9. Junio C HamanoJul 3, 2006
  10. Marco CostalbaJul 4, 2006
  11. Jakub NarebskiJul 4, 2006
  12. Marco CostalbaJul 4, 2006
  13. Jakub NarebskiJul 4, 2006
  14. Marco CostalbaJul 4, 2006
  15. Junio C HamanoJul 4, 2006
  16. Jakub NarebskiJul 4, 2006
  17. Marco CostalbaJul 4, 2006
  18. Marco CostalbaJul 4, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.