Changeset Navigation

Changeset 276

Timestamp:

01/19/2007 06:37:38 PM

Author:

luedi

Message:

fixed a missing utf8 conversion on labels
added the ability to specify a trunk directory. This is very the VSS Project Root is mapped. see #45

Files:

r273	r276
40	40	physname_seen => '',
41	41	verbose => 0,
	42	trunkdir => '',
42	43	};
43	44
…	…
715	716	# End of recursion; all items must go back to 'AAAAAAAA', which was so
716	717	# named because that's what most VSS users yell after using it much. :-)
717		return '/';
	718	return $self->{trunkdir} . '/';
718	719	}
719	720
…	…
848	849	# End of recursion; all items must go back to 'AAAAAAAA', which was so
849	850	# named because that's what most VSS users yell after using it much. :-)
850		return ['/'];
	851	return [$self->{trunkdir} . '/'];
851	852	}
852	853

r262	r276
539	539
540	540	my $label = $data->{info};
541
	541	$label = Encode::decode_utf8( $label );
	542
542	543	# It is possible that the label was deleted later, so we see here a label
543	544	# action, but no label was assigned. In this case, we only need to track
…	…
545	546	# as a valid share source.
546	547	if (defined ($label)) {
547		~~my $uniquepath = join('.', @$data{ qw(physname version) })~~;
548		my $labelpath = "$main::gCfg{labeldir}/$~~data->{info}~~$itempath";
	548	$itempath =~ s/^$main::gCfg{trunkdir}//;
	549	my $labelpath = "$main::gCfg{labeldir}/$label$itempath";
549	550
550	551	$self->_create_svn_path ($nodes, $labelpath);

r275	r276
705	705	$handler = Vss2Svn::ActionHandler->new($row);
706	706	$handler->{verbose} = $gCfg{verbose};
	707	$handler->{trunkdir} = $gCfg{trunkdir};
707	708	$physinfo = $handler->physinfo();
708	709
…	…
1572	1573	sub Initialize {
1573	1574	GetOptions(\%gCfg,'vssdir=s','tempdir=s','dumpfile=s','resume','verbose',
1574		'debug','timing+','task=s','revtimerange=i','ssphys=s','encoding=s');
	1575	'debug','timing+','task=s','revtimerange=i','ssphys=s','encoding=s','trunkdir=s');
1575	1576
1576	1577	&GiveHelp("Must specify --vssdir") if !defined($gCfg{vssdir});
…	…
1603	1604
1604	1605	$gCfg{starttime} = scalar localtime($^T);
	1606
	1607	# trunkdir should (must?) be without leading slash
	1608	$gCfg{trunkdir} = '' unless defined $gCfg{trunkdir};
	1609	$gCfg{trunkdir} =~ s:\\:/:g;
	1610	$gCfg{trunkdir} =~ s:/$::;
1605	1611
1606	1612	$gCfg{junkdir} = '/lost+found';
…	…
1714	1720	--encoding : Specify the encoding used in VSS;
1715	1721	Default is windows-1252
	1722	--trunkdir : Specify where to map the VSS Project Root in the
	1723	converted repository (default = "/")
1716	1724	EOTXT
1717	1725