mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
dc801e71a7
Number of columns required for change counts is now computed based on the maximum number of changed lines instead of being fixed. This means that usually a few more columns will be available for the filenames and the graph. The graph width logic is also modified to include enough space for "Bin XXX -> YYY bytes". If changes to binary files are mixed with changes to text files, change counts are padded to take at least three columns. And the other way around, if change counts require more than three columns, then "Bin"s are padded to align with the change count. This way, the +- part starts in the same column as "XXX -> YYY" part for binary files. This makes the graph easier to parse visually thanks to the empty column. This mimics the layout of diff --stat before this change. Tests and the tutorial are updated to reflect the new --stat output. This means either the removal of extra padding and/or the addition of up to three extra characters to truncated filenames. One test is added to check the graph alignment when a binary file change and text file change of more than 999 lines are committed together. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
2.4 KiB
Text
69 lines
2.4 KiB
Text
---
|
|
|
|
Documentation/git-cvsimport-script.txt | 9 ++++++++-
|
|
git-cvsimport-script | 4 ++--
|
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
50452f9c0c2df1f04d83a26266ba704b13861632
|
|
diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
|
|
--- a/Documentation/git-cvsimport-script.txt
|
|
+++ b/Documentation/git-cvsimport-script.txt
|
|
@@ -29,6 +29,10 @@ OPTIONS
|
|
currently, only the :local:, :ext: and :pserver: access methods
|
|
are supported.
|
|
|
|
+-C <target-dir>::
|
|
+ The GIT repository to import to. If the directory doesn't
|
|
+ exist, it will be created. Default is the current directory.
|
|
+
|
|
-i::
|
|
Import-only: don't perform a checkout after importing. This option
|
|
ensures the working directory and cache remain untouched and will
|
|
@@ -44,7 +48,7 @@ OPTIONS
|
|
|
|
-p <options-for-cvsps>::
|
|
Additional options for cvsps.
|
|
- The options '-x' and '-A' are implicit and should not be used here.
|
|
+ The options '-u' and '-A' are implicit and should not be used here.
|
|
|
|
If you need to pass multiple options, separate them with a comma.
|
|
|
|
@@ -57,6 +61,9 @@ OPTIONS
|
|
-h::
|
|
Print a short usage message and exit.
|
|
|
|
+-z <fuzz>::
|
|
+ Pass the timestamp fuzz factor to cvsps.
|
|
+
|
|
OUTPUT
|
|
------
|
|
If '-v' is specified, the script reports what it is doing.
|
|
diff --git a/git-cvsimport-script b/git-cvsimport-script
|
|
--- a/git-cvsimport-script
|
|
+++ b/git-cvsimport-script
|
|
@@ -190,7 +190,7 @@ sub conn {
|
|
$self->{'socketo'}->write("Root $repo\n");
|
|
|
|
# Trial and error says that this probably is the minimum set
|
|
- $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
|
|
+ $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
|
|
|
|
$self->{'socketo'}->write("valid-requests\n");
|
|
$self->{'socketo'}->flush();
|
|
@@ -691,7 +691,7 @@ while(<CVS>) {
|
|
unlink($tmpname);
|
|
my $mode = pmode($cvs->{'mode'});
|
|
push(@new,[$mode, $sha, $fn]); # may be resurrected!
|
|
- } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
|
|
+ } elsif($state == 9 and /^\s+(\S+):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
|
|
my $fn = $1;
|
|
$fn =~ s#^/+##;
|
|
push(@old,$fn);
|
|
|
|
--
|
|
David K�gedal
|
|
-
|
|
To unsubscribe from this list: send the line "unsubscribe git" in
|
|
the body of a message to majordomo@vger.kernel.org
|
|
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
|