[revml] Updating my patches
Chia-liang Kao
clkao@clkao.org
Tue, 7 Sep 2004 15:17:55 +0100
--QKdGvSO+nmPlgiQ/
Content-Type: multipart/mixed; boundary="7JfCtLOvnd9MIVvH"
Content-Disposition: inline
--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
As there has some activities on the vcp depot, I did a vendor merge
today and regen my patches.
Meanwhile, vcp test suites almost all pass for me. There's only one
failed (and seemed quite obvious):
t/99p4_label_branch_rev_1....99p4_label_branch_rev_1.t: $ p4d -f -r /tmp/vcp_99p4_label_branch_rev_1_p4root_dv5L -p 16731
99p4_label_branch_rev_1.t: running p4 clients
Cross-device link linking '/dev/null' -> '/home/clkao/work/revml.new/tmp/vcp9434/dest-p4/co/foo' at /home/clkao/work/revml.new/blib/lib/VCP/Dest/p4.pm line 930.
99p4_label_branch_rev_1.t: WARNING: p4 client vcp_tmp_9434 may not have been deleted:
unexpected stderr from 'p4':
p4: open for write: journal: No such file or directory
p4: Perforce client error:
p4: TCP send failed.
p4: write: socket: Broken pipe
p4 -u 99p4_label_branch_rev_1.t -c vcp_tmp_9434 -p localhost:16731 client -df vcp_tmp_9434 returned 1 not 0
Cheers,
CLK
--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="clkao.diff"
Content-Transfer-Encoding: quoted-printable
--- Makefile.PL (/vendor) (revision 1048)
+++ Makefile.PL (/local) (revision 1048)
@@ -145,6 +145,7 @@ WriteMakefile(
'Pod::Select' =3D> 0,
'Pod::Usage' =3D> 0,
'HTML::Element' =3D> 0,
+ 'Text::Table' =3D> 0,
@prereqs,
},
'LIBS' =3D> [''], # e.g., '-lm'=20
--- lib/VCP/Filter/changesets.pm (/vendor) (revision 1048)
+++ lib/VCP/Filter/changesets.pm (/local) (revision 1048)
@@ -666,8 +666,8 @@ sub split_and_send_changes {
if ( !$change ) {
my @future_indexes =3D
grep $_ !=3D $r_index,
- unpack "w*", $changes->[$change_index]
- if $changes->[$change_index];
+ unpack "w*",
+ exists $changes->[$change_index] ? $changes->[$change_index=
] : '';
=20
undef $changes->[$change_index];
=20
@@ -780,7 +780,7 @@ sub split_and_send_changes {
=20
my $r_index =3D delete $self->{INDEXES_BY_ID}->{$r->id};
=20
- if ( $children->[$r_index] ) {
+ if ( exists $children->[$r_index] ) {
push @cur_indexes, unpack "w*", $children->[$r_index];
}
undef $children->[$r_index]; ## undef $foo releases extra memory
--- lib/VCP/Source/p4.pm (/vendor) (revision 1048)
+++ lib/VCP/Source/p4.pm (/local) (revision 1048)
@@ -781,8 +781,9 @@ sub load_p4_labels {
next ;
}
next if $spec =3D~ m{^error: //\.\.\.\@.+ file(\(s\))?( not in la=
bel.)?$} ;
+ next if $spec =3D~ m{^error: //\.\.\..+ - no such file\(s\)\.};
$spec =3D~ /^.*?: *(\/\/.*#\d+)/
- or die "Couldn't parse name & rev from '$spec' in p4 output:\n=
$files\n" ;
+ or die "Couldn't parse name & rev from '$spec' in p4 output:\n=
$files\n";
my $id =3D $1;
=20
debug "p4 label '$label' =3D> '$id'" if debugging ;
--- lib/VCP/Utils/p4.pm (/vendor) (revision 1048)
+++ lib/VCP/Utils/p4.pm (/local) (revision 1048)
@@ -830,7 +830,7 @@ sub p4_set_client_spec {
$self->p4( [ "client", "-i" ], \$client_spec, \my $out ) ;
=20
die "unexpected stdout from p4:\np4: ", $out
- unless $out =3D~ /^Client\s.*\ssaved\./ ;
+ unless $out =3D~ /^Client\s.*\s(saved|.*not changed)\./ ;
}
=20
=3Ditem split_repo_server
--- MANIFEST (/vendor) (revision 1048)
+++ MANIFEST (/local) (revision 1048)
@@ -53,7 +53,6 @@ lib/VCP/Filter/csv_trace.pm
lib/VCP/Filter/dumpdata.pm
lib/VCP/Filter/identity.pm
lib/VCP/Filter/labelmap.pm
-lib/VCP/Filter/logmemsize.pm
lib/VCP/Filter/map.pm
lib/VCP/Filter/sort.pm
lib/VCP/Filter/stringedit.pm
@@ -164,4 +163,3 @@ t/90revml2vss_2.t
t/95p42p4.t
t/99p4_label_branch_rev_1.t
t/buildpss.ksh,v
-t/swapnfs.c,v
Property changes on:=20
___________________________________________________________________
Name: svk:merge
+514881a8-2c92-3837-943d-39ebe0ba6db1:://public/revml/...:4435
--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="clkao.log"
----------------------------------------------------------------------
r1048: clkao | 2004-09-07T14:13:07.169637Z
adjust MANIFEST and add Text::Table to prereq
----------------------------------------------------------------------
r1047: clkao | 2004-09-07T13:55:38.262243Z
merge down
----------------------------------------------------------------------
r1046: clkao | 2004-09-07T13:54:45.642767Z
r1116@portege: clkao | 2004-07-17T17:41:37.945934Z
VCP::Filter::changesets always loses the 49th revision and causes the
descendents of it all lost. This is because the 'w' packed index is
not checked safely. Also fix a dangerous "my $foo = $bar if $baz"
construct.
----------------------------------------------------------------------
r1045: clkao | 2004-09-07T13:54:02.342073Z
r1115@portege: clkao | 2004-04-18T17:11:32.004854Z
* Allow p4 client result 'not changed', for do multiple conversion
in a same test.
* Recognize the non-fatal error in p4 labels when a file is not found.
This happens when trying to mirror the revml depot.
----------------------------------------------------------------------
r1044: clkao | 2004-09-07T13:50:09.776859Z
local
----------------------------------------------------------------------
--7JfCtLOvnd9MIVvH--
--QKdGvSO+nmPlgiQ/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFBPcMSk1XldlEkA5YRAtizAJ9IvztjvFV1P8jdyMPIMCHlXVwaRwCeOgpF
ReS/kaOkXzUoGt6o1CJP1SU=
=UIZ/
-----END PGP SIGNATURE-----
--QKdGvSO+nmPlgiQ/--