What's cooking in git.git (Jan 2011, #01; Tue, 4)

What's cooking in git.git (Jan 2011, #01; Tue, 4)

[Junio C Hamano]

A happy new year.

Here are the topics that have been cooking.  Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.

I'll start paying much less attention to any new features and enhancements
and shift the focus almost entirely on trivial fixes and regressions from
now on.  Hopefully lists will do the same and we can have a fairly short
rc period this cycle.  Please remind if there are patches that ought to be
in 1.7.4 but are forgotten.

--------------------------------------------------
[New Topics]

* jn/gitweb-no-logo (2010-09-03) 1 commit
  (merged to 'next' on 2011-01-04 at a5d186c)
 + gitweb: make logo optional

Seemed trivial but came a bit too late for the cycle.

* cb/setup (2010-12-27) 1 commit
 - setup: translate symlinks in filename when using absolute paths

Seemed trivial but came a bit too late for the cycle.

--------------------------------------------------
[Stalled]

* nd/index-doc (2010-09-06) 1 commit
 - doc: technical details about the index file format

Half-written but it is a good start.  I may need to give some help in
describing more recent index extensions.

* cb/ignored-paths-are-precious (2010-08-21) 1 commit
 - checkout/merge: optionally fail operation when ignored files need to be overwritten

This needs tests; also we know of longstanding bugs in related area that
needs to be addressed---they do not have to be part of this series but
their reproduction recipe would belong to the test script for this topic.

It would hurt users to make the new feature on by default, especially the
ones with subdirectories that come and go.

* jk/tag-contains (2010-07-05) 4 commits
 - Why is "git tag --contains" so slow?
 - default core.clockskew variable to one day
 - limit "contains" traversals based on commit timestamp
 - tag: speed up --contains calculation

The idea of the bottom one is probably Ok, except that the use of object
flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.

--------------------------------------------------
[Cooking]

* mg/cvsimport (2010-12-29) 2 commits
 - cvsimport: handle the parsing of uppercase config options
 - cvsimport: partial whitespace cleanup

Reviewed twice in the past and seemed sane.  Will merge to 'next' and then
to 'master' before -rc1.

* ae/better-template-failure-report (2010-12-18) 1 commit
 - Improve error messages when temporary file creation fails

* jc/unpack-trees (2010-12-22) 2 commits
 - unpack_trees(): skip trees that are the same in all input
 - unpack-trees.c: cosmetic fix

* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
 - cherry-pick/revert: add support for -X/--strategy-option

* jn/perl-funcname (2010-12-27) 2 commits
 - userdiff/perl: catch BEGIN/END/... and POD as headers
 - diff: funcname and word patterns for perl

* pw/convert-pathname-substitution (2010-12-22) 2 commits
 - t0021: avoid getting filter killed with SIGPIPE
 - convert filter: supply path to external driver

Trivial.  Will merge to 'next' and then to 'master' before -rc1.

* rj/test-fixes (2010-12-14) 4 commits
 - t4135-*.sh: Skip the "backslash" tests on cygwin
 - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
 - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
 - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

I don't think people on different vintage of Cygwin agreed they are good
workarounds---please correct me if I am mistaken.

* tr/maint-branch-no-track-head (2010-12-14) 1 commit
 - branch: do not attempt to track HEAD implicitly

Probably needs a re-roll to exclude either (1) any ref outside the
hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...).  The latter feels
safer and saner.

* hv/mingw-fs-funnies (2010-12-14) 5 commits
 - mingw_rmdir: set errno=ENOTEMPTY when appropriate
 - mingw: add fallback for rmdir in case directory is in use
 - mingw: make failures to unlink or move raise a question
 - mingw: work around irregular failures of unlink on windows
 - mingw: move unlink wrapper to mingw.c

Will be rerolled (Heiko, 2010-12-23)

