Subversion Repositories DevTools

Rev

Rev 2757 | Rev 3263 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2757 Rev 2882
Line 1066... Line 1066...
1066
    my $uref = NewSessionByWS($opt_path, 0, 1);
1066
    my $uref = NewSessionByWS($opt_path, 0, 1);
1067
    my $ws_root = $uref->SvnLocateWsRoot(1);
1067
    my $ws_root = $uref->SvnLocateWsRoot(1);
1068
    my $ws_url = $uref->FullWs();
1068
    my $ws_url = $uref->FullWs();
1069
 
1069
 
1070
    #
1070
    #
1071
    #   What we do depends what aruments the user provided
1071
    #   What we do depends what arguments the user provided
1072
    #
1072
    #
1073
    unless ( @ARGV )
1073
    unless ( @ARGV )
1074
    {
1074
    {
1075
        #
1075
        #
1076
        #   If no branch was specified - then display the workspace branch
1076
        #   If no branch was specified - then display the workspace branch
Line 1153... Line 1153...
1153
    my $uref = NewSessionByWS($opt_path, 0, 1);
1153
    my $uref = NewSessionByWS($opt_path, 0, 1);
1154
    my $ws_root = $uref->SvnLocateWsRoot(1);
1154
    my $ws_root = $uref->SvnLocateWsRoot(1);
1155
    my $ws_url = $uref->Full();
1155
    my $ws_url = $uref->Full();
1156
 
1156
 
1157
    #
1157
    #
1158
    #   Use the verion of the branch that has been committed as the base of the
1158
    #   Use the version of the branch that has been committed as the base of the
1159
    #   copy. If the user has modified files, then they won't be commited
1159
    #   copy. If the user has modified files, then they won't be committed
1160
    #
1160
    #
1161
    #   This operation will be server-side only
1161
    #   This operation will be server-side only
1162
    #
1162
    #
1163
    Message ("Creating branch: $opt_branch");
1163
    Message ("Creating branch: $opt_branch");
1164
    my $repoLink = $uref->{InfoWs}{URL} . '@' . $uref->{InfoWs}{Revision};
1164
    my $repoLink = $uref->{InfoWs}{URL} . '@' . $uref->{InfoWs}{Revision};
Line 1185... Line 1185...
1185
    Message ("Repository Ref: " . $uref->RmRef);
1185
    Message ("Repository Ref: " . $uref->RmRef);
1186
    Message ("Vcs Tag       : " . $uref->SvnTag);
1186
    Message ("Vcs Tag       : " . $uref->SvnTag);
1187
 
1187
 
1188
#    #
1188
#    #
1189
#    #   The copy operation *should* be a server side operation only
1189
#    #   The copy operation *should* be a server side operation only
1190
#    #   If the user has commited changes, but not yet updated the local
1190
#    #   If the user has committed changes, but not yet updated the local
1191
#    #   workspace, then subversion will do a client side copy
1191
#    #   workspace, then subversion will do a client side copy
1192
#    #   This is not good.
1192
#    #   This is not good.
1193
#    #
1193
#    #
1194
#    $uref->SvnCopyWs (
1194
#    $uref->SvnCopyWs (
1195
#                   target => join ('/', $ws_url, 'branches', $opt_branch),
1195
#                   target => join ('/', $ws_url, 'branches', $opt_branch),
Line 1269... Line 1269...
1269
                        'require' => 1,
1269
                        'require' => 1,
1270
                        );
1270
                        );
1271
 
1271
 
1272
    #
1272
    #
1273
    #   Must Change directory before we switch
1273
    #   Must Change directory before we switch
1274
    #   Otherwise we will import chnages into the wrong place
1274
    #   Otherwise we will import changes into the wrong place
1275
    #
1275
    #
1276
    chdir ($ws_root) || Error ("Cannot cd to: " . $ws_root);
1276
    chdir ($ws_root) || Error ("Cannot cd to: " . $ws_root);
1277
    $uref->SvnSwitch ($branch_tag, $opt_path, '--Print', '--KeepWs' );
1277
    $uref->SvnSwitch ($branch_tag, $opt_path, '--Print', '--KeepWs' );
1278
    $opr_done = 1;
1278
    $opr_done = 1;
1279
}
1279
}
Line 1294... Line 1294...
1294
 
1294
 
1295
    my $uref = NewSessionByWS($opt_path, 0, 1);
1295
    my $uref = NewSessionByWS($opt_path, 0, 1);
1296
    my $ws_url = $uref->Full();
1296
    my $ws_url = $uref->Full();
1297
 
1297
 
1298
    #
1298
    #
1299
    #   Display the packages full URL - allow the user to manuallu look at more
1299
    #   Display the packages full URL - allow the user to manually look at more
1300
    #   List the bracnhes
1300
    #   List the branches
1301
    #
1301
    #
1302
    Message ("Url: $ws_url", 'Available Branches');
1302
    Message ("Url: $ws_url", 'Available Branches');
1303
    SvnUserCmd( 'ls', join ('/', $ws_url, 'branches'), { 'credentials' => 1 });
1303
    SvnUserCmd( 'ls', join ('/', $ws_url, 'branches'), { 'credentials' => 1 });
1304
    $opr_done = 1;
1304
    $opr_done = 1;
1305
}
1305
}
Line 1963... Line 1963...
1963
    -[no]delete             - Deletes workspace after use. Default:yes
1963
    -[no]delete             - Deletes workspace after use. Default:yes
1964
    -author=name            - Force author of changes
1964
    -author=name            - Force author of changes
1965
    -date=dateString        - Force date of changes
1965
    -date=dateString        - Force date of changes
1966
    -log=text               - Append text to the commit message
1966
    -log=text               - Append text to the commit message
1967
    -datafile=path          - Export tag data for automation
1967
    -datafile=path          - Export tag data for automation
1968
    -[no]commit             - Prevent chnages being commited. Default:Yes
1968
    -[no]commit             - Prevent changes being committed. Default:Yes
1969
    -printfiles=n           - Control commit verbosity
1969
    -printfiles=n           - Control commit verbosity
1970
    -mergePaths=dirList     - Comma separated list of directores to merge
1970
    -mergePaths=dirList     - Comma separated list of directories to merge
1971
 
1971
 
1972
=head2 ARGUMENTS
1972
=head2 ARGUMENTS
1973
 
1973
 
1974
The command takes one argument: The URL of the desired package.
1974
The command takes one argument: The URL of the desired package.
1975
This may be be:
1975
This may be be:
Line 2092... Line 2092...
2092
 
2092
 
2093
Suitable numbers are: None, 0 (No Display) and 1 (Full Display).
2093
Suitable numbers are: None, 0 (No Display) and 1 (Full Display).
2094
 
2094
 
2095
=item -mergePaths=dirList
2095
=item -mergePaths=dirList
2096
 
2096
 
2097
This option specifies a Comma separated list of directores to be merged
2097
This option specifies a Comma separated list of directories to be merged
2098
during the import process. This works as via the following mechanism:
2098
during the import process. This works as via the following mechanism:
2099
 
2099
 
2100
If the named directory exists in the 'new' image it will replace that in the
2100
If the named directory exists in the 'new' image it will replace that in the
2101
'initial' workspace.
2101
'initial' workspace.
2102
 
2102