Re: What's cooking in git.git (May 2018, #04; Wed, 30)
Taylor Blau writes: > Since it's past the date that I said I would re-roll this, I wanted to > provide a quick update. I am back in the office, and have discovered a > new wrinkle that `--invert --not -e ...` prints a column offset of 1, > when it should recover the pattern and display the offset of the pattern > match, treating the double negation as a no-op. > > I am going to continue to polish this until I can figure out a clean way > to work around this issue. Sorry for the delay. No need to be sorry; there is no need, especially after we hit the -rc0 mark, to rush a topic that is about a new feature. Thanks for an update, anyway.
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
On Wed, May 30, 2018 at 09:12:10AM -0700, Taylor Blau wrote: > On Wed, May 30, 2018 at 09:09:08AM -0700, Taylor Blau wrote: > > [...] > > > > I have these patches mostly updated on my copy (available at > > https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of > > the office for the next week, so I will polish and send these on June > > 8th. > > Ack, that link is broken. It should be: > https://github.com/ttaylorr/git/compare/tb/grep-colno. Since it's past the date that I said I would re-roll this, I wanted to provide a quick update. I am back in the office, and have discovered a new wrinkle that `--invert --not -e ...` prints a column offset of 1, when it should recover the pattern and display the offset of the pattern match, treating the double negation as a no-op. I am going to continue to polish this until I can figure out a clean way to work around this issue. Sorry for the delay. Thanks, Taylor
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
Duy Nguyen writes: > On Wed, May 30, 2018 at 8:38 AM, Junio C Hamano wrote: >> * sb/object-store-alloc (2018-05-16) 13 commits >> - alloc: allow arbitrary repositories for alloc functions >> - object: allow create_object to handle arbitrary repositories >> - object: allow grow_object_hash to handle arbitrary repositories >> - alloc: add repository argument to alloc_commit_index >> - alloc: add repository argument to alloc_report >> - alloc: add repository argument to alloc_object_node >> - alloc: add repository argument to alloc_tag_node >> - alloc: add repository argument to alloc_commit_node >> - alloc: add repository argument to alloc_tree_node >> - alloc: add repository argument to alloc_blob_node >> - object: add repository argument to grow_object_hash >> - object: add repository argument to create_object >> - repository: introduce parsed objects field >> (this branch is used by sb/object-store-grafts.) >> >> The conversion to pass "the_repository" and then "a_repository" >> throughout the object access API continues. >> >> Is this ready for 'next'? > > I think so. Stefan could remove the comment "/* TODO: what about > commit->util? */" if he wants since nd/commit-util-to-slab is already > in next. But this is really minor and does not need fixing to land on > 'next'. Thanks.
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
Taylor Blau writes: > I have these patches mostly updated on my copy (available at > https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of > the office for the next week, so I will polish and send these on June > 8th. > >> * tb/grep-only-matching (2018-05-14) 2 commits >> - builtin/grep.c: teach '-o', '--only-matching' to 'git-grep' >> - grep.c: extract show_line_header() >> (this branch uses tb/grep-column.) > > This topic is done, but will be frustrating to merge after the changes > in tb/grep-column. I'll update this topic once tb/grep-column graduates > to master, that way they will both apply cleanly. Thanks for an update.
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
On Wed, May 30, 2018 at 9:27 AM, Duy Nguyen wrote: > On Wed, May 30, 2018 at 8:38 AM, Junio C Hamano wrote: >> * sb/object-store-alloc (2018-05-16) 13 commits >> - alloc: allow arbitrary repositories for alloc functions >> - object: allow create_object to handle arbitrary repositories >> - object: allow grow_object_hash to handle arbitrary repositories >> - alloc: add repository argument to alloc_commit_index >> - alloc: add repository argument to alloc_report >> - alloc: add repository argument to alloc_object_node >> - alloc: add repository argument to alloc_tag_node >> - alloc: add repository argument to alloc_commit_node >> - alloc: add repository argument to alloc_tree_node >> - alloc: add repository argument to alloc_blob_node >> - object: add repository argument to grow_object_hash >> - object: add repository argument to create_object >> - repository: introduce parsed objects field >> (this branch is used by sb/object-store-grafts.) >> >> The conversion to pass "the_repository" and then "a_repository" >> throughout the object access API continues. >> >> Is this ready for 'next'? > > I think so. I think so, too. (I even think that for sb/object-store-grafts.) > Stefan could remove the comment "/* TODO: what about > commit->util? */" if he wants since nd/commit-util-to-slab is already > in next. But this is really minor and does not need fixing to land on > 'next'. I was about to remove that comment in the follow up[1] that I sent out yesterday, but refrained. Now that the removal of util is being merged to master, I'll include that in that series [1] https://public-inbox.org/git/20180530004810.30076-1-sbel...@google.com/
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
On Wed, May 30, 2018 at 8:38 AM, Junio C Hamano wrote: > * sb/object-store-alloc (2018-05-16) 13 commits > - alloc: allow arbitrary repositories for alloc functions > - object: allow create_object to handle arbitrary repositories > - object: allow grow_object_hash to handle arbitrary repositories > - alloc: add repository argument to alloc_commit_index > - alloc: add repository argument to alloc_report > - alloc: add repository argument to alloc_object_node > - alloc: add repository argument to alloc_tag_node > - alloc: add repository argument to alloc_commit_node > - alloc: add repository argument to alloc_tree_node > - alloc: add repository argument to alloc_blob_node > - object: add repository argument to grow_object_hash > - object: add repository argument to create_object > - repository: introduce parsed objects field > (this branch is used by sb/object-store-grafts.) > > The conversion to pass "the_repository" and then "a_repository" > throughout the object access API continues. > > Is this ready for 'next'? I think so. Stefan could remove the comment "/* TODO: what about commit->util? */" if he wants since nd/commit-util-to-slab is already in next. But this is really minor and does not need fixing to land on 'next'. -- Duy
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
On Wed, May 30, 2018 at 09:09:08AM -0700, Taylor Blau wrote: > [...] > > I have these patches mostly updated on my copy (available at > https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of > the office for the next week, so I will polish and send these on June > 8th. Ack, that link is broken. It should be: https://github.com/ttaylorr/git/compare/tb/grep-colno. Thanks, Taylor
Re: What's cooking in git.git (May 2018, #04; Wed, 30)
On Wed, May 30, 2018 at 03:38:09PM +0900, Junio C Hamano wrote: > * tb/grep-column (2018-05-14) 7 commits > - contrib/git-jump/git-jump: jump to match column in addition to line > - grep.c: add configuration variables to show matched option > - builtin/grep.c: add '--column' option to 'git-grep(1)' > - grep.c: display column number of first match > - grep.[ch]: extend grep_opt to allow showing matched column > - grep.c: expose matched column in match_line() > - Documentation/config.txt: camel-case lineNumber for consistency > (this branch is used by tb/grep-only-matching.) > > "git grep" learned the "--column" option that gives not just the > line number but the column number of the hit. The last we spoke about this, we had decided on a "min-starting, max-ending" semantics for deciding on the columnar offset for extended patterns like --and, --or, and --not. I have these patches mostly updated on my copy (available at https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of the office for the next week, so I will polish and send these on June 8th. > * tb/grep-only-matching (2018-05-14) 2 commits > - builtin/grep.c: teach '-o', '--only-matching' to 'git-grep' > - grep.c: extract show_line_header() > (this branch uses tb/grep-column.) This topic is done, but will be frustrating to merge after the changes in tb/grep-column. I'll update this topic once tb/grep-column graduates to master, that way they will both apply cleanly. Thanks, Taylor