* jn/svn-fe (2010-12-06) 18 commits
 - vcs-svn: Allow change nodes for root of tree (/)
 - vcs-svn: Implement Prop-delta handling
 - vcs-svn: Sharpen parsing of property lines
 - vcs-svn: Split off function for handling of individual properties
 - vcs-svn: Make source easier to read on small screens
 - vcs-svn: More dump format sanity checks
 - vcs-svn: Reject path nodes without Node-action
 - vcs-svn: Delay read of per-path properties
 - vcs-svn: Combine repo_replace and repo_modify functions
 - vcs-svn: Replace = Delete + Add
 - vcs-svn: handle_node: Handle deletion case early
 - vcs-svn: Use mark to indicate nodes with included text
 - vcs-svn: Unclutter handle_node by introducing have_props var
 - vcs-svn: Eliminate node_ctx.mark global
 - vcs-svn: Eliminate node_ctx.srcRev global
 - vcs-svn: Check for errors from open()
 - vcs-svn: Allow simple v3 dumps (no deltas yet)
 - vcs-svn: Error out for v3 dumps

Some RFC patches, to give them early and wider exposure.  Perhaps drop
these during the -rc period?

* nd/struct-pathspec (2010-12-15) 21 commits
 - t7810: overlapping pathspecs and depth limit
 - grep: drop pathspec_matches() in favor of tree_entry_interesting()
 - grep: use writable strbuf from caller for grep_tree()
 - grep: use match_pathspec_depth() for cache/worktree grepping
 - grep: convert to use struct pathspec
 - Convert ce_path_match() to use match_pathspec_depth()
 - Convert ce_path_match() to use struct pathspec
 - struct rev_info: convert prune_data to struct pathspec
 - pathspec: add match_pathspec_depth()
 - tree_entry_interesting(): optimize wildcard matching when base is matched
 - tree_entry_interesting(): support wildcard matching
 - tree_entry_interesting(): fix depth limit with overlapping pathspecs
 - tree_entry_interesting(): support depth limit
 - tree_entry_interesting(): refactor into separate smaller functions
 - diff-tree: convert base+baselen to writable strbuf
 - glossary: define pathspec
 - Move tree_entry_interesting() to tree-walk.c and export it
 - tree_entry_interesting(): remove dependency on struct diff_options
 - Convert struct diff_options to use struct pathspec
 - diff-no-index: use diff_tree_setup_paths()
 - Add struct pathspec
 (this branch is used by en/object-list-with-pathspec.)

On hold, perhaps in 'next', til 1.7.4 final.

* en/object-list-with-pathspec (2010-09-20) 2 commits
 - Add testcases showing how pathspecs are handled with rev-list --objects
 - Make rev-list --objects work together with pathspecs
 (this branch uses nd/struct-pathspec.)

On hold, perhaps in 'next', til 1.7.4 final.

* tr/merge-unborn-clobber (2010-08-22) 1 commit
 - Exhibit merge bug that clobbers index&WT

