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

Re: [PATCH 3/5] setup_revisions: remember whether a ref was positive or not

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 24, 2011, 23:17 UTC
Message-ID
<7vr55fs1z0.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7vy5znscst.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Questionable.  Did the user mean to say Z is positive when he said
>
> 	$ git rev-list A B ^C ... --not G H ... ^Z

Having said all that, I think you wanted a way to reconstruct various different command lines that ends up in the same set of "pending objects", and I do think that is something we need to address, as our command line parsing heavily depend on the preprocessing phase of the revision traversal machinery, and some commands do want to act differently between the case when they are given "master" vs "master^0" for example (i.e. does the user mean the branch as a whole or the commit at the tip? If the former the command may want to do something to the refs/heads/master while the latter the command may work only on the commit or outright reject the request saying "I only work on a branch").

In other words, I am not opposed to an effort to give the callers to the "pending objects" machinery a better way to discover what the user told us from the command line, giving them more than just "at the end of the UNINTERESTING marking here are the objects listed on the command line and you can look at their flags". For example, some commands may want to tell "a..b" and "^a b" apart, and other commands may want to tell what "a" was when the user asked for exotic things like "a^@" or "a^!".

It may make sense to change the new "flag" field that can express only one bit in your implementation to something more descriptive to express "what command line option did this come from". For example,

	git cmd a...b

that calls setup_revisions() may put "a" (positive), "b" (positive), and zero or more commits that are their merge bases (negative) in pending objects queue. Right now, these pending object entries may have some part of the string being parsed as their name, but we may want to annotate all the object array entries that result from "a...b" with the same "a...b" (or a structure that represents its parsed form), so that the caller can notice things like (1) they came from the single command line argument, (2) the user didn't list random negative commits but they are meant as merge bases between a and b, (3) a and b were written as such, not as their abbreviated object names, etc.

Then "git fast-export master..master" can notice that there are two object array entries in the pending object queue, they came from the same command line argument, whose parse tree is a "unsymmetric difference between string 'master' and string 'master'", and take the last piece to convince itself that the user is talking about the master branch, even though as the set arithmetic the result is an empty set, and do something intelligent about the master branch.

Previous: Junio C HamanoNext: Sverre Rabbelier
Message 6 of 29 in “fast-export: prepare for remote helpers awesomeness”
  1. 0/5 fast-export: prepare for remote helpers awesomenessSverre Rabbelier, Jul 24, 2011
  2. 1/5 t9350: point out that refs are not updated correctlySverre Rabbelier, Jul 24, 2011
  3. 2/5 fast-export: do not refer to non-existing marksSverre Rabbelier, Jul 24, 2011
  4. 3/5 setup_revisions: remember whether a ref was positive or notSverre Rabbelier, Jul 24, 2011
  5. Junio C HamanoJul 24, 2011
  6. Junio C HamanoJul 24, 2011
  7. Sverre RabbelierAug 3, 2011
  8. Junio C HamanoAug 3, 2011
  9. Johannes SchindelinAug 8, 2011
  10. Junio C HamanoAug 8, 2011
  11. Sverre RabbelierAug 8, 2011
  12. Junio C HamanoAug 8, 2011
  13. Sverre RabbelierAug 8, 2011
  14. Junio C HamanoAug 8, 2011
  15. Sverre RabbelierAug 8, 2011
  16. Junio C HamanoAug 8, 2011
  17. Sverre RabbelierAug 8, 2011
  18. Junio C HamanoAug 8, 2011
  19. Sverre RabbelierAug 8, 2011
  20. Junio C HamanoAug 8, 2011
  21. Junio C HamanoAug 8, 2011
  22. Sverre RabbelierAug 8, 2011
  23. Junio C HamanoAug 8, 2011
  24. Sverre RabbelierAug 8, 2011
  25. Johannes SchindelinJul 26, 2011
  26. 4/5 fast-export: do not export negative refsSverre Rabbelier, Jul 24, 2011
  27. Junio C HamanoJul 24, 2011
  28. Johannes SchindelinJul 26, 2011
  29. 5/5 setup_revisions: remember whether a ref was positive or notSverre Rabbelier, Jul 24, 2011

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.