X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=0d86e47d6c3772347088a80abaa4ddade3d2b72f;hb=8e6f38443e97e150cd946d508104cad16fdd6bbe;hp=6e5409c17976f12c1a3ce389a68cb47c8774fbad;hpb=11d56b155cc478fa4708d457d9c8e50bb0f39fe9;p=git.git diff --git a/TODO b/TODO index 6e5409c1..0d86e47d 100644 --- a/TODO +++ b/TODO @@ -6,214 +6,138 @@ The GIT To-Do File http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO -Tool Renames Plan -================= +What to expect from now on +========================== - - All non-binary commands will lose -script suffix in - $(bindir). The source to git-foo will be either git-foo.sh - or git-foo.perl in the source tree, and the documentation - will be in Documentation/git-foo.txt. - - - The commands whose names have 'cache' to mean 'index file' - will get 'cache' in their names replaced with 'index'. For - git-fsck-cache and git-convert-cache, 'cache' will be - replaced with 'objects'. - - - The commit walkers will have 'pull' in their names replaced - with 'fetch'. 'git-ssh-push' will become 'git-ssh-upload'. - - - We continue to follow the convention to name the C source - file that contains the main program of 'git-foo' command - 'foo.c'. That means we will have 'fsck-objects.c', for - example. +This is written in a form of to-do list for me, so if I say +"accept patch", it means I do not currently plan to do that +myself. People interested in seeing it materialize please take +a hint. Also whatever I marked "Perhaps" do not have to happen +if ever -- only if somebody cares enough and submits a clean +patch, perhaps ;-). - - At this moment, I am not planning to rename the symbols used - in programs, nor any library sources. "cache.h" will stay - "cache.h", so does "read-cache.c". "struct cache_entry" and - "ce_match_stat()" will keep their names. We _might_ want to - rename them in later rounds but not right now. - - In 0.99.7, all renamed commands will have symbolic links in - $(bindir) so that old names continue to work. These backward - compatible names will not appear in documentation. The main - documentation, git(7) will talk about the new names but would - mention their old names as historical notes. Old environment - names defined in gitenv() will also be removed in this release. +UI +-- - - In 0.99.8, we do not install these backward compatible - symbolic links in $(bindir) anymore. The Makefile will have - a target to remove old symlinks from $(DESTDIR)$(bindir) you - can run manually to help you clean things up. +* Make "git branch -d foo" while on foo branch suggest "maybe + you want to go back to 'master'?" - The timeframe for this is around Oct 1st, but I could be - talked into delaying the symlink removal if Porcelain people - find this schedule too tight. +Design issues +------------- -What to expect after 0.99.7 -=========================== +* "intent to add" index entries? -This is written in a form of to-do list for me, so if I say -"accept patch", it means I do not currently plan to do that -myself. People interested in seeing it materialize please take -a hint. +* Plug-in file-level merges. On the other hand, we may not even + need this; just tell people to run "xxdiff -U" on the working + tree files. +* Doing a merge in a separate directory? -Documentation -------------- +* Make 'format-patch' take revision limiters similar to + rev-list. For example: -* Accept patches from people who actually have done CVS - migration and update the cvs-migration documentation. - Link the documentation from the main git.txt page. + A C + ....---x---o---o---x---o---o + / + / + / + ....---x---o---o + B -* Accept patches from people who were hit by shiny blue bat to - update the SubmittingPatches. + we should be able to format commits 'o', without duplicates, + by: -* Talk about using rsync just once at the beginning when - initializing a remote repository so that local packs do not - need to be expanded. I personally do not think we need tool - support for this (but see below about optimized cloning). + $ git format-patch ^A ^B C -* Maybe update tutorial with a toy project that involves two or - three developers.. + Currently the closest approximation is -* Update tutorial to cover setting up repository hooks to do - common tasks. + $ git format-patch A..C B..C -* Accept patches to finish missing docs. + which results in the last two commits including C formatted + twice. Technical (heavier) ------------------- -* Tony Luck reported an unfortunate glitch in the 3-way merge. - Encourage discussions to come up with a not-so-expensive way - to catch the kind of ambiguities that led to his misery. - [Deathmatch between Daniel's and Fredrik's ongoing.] - -* HPA has two projects, klibc and klibc-kbuild, that have large - set of overlapping files in different paths (i.e. one has many - renames from the other). There currently is no way for git to - help keep these two trees in sync, merging criss-cross between - them. The merge logic should be able to take advantage of - rename/copy detection smarts git-diff-* family has. Linus, - me, and Daniel outlined a smarter merge strategy for this. - Try them out. - -* We might want to optimize cloning with GIT native transport - not to explode the pack, and store it in objects/pack instead. - We would need a tool to generate an idx file out of a pack - file for this. Also this itself may turn out to be a bad - idea, making the set of packs in repositories everybody has - different from each other. - * Libification. There are many places "run once" mentality is ingrained in the management of basic data structures, which - need to be fixed. + need to be fixed. [Matthias Urlichs is already working on + this: ] * Maybe a pack optimizer. -* Maybe an Emacs VC backend. + Given a set of objects and a set of refs (probably a handful + branch heads and point release tags), find a set of packs to + allow reasonably minimum download for all of these classes of + people: (1) somebody cloning the repository from scratch, (2) + somebody who tends to follow the master branch head reasonably + closely, (3) somebody who tends to follow only the point + releases. + + This needs a matching smart on the dumb protocol downloader. Technical (milder) ------------------ -* The recent commit walker safety patch may be too cautious and - appears to take forever when cloning. This may even be - infinitely looping in the code lifted from the old rev-list -- - needs to be taken a look at [DONE INITIAL CUT]. - -* Encourage concrete proposals to commit log message templates - we discussed some time ago. - -* Accept patches for more portability. +* Shallow clones. - * strcasestr() in mailinfo. We may need compat/strcasestr.c; - this is bugging OpenBSD folks. +* Encourage competition between annotate vs blame. Maybe come + up with some nontrivial test cases. -* Accept patches to cause "read-tree -u" delete a directory when - it makes it empty. +* Subprojects. I think the "bind commit" approach has been + outlined at sufficiently detailed level. Maybe find time to + actually start prototyping it? -* Perhaps accept patches to introduce the concept of "patch flow - expressed as ref mappings" Josef has been advocating about. + <7vacdzkww3.fsf@assigned-by-dhcp.cox.net> -* Perhaps accept patches to do undo/redo. +* Decide what to do about rebase applied to merged head. One + extreme is to allow rebase if "rev-list ours..theirs" gives + anything. This loosens the current merge-base based approach. + The other extreme is to refuse rebase if "rev-list + theirs..ours" contains any merge commit, which was discussed + on the list. -* Perhaps accept patch to optionally allow '--fuzz' in - 'git-apply'. - -* Allow 'git apply' to accept GNU diff 2.7 output that forgets - to say '\No newline' if both input ends with incomplete - lines. - -* Maybe grok PGP signed text/plain in applymbox as well. + <43CC695E.2020506@codeweavers.com> -* Perhaps a tool to revert a single file to pre-modification - state? git-cat-file blob `git-ls-files | grep foo` >foo or - git-cat-file blob `git-ls-tree HEAD foo` >foo? What should - the command be called? git-revert is taken so is - git-checkout. +* Decide what the right thing to do upon an empty merge commit, + when both branches happen to have obtained the same set of + changes through different history. Not recording such keeps + the history simpler, and the next merge would soon create a + true merge commit anyway, but this does not feel quite right. -* Enhance "git repack" to not always use --all; this would be - handy if the repository contains wagging heads like "pu" in - git.git repository. + <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com> -* Internally split the project into non-doc and doc parts; add - an extra root for the doc part and merge from it; move the - internal doc source to a separate repository, like the +Meta - repository; experiment if this results in a reasonable - workflow, and document it in howto form if it does. +* diff stopping at the first output; qgit wants to know if this + tree has any A or D from the other tree and nothing else. + Would help internal tree-diff in rev-list as well. -* Make rebase restartable; instead of skipping what cannot be - automatically forward ported, leave the conflicts in the work - tree, have the user resolve it, and then restart from where it - left off. +* daemon --strict-symlink. -* Output full path in the "git-rev-list --objects" output, not - just the basename, and see the improved clustering results in - better packing [Tried, but did not work out well]. +* daemon --base-path does not apply automatically to whitelist + somehow feels wrong. If somebody cares enough, accept + patches. -* Remove obsolete commands [READY]. +* Perhaps detect cloning request in upload-pack and cache the + result for next cloning request until any of our refs change. -* Option to limit rename detection for more than N paths [READY]. +* Perhaps deal with "Files differ" (binary diff) in non C + locales. -* Option to show only status and name from diff [READY]. +* Maybe grok PGP signed text/plain in applymbox as well. Technical (trivial) ------------------- -* 'git add --recursive'? - -* 'git merge-projects'? - -* 'git lost-and-found'? Link dangling commits found by - fsck-objects under $GIT_DIR/refs/lost-found/. Then - show-branch or gitk can be used to find any lost commit. [A - feeler patch sent out. Very underwhelming response X-<.] - - Do not name it /lost+found/; that would probably confuse - things that mistake it a mount point (not our code but - somebody else's). - -* Add simple globbing rules to git-show-branch so that I can - say 'git show-branch --heads "ko-*"' (ko-master, ko-pu, and - ko-rc are in refs/tags/). - -* We would want test scripts for the relative directory path - stuff Linus has been working on. So far, the following - commands should be usable with relative directory paths: +* git-proxy should be spawned with sh -c 'command' $1 $2. - git-update-index - git-ls-files - git-diff-files - git-diff-index - git-diff-tree - git-rev-list - git-rev-parse +* test scripts for the relative directory path stuff. -* In a freashly created empty repository, `git fetch foo:bar` +* In a freshly created empty repository, `git fetch foo:bar` works OK, but `git checkout bar` afterwards does not (missing `.git/HEAD`).