* ab/i18n (2010-10-07) 161 commits
 - po/de.po: complete German translation
 - po/sv.po: add Swedish translation
 - gettextize: git-bisect bisect_next_check "You need to" message
 - gettextize: git-bisect [Y/n] messages
 - gettextize: git-bisect bisect_replay + $1 messages
 - gettextize: git-bisect bisect_reset + $1 messages
 - gettextize: git-bisect bisect_run + $@ messages
 - gettextize: git-bisect die + eval_gettext messages
 - gettextize: git-bisect die + gettext messages
 - gettextize: git-bisect echo + eval_gettext message
 - gettextize: git-bisect echo + gettext messages
 - gettextize: git-bisect gettext + echo message
 - gettextize: git-bisect add git-sh-i18n
 - gettextize: git-stash drop_stash say/die messages
 - gettextize: git-stash "unknown option" message
 - gettextize: git-stash die + eval_gettext $1 messages
 - gettextize: git-stash die + eval_gettext $* messages
 - gettextize: git-stash die + eval_gettext messages
 - gettextize: git-stash die + gettext messages
 - gettextize: git-stash say + gettext messages
 - gettextize: git-stash echo + gettext message
 - gettextize: git-stash add git-sh-i18n
 - gettextize: git-submodule "blob" and "submodule" messages
 - gettextize: git-submodule "path not initialized" message
 - gettextize: git-submodule "[...] path is ignored" message
 - gettextize: git-submodule "Entering [...]" message
 - gettextize: git-submodule $errmsg messages
 - gettextize: git-submodule "Submodule change[...]" messages
 - gettextize: git-submodule "cached cannot be used" message
 - gettextize: git-submodule $update_module say + die messages
 - gettextize: git-submodule die + eval_gettext messages
 - gettextize: git-submodule say + eval_gettext messages
 - gettextize: git-submodule echo + eval_gettext messages
 - gettextize: git-submodule add git-sh-i18n
 - gettextize: git-pull "rebase against" / "merge with" messages
 - gettextize: git-pull "[...] not currently on a branch" message
 - gettextize: git-pull "You asked to pull" message
 - gettextize: git-pull split up "no candidate" message
 - gettextize: git-pull eval_gettext + warning message
 - gettextize: git-pull eval_gettext + die message
 - gettextize: git-pull die messages
 - gettextize: git-pull add git-sh-i18n
 - gettext docs: add "Testing marked strings" section to po/README
 - gettext docs: the Git::I18N Perl interface
 - gettext docs: the git-sh-i18n.sh Shell interface
 - gettext docs: the gettext.h C interface
 - gettext docs: add "Marking strings for translation" section in po/README
 - gettext docs: add a "Testing your changes" section to po/README
 - po/pl.po: add Polish translation
 - po/hi.po: add Hindi Translation
 - po/en_GB.po: add British English translation
 - po/de.po: add German translation
 - Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease
 - gettext docs: add po/README file documenting Git's gettext
 - gettextize: git-am printf(1) message to eval_gettext
 - gettextize: git-am core say messages
 - gettextize: git-am "Apply?" message
 - gettextize: git-am clean_abort messages
 - gettextize: git-am cannot_fallback messages
 - gettextize: git-am die messages
 - gettextize: git-am eval_gettext messages
 - gettextize: git-am multi-line getttext $msg; echo
 - gettextize: git-am one-line gettext $msg; echo
 - gettextize: git-am add git-sh-i18n
 - gettext tests: add GETTEXT_POISON tests for shell scripts
 - gettext tests: add GETTEXT_POISON support for shell scripts
 - Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT
 - Makefile: add GNU_GETTEXT, set when we expect GNU gettext
 - gettextize: git-shortlog basic messages
 - gettextize: git-revert split up "could not revert/apply" message
 - gettextize: git-revert literal "me" messages
 - gettextize: git-revert "Your local changes" message
 - gettextize: git-revert basic messages
 - gettextize: git-notes "Refusing to %s notes in %s" message
 - gettextize: git-notes GIT_NOTES_REWRITE_MODE error message
 - gettextize: git-notes basic commands
 - gettextize: git-gc "Auto packing the repository" message
 - gettextize: git-gc basic messages
 - gettextize: git-describe basic messages
 - gettextize: git-clean clean.requireForce messages
 - gettextize: git-clean basic messages
 - gettextize: git-bundle basic messages
 - gettextize: git-archive basic messages
 - gettextize: git-status "renamed: " message
 - gettextize: git-status "Initial commit" message
 - gettextize: git-status "Changes to be committed" message
 - gettextize: git-status shortstatus messages
 - gettextize: git-status "nothing to commit" messages
 - gettextize: git-status basic messages
 - gettextize: git-push "prevent you from losing" message
 - gettextize: git-push basic messages
 - gettextize: git-tag tag_template message
 - gettextize: git-tag basic messages
 - gettextize: git-reset "Unstaged changes after reset" message
 - gettextize: git-reset reset_type_names messages
 - gettextize: git-reset basic messages
 - gettextize: git-rm basic messages
 - gettextize: git-mv "bad" messages
 - gettextize: git-mv basic messages
 - gettextize: git-merge "Wonderful" message
 - gettextize: git-merge "You have not concluded your merge" messages
 - gettextize: git-merge "Updating %s..%s" message
 - gettextize: git-merge basic messages
 - gettextize: git-log "--OPT does not make sense" messages
 - gettextize: git-log basic messages
 - gettextize: git-grep "--open-files-in-pager" message
 - gettextize: git-grep basic messages
 - gettextize: git-fetch split up "(non-fast-forward)" message
 - gettextize: git-fetch update_local_ref messages
 - gettextize: git-fetch formatting messages
 - gettextize: git-fetch basic messages
 - gettextize: git-diff basic messages
 - gettextize: git-commit advice messages
 - gettextize: git-commit "enter the commit message" message
 - gettextize: git-commit print_summary messages
 - gettextize: git-commit formatting messages
 - gettextize: git-commit "middle of a merge" message
 - gettextize: git-commit basic messages
 - gettextize: git-checkout "Switched to a .. branch" message
 - gettextize: git-checkout "HEAD is now at" message
 - gettextize: git-checkout describe_detached_head messages
 - gettextize: git-checkout: our/their version message
 - gettextize: git-checkout basic messages
 - gettextize: git-branch "(no branch)" message
 - gettextize: git-branch "git branch -v" messages
 - gettextize: git-branch "Deleted branch [...]" message
 - gettextize: git-branch "remote branch '%s' not found" message
 - gettextize: git-branch basic messages
 - gettextize: git-add refresh_index message
 - gettextize: git-add "remove '%s'" message
 - gettextize: git-add "pathspec [...] did not match" message
 - gettextize: git-add "Use -f if you really want" message
 - gettextize: git-add "no files added" message
 - gettextize: git-add basic messages
 - gettextize: git-clone "Cloning into" message
 - gettextize: git-clone basic messages
 - gettext tests: test message re-encoding under C
 - po/is.po: add Icelandic translation
 - gettext tests: mark a test message as not needing translation
 - gettext tests: test re-encoding with a UTF-8 msgid under Shell
 - gettext tests: test message re-encoding under Shell
 - gettext tests: add detection for is_IS.ISO-8859-1 locale
 - gettext tests: test if $VERSION exists before using it
 - gettextize: git-init "Initialized [...] repository" message
 - gettextize: git-init basic messages
 - gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
 - gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
 - gettext.c: use libcharset.h instead of langinfo.h when available
 - gettext.c: work around us not using setlocale(LC_CTYPE, "")
 - builtin.h: Include gettext.h
 - Makefile: use variables and shorter lines for xgettext
 - Makefile: tell xgettext(1) that our source is in UTF-8
 - Makefile: provide a --msgid-bugs-address to xgettext(1)
 - Makefile: A variable for options used by xgettext(1) calls
 - gettext tests: locate i18n lib&data correctly under --valgrind
 - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
 - gettext tests: rename test to work around GNU gettext bug
 - gettext: add infrastructure for translating Git with gettext
 - builtin: use builtin.h for all builtin commands
 - tests: use test_cmp instead of piping to diff(1)
 - t7004-tag.sh: re-arrange git tag comment for clarity

