diff options
| author | Andreas König <a.koenig@mind.de> | 2003-03-15 13:04:18 +0100 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-03-21 21:09:15 +0000 |
| commit | 2d74ac5a945cbb18a3c980e95584765fe36a2594 (patch) | |
| tree | 7b99695e45cfc1051d39be2f9085e3a19672dcf9 /Porting | |
| parent | 457b36cb0e1f520a66f69467509302997f8a52c5 (diff) | |
| download | perl-2d74ac5a945cbb18a3c980e95584765fe36a2594.tar.gz | |
p4genpatch
Message-ID: <m3hea4gabx.fsf@k242.linux.bogus>
p4raw-id: //depot/perl@19044
Diffstat (limited to 'Porting')
| -rw-r--r-- | Porting/p4genpatch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Porting/p4genpatch b/Porting/p4genpatch index ccedff1087..543baa9815 100644 --- a/Porting/p4genpatch +++ b/Porting/p4genpatch @@ -23,7 +23,7 @@ $0 =~ s|^.*[\\/]||; my $VERSION = '0.05'; my $TOPDIR = cwd(); my @P4opt; -our %OPT = ( "d" => "u", b => "//depot/perl", "D" => "diff" ); +our %OPT = ( "d" => "u", b => "//depot/perl/", "D" => "diff" ); Getopt::Long::Configure("no_ignore_case"); GetOptions(\%OPT, "b=s", "p=s", "d=s", "D=s", "h", "v", "V") or die Usage; print Usage and exit if $OPT{h}; @@ -42,6 +42,7 @@ while (<$p4>) { print; next unless m|($OPT{b})|; my($prefix) = $1; + $prefix =~ s|/$||; $prefix =~ s|/[^/]+$||; # up to the last "/" in the match is to be stripped if (my($file,$action) = m|^\.\.\. (//depot.*)\s(\w+)$|) { next if $action eq "delete"; @@ -160,9 +161,10 @@ sub Usage () { -p host:port p4 port (e.g. myhost:1666) -d diffopt option to pass to diff(1) -D diff diff(1) to use - -b branch(es) which branches to include (regex); everything up - to the last slash of matched portion of path is - stripped on local copy (default: //depot/perl) + -b branch(es) which branches to include (regex); the last + directory within the matched part will be + preserved on the local copy, so that patch -p1 + will work (default: "//depot/perl/") -v verbose -h print this help and exit -V print version number and exit |