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

Re: [PATCH v2 09/13] Honour the refspec when updating refs after import

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Nov 5, 2009, 05:34 UTC
Message-ID
<alpine.LNX.2.00.0911050016360.14365@iabervon.org>
In-Reply-To
<fabb9a1e0911041745x577f7e4rc678da4d7d559193@mail.gmail.com>
On Thu, 5 Nov 2009, Sverre Rabbelier wrote:
Show 11 quoted lines
> Heya,
> 
> On Wed, Nov 4, 2009 at 22:30, Daniel Barkalow <barkalow@iabervon.org> wrote:
> > On Wed, 4 Nov 2009, Sverre Rabbelier wrote:
> >> On Wed, Nov 4, 2009 at 22:20, Daniel Barkalow <barkalow@iabervon.org> wrote:
> >> > That's not true for "git pull <url> <branch>"; we do want the remote ref,
> >> > but it doesn't have a local peer.
> 
> No, I don't think that's right, when doing a fetch we want to store
> the refs somewhere, sure, but not under 'refs/heads/<branch>', perhaps
> 'refs/hg/fetch/<branch>', either way, the current code does not work.

I think you've still got things backwards. From the point of view of transport.c, refs/<vcs> is entirely opaque, and we never look at it. Those aren't local peers. They're a way for the helper to communicate to transport-helper.c. The user says: pull refs/heads/master of this hg repo. Transport.c tries to fetch refs/heads/master and get the sha1 to write into FETCH_HEAD or wherever. Transport-helper.c says "import refs/heads/master", and git-fast-import reads the resulting script and writes some ref that the helper tells it to write. Then transport-helper.c figures out where the ref was written, reads it, and updates the struct ref representing the remote info. Then builtin-fetch looks at the struct ref and writes it to the local repositories ref namespace or FETCH_HEAD.

Show 24 quoted lines
> >> >I think going straight to the refspec
> >> > command is the right answer.
> >>
> >> Can you clarity what you mean with "the refspec command"?
> >
> > Whatever it is that lets the helper tell the transport code where in the
> > helper's private namespace to look for refs. I'd been thinking the helper
> > would advertize the "refspec" capability, and the transport code would
> > call the "refspec" command in order to get the helper to report that; but
> > then I actually only said that the helper reports refspec, and not
> > proposed a name for the command.
> 
> Currently I'm implementing so that it would work like this for the svn helper:
> 
> $ echo capabilities | git remote-svn origin /path/to/hg/repo
> import
> refspec +refs/trunk:refs/svn/origin/trunk
> refspec +refs/branches/*:refs/svn/origin/*
> 
> That way we can put the refspec in the config file at clone time.
> 
> Now I've been browsing through the builtin-fetch code, and it looks
> like the main problem is going to be to apply this refspec at all.
> I'll have a more extensive look tomorrow.

This is entirely not what I think we should have. The config file should say refs/heads/*:refs/remotes/origin/* like it always does, because the transport will list the refs like refs/heads/* and refs/tags/* and return them like that.

I'll see if I can write up an untested patch that does what I'm thinking of.

	-Daniel
*This .sig left intentionally blank*
Previous: Sverre RabbelierNext: Daniel Barkalow
Message 15 of 36 in “Reroll of the remote-vcs-helper series”
  1. 00/13 Reroll of the remote-vcs-helper seriesSverre Rabbelier, Nov 4, 2009
  2. 01/13 Fix memory leak in helper method for disconnectSverre Rabbelier, Nov 4, 2009
  3. 02/13 Allow programs to not depend on remotes having urlsSverre Rabbelier, Nov 4, 2009
  4. 03/13 Use a function to determine whether a remote is validSverre Rabbelier, Nov 4, 2009
  5. 04/13 Allow fetch to modify refsSverre Rabbelier, Nov 4, 2009
  6. 05/13 Add a config option for remotes to specify a foreign vcsSverre Rabbelier, Nov 4, 2009
  7. 06/13 Allow specifying the remote helper in the urlSverre Rabbelier, Nov 4, 2009
  8. 07/13 Add support for "import" helper commandSverre Rabbelier, Nov 4, 2009
  9. 08/13 Write local refs written by the "import" helper command only onceSverre Rabbelier, Nov 4, 2009
  10. 09/13 Honour the refspec when updating refs after importSverre Rabbelier, Nov 4, 2009
  11. Daniel BarkalowNov 4, 2009
  12. Sverre RabbelierNov 4, 2009
  13. Daniel BarkalowNov 4, 2009
  14. Sverre RabbelierNov 5, 2009
  15. Daniel BarkalowNov 5, 2009
  16. Daniel BarkalowNov 5, 2009
  17. Sverre RabbelierNov 5, 2009
  18. Daniel BarkalowNov 6, 2009
  19. Sverre RabbelierNov 6, 2009
  20. Daniel BarkalowNov 6, 2009
  21. Junio C HamanoNov 6, 2009
  22. 10/13 Allow helpers to report in "list" command that the ref is unchangedSverre Rabbelier, Nov 4, 2009
  23. 11/13 Allow helpers to request the path to the .git directorySverre Rabbelier, Nov 4, 2009
  24. Daniel BarkalowNov 4, 2009
  25. Sverre RabbelierNov 4, 2009
  26. Daniel BarkalowNov 4, 2009
  27. Sverre RabbelierNov 4, 2009
  28. Daniel BarkalowNov 4, 2009
  29. Sverre RabbelierNov 4, 2009
  30. Daniel BarkalowNov 4, 2009
  31. Junio C HamanoNov 5, 2009
  32. Sverre RabbelierNov 5, 2009
  33. 12/13 Basic build infrastructure for Python scriptsSverre Rabbelier, Nov 4, 2009
  34. 13/13 Add Python support library for remote helpersSverre Rabbelier, Nov 4, 2009
  35. Johan HerlandNov 5, 2009
  36. Sverre RabbelierNov 6, 2009

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.