It is getting ridiculously painful to keep re-resolving the conflicts with
other topics in flight, even with the help with rerere.

Needs a bit more minor work to get the basic code structure right.

jn/svn-fe (Re: What's cooking in git.git (Jan 2011, #01; Tue, 4))

[Jonathan Nieder]

Junio C Hamano wrote:

> * jn/svn-fe (2010-12-06) 18 commits
>  - vcs-svn: Allow change nodes for root of tree (/)
>  - vcs-svn: Implement Prop-delta handling
>  - vcs-svn: Sharpen parsing of property lines
>  - vcs-svn: Split off function for handling of individual properties
>  - vcs-svn: Make source easier to read on small screens
>  - vcs-svn: More dump format sanity checks
>  - vcs-svn: Reject path nodes without Node-action
>  - vcs-svn: Delay read of per-path properties
>  - vcs-svn: Combine repo_replace and repo_modify functions
>  - vcs-svn: Replace = Delete + Add
>  - vcs-svn: handle_node: Handle deletion case early
>  - vcs-svn: Use mark to indicate nodes with included text
>  - vcs-svn: Unclutter handle_node by introducing have_props var
>  - vcs-svn: Eliminate node_ctx.mark global
>  - vcs-svn: Eliminate node_ctx.srcRev global
>  - vcs-svn: Check for errors from open()
>  - vcs-svn: Allow simple v3 dumps (no deltas yet)
>  - vcs-svn: Error out for v3 dumps
> 
> Some RFC patches, to give them early and wider exposure.  Perhaps drop
> these during the -rc period?

The bottom one is a useful bugfix (to get an error message instead of
succeeding with nonsensical mode and blobs when the user tries to
import a --deltas dump) and should ideally be applied for v1.7.4.

The rest are a new feature (a surprisingly non-buggy one) and I don't
mind if you drop them.

Re: What's cooking in git.git (Jan 2011, #01; Tue, 4)

[Martin von Zweigbergk]

On Tue, 4 Jan 2011, Junio C Hamano wrote:

> A happy new year.

Indeed.

> I'll start paying much less attention to any new features and enhancements
> and shift the focus almost entirely on trivial fixes and regressions from
> now on.  Hopefully lists will do the same and we can have a fairly short
> rc period this cycle.  Please remind if there are patches that ought to be
> in 1.7.4 but are forgotten.

I noticed that my rebase refactoring patches are no longer in pu. Is
this (the above) why? They were not mentioned in the previous "What's
cooking" either, even though they were in pu at that time. It is not
quite clear to me which topics are mentioned in "What's cooking" and
which are not. I see that not all topics in pu right now are mentioned
in today's "What's cooking" either.

Regards,
Martin

Re: What's cooking in git.git (Jan 2011, #01; Tue, 4)

[Ramsay Jones]

Junio C Hamano wrote:
> 
> * rj/test-fixes (2010-12-14) 4 commits
>  - t4135-*.sh: Skip the "backslash" tests on cygwin
>  - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
>  - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
>  - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
> 
> I don't think people on different vintage of Cygwin agreed they are good
> workarounds---please correct me if I am mistaken.

No, it was different vintages of MinGW not Cygwin. Well, to be more precise,
it is the different versions of sed that are installed in MinGW by the
msysGit installer. ;-)

