WebSVN – DevTools – Diff – /CodeStriker/TechGRP/trunk/lib/Codestriker/Repository/Subversion.pm

 use Fatal qw / open close /;
 # Constructor, which takes as a parameter the repository url.
 sub new {
     my ($type, $repository_url, $user, $password) = @_;
     # Determine if there are additional parameters required for user
     # authentication.
     my @userCmdLine = ();
     if (defined($user) && defined($password)) {
         push @userCmdLine, '--username';
 # The getDiff operation, pull out a change set based on the start and end
 # revision number, confined to the specified moduled_name.
 sub getDiff {
     my ($self, $start_tag, $end_tag, $module_name, $stdout_fh, $stderr_fh) = @_;
+    #
+    #   Check Module Name
+    #
+    my @errors;
+    $self->{getDiffError} = undef;
+    unless ( $module_name =~ m~/(tags|branches|trunk)(/|$)~ )
+    {
+        push @errors,
+            "Module does not contain 'tags', 'trunk' or 'branches'",
+            "Module must specify a development branch or trunk";
+    }
+    if ( $module_name =~ m~^/~ )
+    {
+        push @errors, "Module must not start with a '/'"
+    }
+    if ( @errors )
+    {
+        $self->{getDiffError} = join ('<br>', @errors);
+        return $Codestriker::OK;
+    }
     # Sanitise the URL, and determine if it refers to a directory or filename.
     $module_name = sanitise_url_component($module_name);
     my $directory;
     if ($self->is_file_url($module_name)) {
         $module_name =~ /(.*)\/[^\/]+/;
     # Execute the diff command.
     my $read_stdout_data;
     my $read_stdout_fh = new FileHandle;
     open($read_stdout_fh, '>', \$read_stdout_data);
+    #
+    #   Determine the commad to use
+    #   If user provides two numbers, then module is a full path
+    #   Otherwise assume that the user has provided named tags
+    #
+    #
     my @args = ();
     push @args, 'diff';
     push @args, '--non-interactive';
     push @args, '--no-auth-cache';
     push @args, '--trust-server-cert';
     push @args, @{ $self->{userCmdLine} };
+    if ( $start_tag =~ m~^\d+$~ )
+    {
+        my $rtag = $start_tag;
+        $rtag .= (':' . $end_tag) if $end_tag;
-    push @args, '-r';
+        push @args, '-r';
-    push @args, $start_tag . ':' . $end_tag;
+        push @args, $rtag;
-    push @args, '--old';
+        push @args, '--old';
-    push @args, $self->{repository_url};
+        push @args, $self->{repository_url};
-    push @args, $module_name;
+        push @args, $module_name;
+    }
+    else
+    {
+        my $clean_module_name = $module_name;
+        $clean_module_name =~ s~/trunk$~~;
+        $clean_module_name =~ s~/branches/.*~~;
+        $clean_module_name =~ s~/tags/.*~~;
+        push @args, '--old';
+        push @args, join ('/', $self->{repository_url}, $clean_module_name, 'tags', $start_tag);
+        if ( $end_tag )
+        {
+            push @args, '--new';
+            push @args, join ('/', $self->{repository_url}, $clean_module_name, 'tags', $end_tag);
+        }
+        else
+        {
+            push @args, '--new';
+            push @args, join ('/', $self->{repository_url}, $module_name);
+        }
+    }
     Codestriker::execute_command($read_stdout_fh, $stderr_fh,
                                  $Codestriker::svn, @args);
-    open($read_stdout_fh, '<', \$read_stdout_data);
+    my $rv = open($read_stdout_fh, '<', \$read_stdout_data);
+    if ( $rv ) {
-    while(<$read_stdout_fh>) {
+        while(<$read_stdout_fh>) {
-        my $line = $_;
+            my $line = $_;
-        # If the user specifies a path (a branch in Subversion), the
+            # If the user specifies a path (a branch in Subversion), the
-        # diff file does not come back with a path rooted from the
+            # diff file does not come back with a path rooted from the
-        # repository base making it impossible to pull the entire file
+            # repository base making it impossible to pull the entire file
-        # back out. This code attempts to change the diff file on the
+            # back out. This code attempts to change the diff file on the
-        # fly to ensure that the full path is present. This is a bug
+            # fly to ensure that the full path is present. This is a bug
-        # against Subversion, so eventually it will be fixed, so this
+            # against Subversion, so eventually it will be fixed, so this
-        # code can't break when the diff command starts returning the
+            # code can't break when the diff command starts returning the
-        # full path.
+            # full path.
-        if ($line =~ /^--- / || $line =~ /^\+\+\+ / ||
+            if ($line =~ /^--- / || $line =~ /^\+\+\+ / ||
-            $line =~ /^Index: /) {
+                $line =~ /^Index: /) {
-            # Check if the bug has been fixed.
+                # Check if the bug has been fixed.
-            if ($line =~ /^\+\+\+ $module_name/ == 0 &&
+                if ($line =~ /^\+\+\+ $module_name/ == 0 &&
-                $line =~ /^--- $module_name/ == 0 &&
+                    $line =~ /^--- $module_name/ == 0 &&
-                $line =~ /^Index: $module_name/ == 0) {
+                    $line =~ /^Index: $module_name/ == 0) {
-                    $line =~ s/^--- /--- $directory\// or
+                        $line =~ s/^--- /--- $directory\// or
-                    $line =~ s/^Index: /Index: $directory\// or
+                        $line =~ s/^Index: /Index: $directory\// or
-                    $line =~ s/^\+\+\+ /\+\+\+ $directory\//;
+                        $line =~ s/^\+\+\+ /\+\+\+ $directory\//;
+                }
+            }
-        }
-        print $stdout_fh $line;
+            print $stdout_fh $line;
+        }
+    }
     return $Codestriker::OK;
+}

Subversion Repositories DevTools

(root)/CodeStriker/TechGRP/trunk/lib/Codestriker/Repository/Subversion.pm @ 1300 – Rev 1299 → 1300