git/git-cvsserver.perl, branch v2.6.2

Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'

2013-11-04T22:58:05Z

* ak/cvsserver-stabilize-use-of-hash-keys: cvsserver: Determinize output to combat Perl 5.18 hash randomization

cvsserver: Determinize output to combat Perl 5.18 hash randomization

2013-10-30T17:30:30Z

Perl 5.18 randomizes the seed used by its hash function, so iterating through hashes results in different orders from run to run: http://perldoc.perl.org/perl5180delta.html#Hash-overhaul This usually broke t9400 (gitcvs.dbname, gitcvs.ext.dbname, when running cmp on two .sqlite files) and t9402 (check [cvswork3] diff, when running test_cmp on two diffs). To fix this, hide the internal order of hashes with sort when sending output or running database queries. (An alternative workaround is PERL_HASH_SEED=0, but this seems nicer.) Signed-off-by: Anders Kaseorg Signed-off-by: Junio C Hamano

Merge branch 'jc/cvsserver-perm-bit-fix'

2013-09-18T18:48:02Z

"git cvsserver" computed the permission mode bits incorrectly for executable files. * jc/cvsserver-perm-bit-fix: cvsserver: pick up the right mode bits

cvsserver: pick up the right mode bits

2013-09-11T16:32:30Z

When determining the file mode from either ls-tree or diff-tree output, we used to grab these octal mode string (typically 100644 or 100755) and then did $git_perms .= "r" if ( $mode & 4 ); $git_perms .= "w" if ( $mode & 2 ); $git_perms .= "x" if ( $mode & 1 ); which was already wrong, as (100644 & 4) is very different from oct("100644") & 4. An earlier refactoring 2c3af7e7 (cvsserver: factor out git-log parsing logic, 2012-10-13) further changed it to pick the third octal digit (10*0*644 or 10*0*755) from the left and then do the above conversion, which does not make sense, either. Let's use the third digit from the last of the octal mode string to make sure we get the executable and read bits right. Signed-off-by: Junio C Hamano Tested-by: Michael Cronenworth

use 'tree-ish' instead of 'treeish'

2013-09-04T22:02:56Z

Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

Correct common spelling mistakes in comments and tests

2013-04-12T20:38:40Z

Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-cvsimport: use a lowercase "usage:" string

2013-02-24T21:31:07Z

Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

cvsserver: support -r and sticky tags for most operations

2012-10-16T23:17:54Z

- Split off prepDirForOutput for "update" and "commit". Some low level protocol details were changed to more closely resemble CVS even in non-tagged cases. Hopefully it still works with finicky clients like Eclipse. - Substantial changes to "diff". The output is now closer to standard CVS (including exit status), and can be used as a patch, but there are still a number of differences compared to CVS. - Tweaks to "add", "remove", "status", and "commit". - FUTURE: CVS revision numbers for branches simply encode git commit IDs in a way that resembles CVS revision numbers, dropping all normal CVS structural relations between different revision numbers. - FUTURE: "log" doesn't try to work properly at all with branches and tags. - FUTURE: "annotate" probably doesn't work with branches or tags either (untested)? Signed-off-by: Matthew Ogilvie Signed-off-by: Junio C Hamano

cvsserver: Add version awareness to argsfromdir

2012-10-16T23:17:53Z

Signed-off-by: Matthew Ogilvie Signed-off-by: Junio C Hamano

cvsserver: generalize getmeta() to recognize commit refs

2012-10-16T23:17:53Z

This allows getmeta() to recognize any commitish (sha1, tag/branch name, etc). Signed-off-by: Matthew Ogilvie Signed-off-by: Junio C Hamano