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

[PATCH v2 0/8] History traversal refinements

From
Kevin Bracey <kevin@bracey.fi>
Date
Apr 30, 2013, 17:26 UTC
Message-ID
<1367342788-7795-1-git-send-email-kevin@bracey.fi>

Okay, here's what I'll call v2 of this series. In the 3 parts from before (4,6 & 7), I've addressed the comments from Junio and David, corrected some errors, reconstructed the main commit message, and made some adjustments in preparation for part 8.

New part 1 is just me making amends for writing NULL into decoration and leaving cruft behind in part 4.

New part 2 expands the ancestry-path test - which is useful because it's full of "-s ours" merges.

New part 3 has a little look at the TREESAME documentation bug - maybe we should add Junio's little asterisk decorations.

Part 5 is Junio's test, in the correct place in the sequence. (Not sure if it's valid to send that with git send-email - I'll find out).

And finally part 8 is a first attempt at the new UNINTERESTING/TREESAME interaction logic. I'm pretty happy with the results it produces, but it's an even more deep and scary change than the earlier parts.

And we obviously need some more new tests - the effects of these changes are almost non-existent on the pre-existing set. I'd like to beg for any volunteers here - I'm not that proficient at shell scripting, and on top of that something like this could really do with an independent set of eyes checking that the claimed benefits actually match the results. (And that the claims are understandable.)

Junio C Hamano (1):
  t6012: update test for tweaked full-history traversal
Kevin Bracey (7):
  decorate.c: compact table when growing
  t6019: test file dropped in -s ours merge
  rev-list-options.txt: correct TREESAME for P
  revision.c: Make --full-history consider more merges
  simplify-merges: never remove all TREESAME parents
  simplify-merges: drop merge from irrelevant side branch
  revision.c: discount UNINTERESTING parents
 Documentation/rev-list-options.txt |  38 ++--
 decorate.c                         |   2 +-
 revision.c                         | 453 +++++++++++++++++++++++++++++++++----
 revision.h                         |   1 +
 t/t6012-rev-list-simplify.sh       |  31 ++-
 t/t6019-rev-list-ancestry-path.sh  |  37 ++-
 6 files changed, 494 insertions(+), 68 deletions(-)
-- 
1.8.2.1.632.gd2b1879
Next: Kevin Bracey
Message 1 of 12 in “History traversal refinements”
  1. 0/8 History traversal refinementsKevin Bracey, Apr 30, 2013
  2. 1/8 decorate.c: compact table when growingKevin Bracey, Apr 30, 2013
  3. 2/8 t6019: test file dropped in -s ours mergeKevin Bracey, Apr 30, 2013
  4. 3/8 rev-list-options.txt: correct TREESAME for PKevin Bracey, Apr 30, 2013
  5. 4/8 revision.c: Make --full-history consider more mergesKevin Bracey, Apr 30, 2013
  6. 5/8 t6012: update test for tweaked full-history traversalKevin Bracey, Apr 30, 2013
  7. 6/8 simplify-merges: never remove all TREESAME parentsKevin Bracey, Apr 30, 2013
  8. 7/8 simplify-merges: drop merge from irrelevant side branchKevin Bracey, Apr 30, 2013
  9. Junio C HamanoApr 30, 2013
  10. 8/8 revision.c: discount UNINTERESTING parentsKevin Bracey, Apr 30, 2013
  11. Junio C HamanoApr 30, 2013
  12. Junio C HamanoApr 30, 2013

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.