git/git-cvsimport-script, branch gitk-resize-error

Big tool rename.

2005-09-08T00:45:20Z

As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano

[PATCH] git-cvsimport-script: handling of tags

2005-09-06T18:57:37Z

This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano

[PATCH] git-cvsimport - remove hardcoded reference to origin

2005-08-17T21:53:39Z

... in the newly introduced merge detection code. Signed-off-by: Martin Langhoff Signed-off-by: Junio C Hamano

[PATCH] Add merge detection to git-cvsimport

2005-08-17T21:53:39Z

Added -m and -M flags for git-cvsimport to detect merge commits in cvs. While this trusts the commit message, in repositories where merge commits indicate 'merged from FOOBRANCH' the import works surprisingly well. Even if some merges from CVS are bogus or incomplete, the resulting branches are in better state to go forward (and merge) than without any merge detection. Signed-off-by: Martin Langhoff Signed-off-by: Junio C Hamano

[PATCH] Also handle CVS branches with a '/' in their name

2005-08-17T19:13:12Z

I track a CVS project which has a branch with a '/' in the branch name. Since git wants the branch name to be a file name at the same time, substitute that character to a '-' by default (override with "-s "). This should work well, despite the fact that a division and a difference are completely different :-) Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

2005-08-16T19:09:33Z

Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After exploration of the different -k modes in the cvs protocol, we use -kk which kills keyword expansion wherever possible. Against the protocol spec, -ko and -kb will sometimes expand keywords. Should improve our chances of detecting merges and reduce imported repository size. Signed-off: Martin Langhoff Signed-off-by: Junio C Hamano

[PATCH] Fixed two bugs in git-cvsimport-script.

2005-08-16T19:09:33Z

The git-cvsimport-script had a copule of small bugs that prevented me from importing a big CVS repository. The first was that it didn't handle removed files with a multi-digit primary revision number. The second was that it was asking the CVS server for "F" messages, although they were not handled. I also updated the documentation for that script to correspond to actual flags. Signed-off-by: David K?5gedal Signed-off-by: Junio C Hamano

[PATCH] cvsgit fixes: spaces in filenames and CVS server dialog woes

2005-08-16T19:09:33Z

Problems found while importing dasher's CVS: * Allow spaces in filenames. * cvsps may create unnamed branches with revisions that don't really exist, which causes the CVS server to return something we haven't hitherto expected. * Report deleted files when being verbose. * Also, report the commit date. Signed-off-by: Junio C Hamano

[PATCH] git-cvsimport-script: parse multidigit revisions.

2005-07-12T22:37:25Z

Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege Signed-off-by: Linus Torvalds

[PATCH] git-cvsimport-script: add "import only" option

2005-07-11T17:26:07Z

git-cvsimport-script: add "import only" option which tells the script not to perform a checkout after importing. This ensures that the working directory and cache remain untouched and will not create them if they do not exist. Acked-by: Matthias Urlichs Signed-off-by: Sven Verdoolaege Signed-off-by: Linus Torvalds