I used msysGit-fullinstall-1.6.4-preview20090729.exe to install msysGit,
18 months ago, and my version of sed is quite old. However, these patches
(which were done mainly for the benefit of cygwin) were written assuming
the more recent sed version installed by a more recent msysGit installer.
(judging by commit ca02ad34.) In other words, the sed version on cygwin
is new enough to know about the -b (--binary) option and so is the more
recent msysGit installers (but I don't know exactly which version).

I can use my patch #14, which you didn't pick up, to run the above tests
on my old installation. (Johannes was the only other laggard identified
and he claims to be upgrading soon! :-D Yeah, I should too.)

So, unless Johannes can think of something I've missed, I think all of
these commits are good to go...

ATB,
Ramsay Jones

Re: What's cooking in git.git (Jan 2011, #01; Tue, 4)

[Johannes Sixt]

On Samstag, 8. Januar 2011, Ramsay Jones wrote:
> Junio C Hamano wrote:
> > * rj/test-fixes (2010-12-14) 4 commits
> >  - t4135-*.sh: Skip the "backslash" tests on cygwin
> >  - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
> >  - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
> >  - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
> >
> > I don't think people on different vintage of Cygwin agreed they are good
> > workarounds---please correct me if I am mistaken.
>
> No, it was different vintages of MinGW not Cygwin. Well, to be more
> precise, it is the different versions of sed that are installed in MinGW by
> the msysGit installer. ;-)
>
> I used msysGit-fullinstall-1.6.4-preview20090729.exe to install msysGit,
> 18 months ago, and my version of sed is quite old. However, these patches
> (which were done mainly for the benefit of cygwin) were written assuming
> the more recent sed version installed by a more recent msysGit installer.
> (judging by commit ca02ad34.) In other words, the sed version on cygwin
> is new enough to know about the -b (--binary) option and so is the more
> recent msysGit installers (but I don't know exactly which version).
>
> I can use my patch #14, which you didn't pick up, to run the above tests
> on my old installation. (Johannes was the only other laggard identified
> and he claims to be upgrading soon! :-D Yeah, I should too.)
>
> So, unless Johannes can think of something I've missed, I think all of
> these commits are good to go...

I've upgraded meanwhile ;-) and have been using this branch since it was 
published the first time. From my POV, these series should go in.

-- Hannes