codestriker-commits Mailing List for Codestriker: collaborative code reviewer (Page 4)
Brought to you by:
sits
Menu
▾
▴
codestriker-commits — CVS commit information for Codestriker
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(58) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(12) |
Feb
(53) |
Mar
(2) |
Apr
|
May
(36) |
Jun
(59) |
Jul
(69) |
Aug
(47) |
Sep
(54) |
Oct
(45) |
Nov
|
Dec
|
| 2006 |
Jan
(20) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(13) |
Jun
(18) |
Jul
(9) |
Aug
(12) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
(1) |
May
(2) |
Jun
(7) |
Jul
(7) |
Aug
(6) |
Sep
(5) |
Oct
(2) |
Nov
(1) |
Dec
|
| 2008 |
Jan
(7) |
Feb
(13) |
Mar
(9) |
Apr
|
May
|
Jun
(50) |
Jul
(22) |
Aug
(58) |
Sep
(28) |
Oct
|
Nov
|
Dec
|
|
From: <si...@us...> - 2008-08-06 05:24:45
|
User: sits
Date: 08/08/05 22:24:43
Modified: . CHANGELOG
lib/Codestriker/Repository Subversion.pm
Log:
* Use pegged revisions instead of operative revisions when retrieving
files from Subversion to handle situations where files have been moved
within the repository since the review was created. Fixed by
cle...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- CHANGELOG 5 Aug 2008 10:45:12 -0000 1.253
+++ CHANGELOG 6 Aug 2008 05:24:42 -0000 1.254
@@ -43,7 +43,12 @@
* Make the topic title in the edit comment page link directly to the
code location being commented on rather than just the top of the
- view topic page.
+ view topic page.
+
+* Use pegged revisions instead of operative revisions when retrieving
+ files from Subversion to handle situations where files have been moved
+ within the repository since the review was created. Fixed by
+ cle...@us....
Version 1.9.5
Index: Subversion.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/Subversion.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Subversion.pm 3 Aug 2008 01:59:55 -0000 1.23
+++ Subversion.pm 6 Aug 2008 05:24:43 -0000 1.24
@@ -71,9 +71,7 @@
push @args, '--non-interactive';
push @args, '--no-auth-cache';
push @args, @{ $self->{userCmdLine} };
- push @args, '--revision';
- push @args, $revision;
- push @args, $self->{repository_url} . '/' . $filename;
+ push @args, $self->{repository_url} . '/' . $filename . '@' . $revision;
Codestriker::execute_command($read_stdout_fh, undef,
$Codestriker::svn, @args);
|
|
From: <si...@us...> - 2008-08-06 01:58:01
|
User: sits
Date: 08/08/05 18:58:00
Modified: lib/Codestriker/Http UrlBuilder.pm
Log:
Keep the URLs shorter for default parameters which aren't defined.
Index: UrlBuilder.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/UrlBuilder.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- UrlBuilder.pm 5 Aug 2008 10:35:34 -0000 1.33
+++ UrlBuilder.pm 6 Aug 2008 01:58:00 -0000 1.34
@@ -22,15 +22,6 @@
my $self = {};
$self->{query} = $query;
- # Determine default settings.
- $self->{default_topic_create_mode} =
- defined $Codestriker::default_topic_create_mode ?
- $Codestriker::default_topic_create_mode : $Codestriker::COLOURED_MODE;
-
- $self->{default_file_to_view} =
- defined $Codestriker::default_file_to_view ?
- $Codestriker::default_file_to_view : -1;
-
# Determine what prefix is required when using relative URLs.
# Unfortunately, Netcsape 4.x does things differently to everyone
# else.
@@ -67,8 +58,8 @@
"?topic=$args{topicid}&action=view" .
(defined $args{updated} ? "&updated=$args{updated}" : "") .
(defined $args{tabwidth} ? "&tabwidth=$args{tabwidth}" : "") .
- "&mode=" . (defined $args{mode} ? $args{mode} : $self->{default_topic_create_mode}) .
- "&fview=" . (defined $args{fview} ? $args{fview} : $self->{default_file_to_view}) .
+ (defined $args{mode} ? "&mode=$args{mode}" : "") .
+ (defined $args{fview} ? "&fview=$args{fview}" : "") .
(defined $args{email} ? "&email=$args{email}" : "") .
(defined $args{filenumber} ? "#" . "$args{filenumber}|$args{line}|$args{new}" : "");
}
|
|
From: <si...@us...> - 2008-08-06 01:51:44
|
User: sits
Date: 08/08/05 18:51:42
Modified: lib/Codestriker/TopicListeners Email.pm
Log:
Missed this reference to the old view_url_extended method.
Index: Email.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/Email.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Email.pm 5 Aug 2008 10:35:34 -0000 1.28
+++ Email.pm 6 Aug 2008 01:51:42 -0000 1.29
@@ -432,9 +432,7 @@
my $query = new CGI;
my $url_builder = Codestriker::Http::UrlBuilder->new($query);
- my $topic_url = $url_builder->view_url_extended($topic->{topicid}, -1,
- "", "", "",
- $query->url(), 0);
+ my $topic_url = $url_builder->view_url(topicid => $topic);
my $subject = "[REVIEW] Topic $event_name \"" . $topic->{title} . "\"";
my $body =
|
|
From: <si...@us...> - 2008-08-05 10:45:14
|
User: sits
Date: 08/08/05 03:45:13
Modified: . CHANGELOG
Log:
Updated to reflect last commit.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- CHANGELOG 4 Aug 2008 11:22:55 -0000 1.252
+++ CHANGELOG 5 Aug 2008 10:45:12 -0000 1.253
@@ -39,7 +39,11 @@
Reported by cle...@us....
* Show total added/removed line count after table of contents on view
- topic screen. Also show same line counts on create topic email.
+ topic screen. Also show same line counts on create topic email.
+
+* Make the topic title in the edit comment page link directly to the
+ code location being commented on rather than just the top of the
+ view topic page.
Version 1.9.5
|
|
From: <si...@us...> - 2008-08-05 10:35:37
|
User: sits
Date: 08/08/05 03:35:35
Modified: lib/Codestriker/Action ViewTopicProperties.pm ViewTopic.pm
ViewTopicInfo.pm EditComment.pm SubmitNewTopic.pm
SubmitNewComment.pm ListTopicsRSS.pm ListTopics.pm
CreateTopic.pm
lib/Codestriker/Http UrlBuilder.pm
lib/Codestriker/TopicListeners BugTracking.pm Email.pm
Log:
Use named arguments to the url_builder->view_url() method. Also make the links from the edit comment pages linked back to the code point in question correctly.
Index: ViewTopicProperties.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopicProperties.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ViewTopicProperties.pm 14 Mar 2008 01:30:52 -0000 1.16
+++ ViewTopicProperties.pm 5 Aug 2008 10:35:34 -0000 1.17
@@ -67,7 +67,7 @@
my @projectids = ($topic->{project_id});
$vars->{'view_topic_url'} =
- $url_builder->view_url($topicid, -1, $mode);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'view_topicinfo_url'} = $url_builder->view_topicinfo_url($topicid);
$vars->{'view_comments_url'} = $url_builder->view_comments_url($topicid);
Index: ViewTopic.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopic.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ViewTopic.pm 4 Aug 2008 11:22:55 -0000 1.64
+++ ViewTopic.pm 5 Aug 2008 10:35:34 -0000 1.65
@@ -150,16 +150,9 @@
# Obtain the links for the different viewing modes.
$vars->{'coloured_mode_url'} =
- $url_builder->view_url($topicid, -1, $Codestriker::COLOURED_MODE, $fview);
+ $url_builder->view_url(topicid => $topicid, mode => $Codestriker::COLOURED_MODE, fview => $fview);
$vars->{'coloured_mono_mode_url'} =
- $url_builder->view_url($topicid, -1,
- $Codestriker::COLOURED_MONO_MODE, $fview);
- $vars->{'br_normal_mode_url'} =
- $url_builder->view_url($topicid, -1, $mode,
- $Codestriker::LINE_BREAK_NORMAL_MODE, $fview);
- $vars->{'br_assist_mode_url'} =
- $url_builder->view_url($topicid, -1, $mode,
- $Codestriker::LINE_BREAK_ASSIST_MODE, $fview);
+ $url_builder->view_url(topicid => $topicid, mode => $Codestriker::COLOURED_MONO_MODE, fview => $fview);
# Set template variables relating to coloured mode.
if ($mode == $Codestriker::COLOURED_MODE) {
@@ -175,14 +168,14 @@
$vars->{'tabwidth'} = $tabwidth;
$vars->{'newtabwidth'} = $newtabwidth;
$vars->{'change_tabwidth_url'} =
- $url_builder->view_url_extended($topicid, -1, $mode, $newtabwidth,
- "", "", 0, $fview);
+ $url_builder->view_url(topicid => $topicid, mode => $mode, tabwidth => $newtabwidth,
+ fview => $fview);
# Set the display all, display single URLs.
$vars->{'display_all_files_url'} =
- $url_builder->view_url($topicid, -1, $mode, -1);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'display_single_file_url'} =
- $url_builder->view_url($topicid, -1, $mode, 0);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'fview'} = $fview;
# Setup the filetable template variable for displaying the table of
@@ -200,7 +193,7 @@
$total_new_changes += $1;
}
$filerow->{href_filename_url} =
- $url_builder->view_url($topicid, -1, $mode, $i) .
+ $url_builder->view_url(topicid => $topicid, mode => $mode, fview => $i) .
"#" . $filename;
$filerow->{binary} = $binary[$i];
@@ -273,13 +266,13 @@
# Create the next/previous file URL links.
if ($filenumber > 0) {
$delta->{previous_file_url} =
- $url_builder->view_url($topicid, -1, $mode,
- $filenumber-1) . "#" . $filenames[$filenumber-1];
+ $url_builder->view_url(topicid => $topicid, mode => $mode,
+ fview => $filenumber-1) . "#" . $filenames[$filenumber-1];
}
if ($filenumber < $#filenames) {
$delta->{next_file_url} =
- $url_builder->view_url($topicid, -1, $mode,
- $filenumber+1) . "#" . $filenames[$filenumber+1];
+ $url_builder->view_url(topicid => $topicid, mode => $mode,
+ fview => $filenumber+1) . "#" . $filenames[$filenumber+1];
}
$current_filename = $delta->{filename};
@@ -351,7 +344,7 @@
my $obsoleted_topic = Codestriker::Model::Topic->new($id);
my $entry = {};
$entry->{title} = $obsoleted_topic->{title};
- $entry->{view_url} = $url_builder->view_url($id, -1);
+ $entry->{view_url} = $url_builder->view_url(topicid => $id);
push @obsoleted_topics, $entry;
}
$vars->{'obsoleted_topics'} = \@obsoleted_topics;
@@ -362,7 +355,7 @@
my $superseeded_topic = Codestriker::Model::Topic->new($id);
my $entry = {};
$entry->{title} = $superseeded_topic->{title};
- $entry->{view_url} = $url_builder->view_url($id, -1);
+ $entry->{view_url} = $url_builder->view_url(topicid => $id);
push @obsoleted_by, $entry;
}
$vars->{'obsoleted_by'} = \@obsoleted_by;
Index: ViewTopicInfo.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopicInfo.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ViewTopicInfo.pm 14 Mar 2008 01:30:52 -0000 1.13
+++ ViewTopicInfo.pm 5 Aug 2008 10:35:34 -0000 1.14
@@ -122,7 +122,7 @@
my @projectids = ($topic->{project_id});
$vars->{'view_topic_url'} =
- $url_builder->view_url($topicid, -1, $mode);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'view_topicinfo_url'} = $url_builder->view_topicinfo_url($topicid);
$vars->{'view_comments_url'} = $url_builder->view_comments_url($topicid);
Index: EditComment.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/EditComment.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- EditComment.pm 17 Jun 2008 07:23:25 -0000 1.16
+++ EditComment.pm 5 Aug 2008 10:35:34 -0000 1.17
@@ -58,7 +58,9 @@
$url_builder, $fview,
$tabwidth, 1, 0);
- my $view_topic_url = $url_builder->view_url($topicid, $line, $mode);
+ my $view_topic_url = $url_builder->view_url(topicid => $topicid, mode => $mode,
+ fview => $fn, filenumber => $fn,
+ new => $new, line => $line);
my $view_comments_url = $url_builder->view_comments_url($topicid);
$vars->{'view_topic_url'} = $view_topic_url;
Index: SubmitNewTopic.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitNewTopic.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- SubmitNewTopic.pm 14 Mar 2008 01:30:52 -0000 1.33
+++ SubmitNewTopic.pm 5 Aug 2008 10:35:34 -0000 1.34
@@ -348,8 +348,7 @@
$feedback = Codestriker::TopicListeners::Manager::topic_create($topic);
# Obtain a URL builder object and determine the URL to the topic.
- my $topic_url = $url_builder->view_url_extended($topicid, -1, "", "", "",
- $query->url(), 0);
+ my $topic_url = $url_builder->view_url(topicid => $topicid);
# Indicate to the user that the topic has been created and an email has
# been sent.
Index: SubmitNewComment.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitNewComment.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SubmitNewComment.pm 14 Mar 2008 01:30:52 -0000 1.13
+++ SubmitNewComment.pm 5 Aug 2008 10:35:34 -0000 1.14
@@ -103,7 +103,8 @@
load_anchor=>$anchor,
reload=>$reload, cache=>0);
- my $view_topic_url = $url_builder->view_url($topicid, $line, $mode);
+ my $view_topic_url = $url_builder->view_url(topicid => $topicid, mode => $mode, fview => $fn,
+ filenumber => $fn, new => $new, line => $line);
my $view_comments_url = $url_builder->view_comments_url($topicid);
my $vars = {};
Index: ListTopicsRSS.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ListTopicsRSS.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListTopicsRSS.pm 26 May 2006 05:42:48 -0000 1.4
+++ ListTopicsRSS.pm 5 Aug 2008 10:35:34 -0000 1.5
@@ -78,8 +78,7 @@
# do the easy stuff first, 1 to 1 mapping into the template.
my $link =
- $url_builder->view_url($topic->{topicid}, -1, $mode,
- $Codestriker::default_topic_br_mode);
+ $url_builder->view_url(topicid => $topic->{topicid}, mode => $mode);
my $comment_link = $url_builder->view_comments_url($topic->{topicid});
Index: ListTopics.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ListTopics.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ListTopics.pm 23 Jun 2008 22:40:18 -0000 1.33
+++ ListTopics.pm 5 Aug 2008 10:35:34 -0000 1.34
@@ -133,7 +133,7 @@
my $template_topic = {};
$template_topic->{'view_topic_url'} =
- $url_builder->view_url($topic->{topicid}, -1, $mode);
+ $url_builder->view_url(topicid => $topic->{topicid}, mode => $mode);
$template_topic->{'description'} = $topic->{description};
Index: CreateTopic.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/CreateTopic.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CreateTopic.pm 15 Jan 2006 21:20:05 -0000 1.29
+++ CreateTopic.pm 5 Aug 2008 10:35:34 -0000 1.30
@@ -103,8 +103,7 @@
my $topic = Codestriker::Model::Topic->new($topicid);
my $obsoleted_topic = {};
$obsoleted_topic->{title} = $topic->{title};
- $obsoleted_topic->{view_url} =
- $url_builder->view_url($topicid, -1);
+ $obsoleted_topic->{view_url} = $url_builder->view_url(topicid => $topicid);
push @obsoleted_topics, $obsoleted_topic;
}
}
Index: UrlBuilder.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/UrlBuilder.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- UrlBuilder.pm 21 Jun 2008 10:55:56 -0000 1.32
+++ UrlBuilder.pm 5 Aug 2008 10:35:34 -0000 1.33
@@ -21,6 +21,15 @@
my ($type, $query) = @_;
my $self = {};
$self->{query} = $query;
+
+ # Determine default settings.
+ $self->{default_topic_create_mode} =
+ defined $Codestriker::default_topic_create_mode ?
+ $Codestriker::default_topic_create_mode : $Codestriker::COLOURED_MODE;
+
+ $self->{default_file_to_view} =
+ defined $Codestriker::default_file_to_view ?
+ $Codestriker::default_file_to_view : -1;
# Determine what prefix is required when using relative URLs.
# Unfortunately, Netcsape 4.x does things differently to everyone
@@ -50,28 +59,18 @@
return bless $self, $type;
}
-# Create the URL for viewing a topic with a specified tabwidth.
-sub view_url_extended {
- my ($self, $topic, $line, $mode, $tabwidth, $email, $prefix,
- $updated, $fview) = @_;
-
- return ($prefix ne "" ? $prefix : $self->{query}->url()) .
- "?topic=$topic&action=view" .
- ($updated ? "&updated=$updated" : "") .
- ((defined $tabwidth && $tabwidth ne "") ? "&tabwidth=$tabwidth" : "") .
- ((defined $mode && $mode ne "") ? "&mode=$mode" : "") .
- ((defined $fview && $fview ne "") ? "&fview=$fview" : "") .
- ((defined $email && $email ne "") ? "&email=$email" : "") .
- ($line != -1 ? "#${line}" : "");
-}
-
# Create the URL for viewing a topic.
sub view_url {
- my ($self, $topic, $line, $mode, $fview) = @_;
- if (!(defined $mode)) { $mode = $Codestriker::default_topic_create_mode; }
- if (!(defined $fview)) { $fview = $Codestriker::default_file_to_view; }
- return $self->view_url_extended($topic, $line, $mode, "", "", "",
- undef, $fview);
+ my ($self, %args) = @_;
+
+ return (defined $args{prefix} ? $args{prefix} : $self->{query}->url()) .
+ "?topic=$args{topicid}&action=view" .
+ (defined $args{updated} ? "&updated=$args{updated}" : "") .
+ (defined $args{tabwidth} ? "&tabwidth=$args{tabwidth}" : "") .
+ "&mode=" . (defined $args{mode} ? $args{mode} : $self->{default_topic_create_mode}) .
+ "&fview=" . (defined $args{fview} ? $args{fview} : $self->{default_file_to_view}) .
+ (defined $args{email} ? "&email=$args{email}" : "") .
+ (defined $args{filenumber} ? "#" . "$args{filenumber}|$args{line}|$args{new}" : "");
}
# Create the URL for downloading the topic text.
Index: BugTracking.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/BugTracking.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BugTracking.pm 28 Feb 2008 23:17:00 -0000 1.7
+++ BugTracking.pm 5 Aug 2008 10:35:34 -0000 1.8
@@ -56,8 +56,7 @@
my $query = new CGI;
my $url_builder = Codestriker::Http::UrlBuilder->new($query);
my $topic_url =
- $url_builder->view_url_extended($topic->{topicid}, -1, "", "", "",
- $query->url(), 0);
+ $url_builder->view_url(topicid => $topic->{topicid});
my $bug_db_connection =
Codestriker::BugDB::BugDBConnectionFactory->getBugDBConnection();
@@ -113,9 +112,7 @@
my $newstate = $topic->{topic_state};
my $query = new CGI;
my $url_builder = Codestriker::Http::UrlBuilder->new($query);
- my $topic_url =
- $url_builder->view_url_extended($topic->{topicid}, -1, "", "", "",
- $query->url(), 0);
+ my $topic_url = $url_builder->view_url(topicid => $topic->{topicid});
my $bug_db_connection =
Codestriker::BugDB::BugDBConnectionFactory->getBugDBConnection();
Index: Email.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/Email.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Email.pm 4 Aug 2008 11:22:56 -0000 1.27
+++ Email.pm 5 Aug 2008 10:35:34 -0000 1.28
@@ -61,8 +61,7 @@
my @obsolete_topic_urls = ();
foreach my $obsolete_topic (@{$topic->{obsoleted_topics}}) {
push @obsolete_topic_urls,
- $url_builder->view_url_extended($obsolete_topic, -1, "", "", "",
- $query->url(), 0);
+ $url_builder->view_url(topicid => $obsolete_topic);
}
my $obsolete_text = "";
if ($#obsolete_topic_urls >= 0) {
|
|
From: <si...@us...> - 2008-08-04 11:22:58
|
User: sits
Date: 08/08/04 04:22:57
Modified: . CHANGELOG
lib/Codestriker/Action ViewTopic.pm
template/en/default viewtopic.html.tmpl
lib/Codestriker/TopicListeners Email.pm
Log:
* Show total added/removed line count after table of contents on view
topic screen. Also show same line counts on create topic email.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- CHANGELOG 4 Aug 2008 10:33:34 -0000 1.251
+++ CHANGELOG 4 Aug 2008 11:22:55 -0000 1.252
@@ -36,7 +36,10 @@
* Fixed the parsing of Subversion diffs which contained modifications
within property sets. Also fixed case where file in diff is empty.
- Reported by cle...@us....
+ Reported by cle...@us....
+
+* Show total added/removed line count after table of contents on view
+ topic screen. Also show same line counts on create topic email.
Version 1.9.5
Index: ViewTopic.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopic.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ViewTopic.pm 24 Jun 2008 02:56:15 -0000 1.63
+++ ViewTopic.pm 4 Aug 2008 11:22:55 -0000 1.64
@@ -188,11 +188,17 @@
# Setup the filetable template variable for displaying the table of
# contents.
my @filetable = ();
+ my $total_old_changes = 0;
+ my $total_new_changes = 0;
for (my $i = 0; $i <= $#filenames; $i++) {
my $filerow = {};
my $filename = $filenames[$i];
$filerow->{filename} = $filename;
$filerow->{numchanges} = $numchanges[$i];
+ if (defined $numchanges[$i] && $numchanges[$i] =~ /^\+(\d+),\-(\d+)$/o) {
+ $total_old_changes += $2;
+ $total_new_changes += $1;
+ }
$filerow->{href_filename_url} =
$url_builder->view_url($topicid, -1, $mode, $i) .
"#" . $filename;
@@ -212,6 +218,8 @@
push @filetable, $filerow;
}
$vars->{'filetable'} = \@filetable;
+ $vars->{'total_old_changes'} = $total_old_changes;
+ $vars->{'total_new_changes'} = $total_new_changes;
# Determine which deltas are to be retrieved.
my @deltas = ();
Index: viewtopic.html.tmpl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- viewtopic.html.tmpl 27 Jun 2008 00:19:10 -0000 1.52
+++ viewtopic.html.tmpl 4 Aug 2008 11:22:56 -0000 1.53
@@ -78,6 +78,9 @@
</td>
</tr>
[% END %]
+ <tr>
+ <td class="pf" colspan="3" align="right"><font size="-1">{+[% total_new_changes %],-[% total_old_changes %]}</font></td>
+ </tr>
</table>
</table>
Index: Email.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/Email.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Email.pm 14 Mar 2008 01:30:53 -0000 1.26
+++ Email.pm 4 Aug 2008 11:22:56 -0000 1.27
@@ -47,12 +47,13 @@
my $bcc = $topic->{author};
# Send out the list of files changes when creating a new topic.
- my (@filenames, @revisions, @offsets, @binary);
+ my (@filenames, @revisions, @offsets, @binary, @numchanges);
$topic->get_filestable(
\@filenames,
\@revisions,
\@offsets,
- \@binary);
+ \@binary,
+ \@numchanges);
# Determine if any topics are obsoleted by this topic.
my $query = new CGI;
@@ -74,8 +75,22 @@
"$topic->{description}\n\n" .
$obsolete_text .
"$EMAIL_HR\n\n" .
- "The topic was created with the following files:\n\n" .
- join("\n",@filenames);
+ "The topic was created with the following files:\n\n";
+
+ my $total_old_changes = 0;
+ my $total_new_changes = 0;
+ for (my $i = 0; $i <= $#filenames; $i++) {
+ $notes .= $filenames[$i];
+ if (defined $numchanges[$i]) {
+ $notes .= " {" . $numchanges[$i] . "}";
+ if ($numchanges[$i] =~ /^\+(\d+),\-(\d+)$/o) {
+ $total_old_changes += $2;
+ $total_new_changes += $1;
+ }
+ }
+ $notes .= "\n";
+ }
+ $notes .= "\nTotal line count: {+" . $total_new_changes . ",-" . $total_old_changes . "}\n";
return $self->_send_topic_email($topic, 1, "Created", 1, $from, $to, $cc,
$bcc, $notes);
|
|
From: <si...@us...> - 2008-08-04 10:33:38
|
User: sits
Date: 08/08/04 03:33:37
Modified: t/FileParser subversion.t git.t
. CHANGELOG
Added: t/FileParser hg.t
test/testtopictexts hg-diff1.txt
Log:
* Ability to parse hg diffs (Mercurial SCM) correctly.
Index: subversion.t
===================================================================
RCS file: /cvsroot/codestriker/codestriker/t/FileParser/subversion.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subversion.t 2 Aug 2008 04:47:39 -0000 1.1
+++ subversion.t 4 Aug 2008 10:33:33 -0000 1.2
@@ -3,8 +3,10 @@
use strict;
use Fatal qw / open close /;
use Test::More tests => 33;
+use Test::Differences;
use lib '../../lib';
+use Codestriker;
use Codestriker::FileParser::SubversionDiff;
assert_delta_equals('../../test/testtopictexts/svn-Propdiff1.txt', ());
@@ -12,9 +14,9 @@
assert_delta_equals('../../test/testtopictexts/svn-Propdiff3.txt', ());
assert_delta_equals('../../test/testtopictexts/svn-Propdiff4.txt',
make_delta(filename => 'parseBuildLogs',
- old_linenumber => 9,
- new_linenumber => 9,
- revision => 7,
+ old_linenumber => '9',
+ new_linenumber => '9',
+ revision => '7',
text => <<'END_DELTA',
if [[ "${MYHOSTNAME}" == "compaq" ]]; then
DATABASEHOST="elmo";
@@ -29,9 +31,9 @@
END_DELTA
),
make_delta(filename => 'buildCleanup.py',
- old_linenumber => 28,
- new_linenumber => 28,
- revision => 7,
+ old_linenumber => '28',
+ new_linenumber => '28',
+ revision => '7',
text => <<'END_DELTA',
# GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
# EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
@@ -49,9 +51,9 @@
assert_delta_equals('../../test/testtopictexts/svn-Propdiff5.txt',
make_delta(filename => 'parseBuildLogs',
- old_linenumber => 9,
- new_linenumber => 9,
- revision => 6,
+ old_linenumber => '9',
+ new_linenumber => '9',
+ revision => '6',
text => <<'END_DELTA',
if [[ "${MYHOSTNAME}" == "compaq" ]]; then
DATABASEHOST="elmo";
@@ -66,9 +68,9 @@
END_DELTA
),
make_delta(filename => 'buildCleanup.py',
- old_linenumber => 28,
- new_linenumber => 28,
- revision => 6,
+ old_linenumber => '28',
+ new_linenumber => '28',
+ revision => '6',
text => <<'END_DELTA',
# GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
# EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
@@ -86,9 +88,9 @@
assert_delta_equals('../../test/testtopictexts/svn-Propdiff6.txt',
make_delta(filename => 'parseBuildLogs',
- old_linenumber => 9,
- new_linenumber => 9,
- revision => 6,
+ old_linenumber => '9',
+ new_linenumber => '9',
+ revision => '6',
text => <<'END_DELTA',
if [[ "${MYHOSTNAME}" == "compaq" ]]; then
DATABASEHOST="elmo";
@@ -103,9 +105,9 @@
END_DELTA
),
make_delta(filename => 'buildCleanup.py',
- old_linenumber => 28,
- new_linenumber => 28,
- revision => 6,
+ old_linenumber => '28',
+ new_linenumber => '28',
+ revision => '6',
text => <<'END_DELTA',
# GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
# EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
@@ -123,9 +125,9 @@
assert_delta_equals('../../test/testtopictexts/svn-Propdiff7.txt',
make_delta(filename => 'users/clechasseur/local/devsetup/CoveoDevSetup.iss',
- old_linenumber => 31,
- new_linenumber => 31,
- revision => 44307,
+ old_linenumber => '31',
+ new_linenumber => '31',
+ revision => '44307',
text => <<'END_DELTA',
[Languages]
@@ -136,9 +138,9 @@
assert_delta_equals('../../test/testtopictexts/svn-Propdiff8.txt',
make_delta(filename => 'users/clechasseur/local/devsetup/CoveoDevSetup.iss',
- old_linenumber => 31,
- new_linenumber => 31,
- revision => 44309,
+ old_linenumber => '31',
+ new_linenumber => '31',
+ revision => '44309',
text => <<'END_DELTA',
[Languages]
@@ -149,9 +151,9 @@
assert_delta_equals('../../test/testtopictexts/svn-look-diff1.txt',
make_delta(filename => 't1.txt',
- old_linenumber => 0,
- new_linenumber => 1,
- revision => 0,
+ old_linenumber => '0',
+ new_linenumber => '1',
+ revision => '0',
text => <<'END_DELTA',
+line1
+line2
@@ -161,9 +163,9 @@
assert_delta_equals('../../test/testtopictexts/svn-look-diff2.txt',
make_delta(filename => 't1.txt',
- old_linenumber => 1,
- new_linenumber => 1,
- revision => 89,
+ old_linenumber => '1',
+ new_linenumber => '1',
+ revision => '89',
text => <<'END_DELTA',
+line0
line1
@@ -175,9 +177,9 @@
assert_delta_equals('../../test/testtopictexts/svn-look-diff3.txt',
make_delta(filename => 't1.txt',
- old_linenumber => 1,
- new_linenumber => 0,
- revision => 90,
+ old_linenumber => '1',
+ new_linenumber => '0',
+ revision => '90',
text => <<'END_DELTA',
-line0
-line1
@@ -189,9 +191,9 @@
assert_delta_equals('../../test/testtopictexts/svn-look-diff4.txt',
make_delta(filename => 't1.txt',
- old_linenumber => 1,
- new_linenumber => 1,
- revision => 92,
+ old_linenumber => '1',
+ new_linenumber => '1',
+ revision => '92',
text => <<'END_DELTA',
-l1
+l1
@@ -200,9 +202,9 @@
END_DELTA
),
make_delta(filename => 't2.txt',
- old_linenumber => 1,
- new_linenumber => 0,
- revision => 92,
+ old_linenumber => '1',
+ new_linenumber => '0',
+ revision => '92',
text => <<'END_DELTA',
-l1
END_DELTA
@@ -214,11 +216,12 @@
new_linenumber => -1,
text => '',
binary => 1,
+ revision => $Codestriker::PATCH_REVISION
),
make_delta(filename => 't2.txt',
- old_linenumber => 0,
- new_linenumber => 1,
- revision => 93,
+ old_linenumber => '0',
+ new_linenumber => '1',
+ revision => '93',
text => <<'END_DELTA',
+aaa
+bbb
@@ -232,11 +235,12 @@
new_linenumber => -1,
text => '',
binary => 1,
+ revision => $Codestriker::REMOVED_REVISION
),
make_delta(filename => 't1.txt',
- old_linenumber => 1,
- new_linenumber => 1,
- revision => 94,
+ old_linenumber => '1',
+ new_linenumber => '1',
+ revision => '94',
text => <<'END_DELTA',
l1
+l11
@@ -246,9 +250,9 @@
END_DELTA
),
make_delta(filename => 't2.txt',
- old_linenumber => 1,
- new_linenumber => 0,
- revision => 94,
+ old_linenumber => '1',
+ new_linenumber => '0',
+ revision => '94',
text => <<'END_DELTA',
-aaa
-bbb
@@ -256,9 +260,9 @@
END_DELTA
),
make_delta(filename => 't3.txt',
- old_linenumber => 0,
- new_linenumber => 1,
- revision => 0,
+ old_linenumber => '0',
+ new_linenumber => '1',
+ revision => '0',
text => <<'END_DELTA',
+labuda
END_DELTA
@@ -301,7 +305,7 @@
# Check that the extracted deltas match what is expected.
is( @actual, @expected, "Number of deltas for file: $filename" );
for ( my $index = 0; $index < @actual; $index++ ) {
- is_deeply( $actual[$index], $expected[$index],
- "Delta $index in file $filename" );
+ eq_or_diff( $actual[$index], $expected[$index],
+ "Delta $index in file $filename" );
}
}
\ No newline at end of file
Index: git.t
===================================================================
RCS file: /cvsroot/codestriker/codestriker/t/FileParser/git.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.t 14 Jul 2008 06:54:00 -0000 1.2
+++ git.t 4 Aug 2008 10:33:33 -0000 1.3
@@ -5,6 +5,7 @@
use Test::More tests => 7;
use lib '../../lib';
+use Codestriker;
use Codestriker::FileParser::PatchUnidiff;
# Parse the test git patch file.
Index: hg.t
===================================================================
RCS file: hg.t
diff -N hg.t
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hg.t 4 Aug 2008 10:33:33 -0000 1.1
@@ -0,0 +1,126 @@
+# Tests to ensure that hg diffs (Mercurial SCM) are handled correctly.
+
+use strict;
+use Fatal qw / open close /;
+use Test::More tests => 6;
+
+use lib '../../lib';
+use Codestriker;
+use Codestriker::FileParser::PatchUnidiff;
+
+# Parse the test hg patch file.
+my $fh;
+open( $fh, '<', '../../test/testtopictexts/hg-diff1.txt' );
+my @deltas = Codestriker::FileParser::PatchUnidiff->parse($fh);
+close($fh);
+
+# Set what the expected output should be.
+my @expected;
+push @expected, make_delta(
+ filename => 'b/addedtest.txt',
+ old_linenumber => 0,
+ new_linenumber => 1,
+ revision => $Codestriker::ADDED_REVISION,
+ text => <<'END_DELTA',
++Lorem ipsum dolor sit amet, consectetuer
++adipiscing elit. Sed laoreet erat vel arcu. Vestibulum
++ante ipsum primis in faucibus orci luctus et ultrices posuere
++cubilia Curae; Aliquam et diam ac nisi congue semper. Nulla
++consequat. Cras molestie dictum turpis. Aenean lorem diam,
++luctus at, tempus ac, semper ut, lorem. Nulla consequat, velit
++eu tincidunt commodo, diam lorem sodales leo, vitae aliquet leo
++leo eget eros. Vestibulum consectetuer iaculis pede.
++Suspendisse potenti. Sed non magna. Donec vel augue.
++Sed iaculis nisi sed nunc. Sed cursus tellus eu risus.
++Ut eros quam, imperdiet et, ultricies non, iaculis at, sem.
++Donec et lacus in massa aliquet pretium. Suspendisse lacus.
++Vestibulum ante ipsum primis in faucib
++us orci luctus et ultrices posuere cubilia Curae;
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'a/deletetest.txt',
+ old_linenumber => 1,
+ new_linenumber => 0,
+ revision => $Codestriker::REMOVED_REVISION,
+ text => <<'END_DELTA',
+-Class aptent taciti sociosqu ad litora torquent
+-per conubia nostra, per inceptos himenaeos.
+-Aliquam auctor. Proin tempor commodo nisl.
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/feedback.html',
+ old_linenumber => 10,
+ new_linenumber => 10,
+ text => <<'END_DELTA',
+ }
+ div.modalFeedback h1{
+ margin: 20px 20px 20px 20px;
+- font-size: 18pt;
+ }
+ #feedbackForm textarea {
+ font-family: Arial,Helvetica,sans-serif;
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/feedback.html',
+ old_linenumber => 23,
+ new_linenumber => 22,
+ text => <<'END_DELTA',
+ border: solid 3px #ddddFF;
+ padding: 3px;
+ width: 50px;
++ height: 50px;
+ }
+ #feedbackForm input#feedback_email{
+ width: 60%;
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/feedback.html',
+ old_linenumber => 31,
+ new_linenumber => 31,
+ text => <<'END_DELTA',
+ </head>
+ <body>
+
+-Hello from hg
++Hello to codestriker from hg
+
+ </body>
+ </html>
+END_DELTA
+);
+
+# Check that the extracted deltas match what is expected.
+is( @deltas, @expected, "Number of deltas in hg diff 1" );
+for ( my $index = 0; $index < @deltas; $index++ ) {
+ is_deeply( $deltas[$index], $expected[$index],
+ "Delta $index in hg diff 1" );
+}
+
+# Convenience function for creating a delta object.
+sub make_delta {
+
+ # Set constant properties for all git deltas.
+ my $delta = {};
+ $delta->{binary} = 0;
+ $delta->{repmatch} = 0;
+ $delta->{revision} = $Codestriker::PATCH_REVISION;
+ $delta->{description} = '';
+
+ # Apply the passed in arguments.
+ my %arg = @_;
+ $delta->{filename} = $arg{filename};
+ $delta->{old_linenumber} = $arg{old_linenumber};
+ $delta->{new_linenumber} = $arg{new_linenumber};
+ $delta->{text} = $arg{text};
+ $delta->{revision} = $arg{revision} if exists $arg{revision};
+
+ return $delta;
+}
Index: hg-diff1.txt
===================================================================
RCS file: hg-diff1.txt
diff -N hg-diff1.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hg-diff1.txt 4 Aug 2008 10:33:34 -0000 1.1
@@ -0,0 +1,54 @@
+diff -r 24ed0f64c715 -r 6d633e6509fe addedtest.txt
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/addedtest.txt Sun Aug 03 16:58:46 2008 +0200
+@@ -0,0 +1,14 @@
++Lorem ipsum dolor sit amet, consectetuer
++adipiscing elit. Sed laoreet erat vel arcu. Vestibulum
++ante ipsum primis in faucibus orci luctus et ultrices posuere
++cubilia Curae; Aliquam et diam ac nisi congue semper. Nulla
++consequat. Cras molestie dictum turpis. Aenean lorem diam,
++luctus at, tempus ac, semper ut, lorem. Nulla consequat, velit
++eu tincidunt commodo, diam lorem sodales leo, vitae aliquet leo
++leo eget eros. Vestibulum consectetuer iaculis pede.
++Suspendisse potenti. Sed non magna. Donec vel augue.
++Sed iaculis nisi sed nunc. Sed cursus tellus eu risus.
++Ut eros quam, imperdiet et, ultricies non, iaculis at, sem.
++Donec et lacus in massa aliquet pretium. Suspendisse lacus.
++Vestibulum ante ipsum primis in faucib
++us orci luctus et ultrices posuere cubilia Curae;
+\ No newline at end of file
+diff -r 24ed0f64c715 -r 6d633e6509fe deletetest.txt
+--- a/deletetest.txt Sun Aug 03 16:57:40 2008 +0200
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,3 +0,0 @@
+-Class aptent taciti sociosqu ad litora torquent
+-per conubia nostra, per inceptos himenaeos.
+-Aliquam auctor. Proin tempor commodo nisl.
+diff -r 24ed0f64c715 -r 6d633e6509fe feedback.html
+--- a/feedback.html Sun Aug 03 16:57:40 2008 +0200
++++ b/feedback.html Sun Aug 03 16:58:46 2008 +0200
+@@ -10,7 +10,6 @@
+ }
+ div.modalFeedback h1{
+ margin: 20px 20px 20px 20px;
+- font-size: 18pt;
+ }
+ #feedbackForm textarea {
+ font-family: Arial,Helvetica,sans-serif;
+@@ -23,6 +22,7 @@
+ border: solid 3px #ddddFF;
+ padding: 3px;
+ width: 50px;
++ height: 50px;
+ }
+ #feedbackForm input#feedback_email{
+ width: 60%;
+@@ -31,7 +31,7 @@
+ </head>
+ <body>
+
+-Hello from hg
++Hello to codestriker from hg
+
+ </body>
+ </html>
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- CHANGELOG 3 Aug 2008 02:08:58 -0000 1.250
+++ CHANGELOG 4 Aug 2008 10:33:34 -0000 1.251
@@ -23,6 +23,8 @@
* Ability to parse git patches correctly.
+* Ability to parse hg diffs (Mercurial SCM) correctly.
+
* Better detection of filename extensions for highlighting. This
previously caused issues for temporary directories which contained
a period, but the filename itself didn't. Reported by
|
|
From: <si...@us...> - 2008-08-03 02:08:59
|
User: sits
Date: 08/08/02 19:08:58
Modified: template/en/default listtopics.xml.tmpl
. CHANGELOG
Log:
* Make sure XML representation of a topic has its data properly escaped.
Fixed by rob...@us....
Index: listtopics.xml.tmpl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/template/en/default/listtopics.xml.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- listtopics.xml.tmpl 20 Jun 2008 04:27:15 -0000 1.1
+++ listtopics.xml.tmpl 3 Aug 2008 02:08:58 -0000 1.2
@@ -5,23 +5,23 @@
[% FOREACH topic = alltopics %]
<topic>
<topicid>[% topic.topicid %]</topicid>
- <title>[% topic.title %]</title>
- <description>[% topic.description %]</description>
- <topic_state>[% topic.topic_state %]</topic_state>
+ <title>[% topic.title | html_entity %]</title>
+ <description>[% topic.description | html_entity %]</description>
+ <topic_state>[% topic.topic_state | html_entity %]</topic_state>
<topic_state_id>[% topic.topic_state_id %]</topic_state_id>
- <author>[% topic.author %]</author>
- <cc>[% topic.cc %]</cc>
- <reviewers>[% topic.reviewers %]</reviewers>
- <project_name>[% topic.project_name %]</project_name>
+ <author>[% topic.author | html_entity %]</author>
+ <cc>[% topic.cc | html_entity %]</cc>
+ <reviewers>[% topic.reviewers | html_entity %]</reviewers>
+ <project_name>[% topic.project_name | html_entity %]</project_name>
<project_id>[% topic.project_id %]</project_id>
[%# Make sure we remove any password from the end of the repository %]
- <repository>[% topic.repository.split( ';' ).0 %]</repository>
- <module>[% topic.module %]</module>
- <start_tag>[% topic.start_tag %]</start_tag>
- <end_tag>[% topic.end_tag %]</end_tag>
- <bug_ids>[% topic.bug_ids %]</bug_ids>
+ <repository>[% topic.repository.split( ';' ).0 | html_entity %]</repository>
+ <module>[% topic.module | html_entity %]</module>
+ <start_tag>[% topic.start_tag | html_entity %]</start_tag>
+ <end_tag>[% topic.end_tag | html_entity %]</end_tag>
+ <bug_ids>[% topic.bug_ids | html_entity %]</bug_ids>
<version>[% topic.version %]</version>
- <creation_ts>[% topic.creation_ts %]</creation_ts>
+ <creation_ts>[% topic.creation_ts | html_entity %]</creation_ts>
</topic>
[% END %]
</topics>
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- CHANGELOG 2 Aug 2008 04:49:07 -0000 1.249
+++ CHANGELOG 3 Aug 2008 02:08:58 -0000 1.250
@@ -16,7 +16,10 @@
* Creation of Subversion topics which use a file for the module field
in the create topic screen may not work correctly for some versions
of Subversion. This has now been fixed by
- rob...@us....
+ rob...@us....
+
+* Make sure XML representation of a topic has its data properly escaped.
+ Fixed by rob...@us....
* Ability to parse git patches correctly.
|
|
From: <si...@us...> - 2008-08-03 01:59:57
|
User: sits
Date: 08/08/02 18:59:55
Modified: lib/Codestriker/Repository Subversion.pm Cvs.pm
Log:
Fixed up some uninitialised warnings - from cle...@us....
Index: Subversion.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/Subversion.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Subversion.pm 11 Jul 2008 23:12:50 -0000 1.22
+++ Subversion.pm 3 Aug 2008 01:59:55 -0000 1.23
@@ -63,7 +63,7 @@
# Sanitise the filename.
$filename = sanitise_url_component($filename);
- my $read_data;
+ my $read_data = '';
my $read_stdout_fh = new FileHandle;
open($read_stdout_fh, '>', \$read_data);
my @args = ();
@@ -192,7 +192,7 @@
}
# Execute the diff command.
- my $read_stdout_data;
+ my $read_stdout_data = '';
my $read_stdout_fh = new FileHandle;
open($read_stdout_fh, '>', \$read_stdout_data);
Index: Cvs.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/Cvs.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Cvs.pm 5 Jul 2008 04:06:54 -0000 1.10
+++ Cvs.pm 3 Aug 2008 01:59:55 -0000 1.11
@@ -77,7 +77,7 @@
# Open a pipe to the CVS repository.
$ENV{'CVS_RSH'} = $Codestriker::ssh if defined $Codestriker::ssh;
- my $read_data;
+ my $read_data = '';
my $read_stdout_fh = new FileHandle;
open($read_stdout_fh, '>', \$read_data);
my @args = ();
|
|
From: <si...@us...> - 2008-08-02 04:49:07
|
User: sits
Date: 08/08/01 21:49:07
Modified: . CHANGELOG
Log:
Forgot to mention how entries with empty content are also handled.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- CHANGELOG 2 Aug 2008 04:47:41 -0000 1.248
+++ CHANGELOG 2 Aug 2008 04:49:07 -0000 1.249
@@ -30,7 +30,8 @@
rob...@us....
* Fixed the parsing of Subversion diffs which contained modifications
- within property sets. Reported by cle...@us....
+ within property sets. Also fixed case where file in diff is empty.
+ Reported by cle...@us....
Version 1.9.5
|
|
From: <si...@us...> - 2008-08-02 04:47:42
|
User: sits
Date: 08/08/01 21:47:41
Modified: lib/Codestriker/FileParser SubversionDiff.pm UnidiffUtils.pm
. CHANGELOG
Added: t/FileParser subversion.t
test/testtopictexts svn-PropDiff8.txt svn-PropDiff7.txt
Log:
* Fixed the parsing of Subversion diffs which contained modifications
within property sets. Reported by cle...@us....
Also added unit tests over all subversion test topics.
Index: subversion.t
===================================================================
RCS file: subversion.t
diff -N subversion.t
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ subversion.t 2 Aug 2008 04:47:39 -0000 1.1
@@ -0,0 +1,307 @@
+# Tests to ensure that subversion patches are handled correctly.
+
+use strict;
+use Fatal qw / open close /;
+use Test::More tests => 33;
+
+use lib '../../lib';
+use Codestriker::FileParser::SubversionDiff;
+
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff1.txt', ());
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff2.txt', ());
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff3.txt', ());
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff4.txt',
+ make_delta(filename => 'parseBuildLogs',
+ old_linenumber => 9,
+ new_linenumber => 9,
+ revision => 7,
+ text => <<'END_DELTA',
+ if [[ "${MYHOSTNAME}" == "compaq" ]]; then
+ DATABASEHOST="elmo";
+ XMLDIR="$HOME/downloads/cruise-xml"
+- else
+- DATABASEHOST="webdev2";
+- XMLDIR="/export/home/buildmaster/cruisecontrol/logs"
+- fi
+ fi
+
+ if [ -x "/usr/bin/python2" ]; then
+END_DELTA
+ ),
+ make_delta(filename => 'buildCleanup.py',
+ old_linenumber => 28,
+ new_linenumber => 28,
+ revision => 7,
+ text => <<'END_DELTA',
+ # GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
+ # EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
+
+- GCOMDirectories = [ 'testdata/branches/GCOM' ]
+- EPRODirectories = [ 'testdata/branches/EPRODATA' ]
+
+- activeGraingerBuild = database.getActiveBuild("PRD", "gcom")
+- activeEPROBuild = database.getActiveBuild("PRD", "eprodata")
+
+ print activeGraingerBuild.getBranchIdentifier()
+ print activeEPROBuild.getBranchIdentifier()
+END_DELTA
+ ));
+
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff5.txt',
+ make_delta(filename => 'parseBuildLogs',
+ old_linenumber => 9,
+ new_linenumber => 9,
+ revision => 6,
+ text => <<'END_DELTA',
+ if [[ "${MYHOSTNAME}" == "compaq" ]]; then
+ DATABASEHOST="elmo";
+ XMLDIR="$HOME/downloads/cruise-xml"
+- else
+- DATABASEHOST="webdev2";
+- XMLDIR="/export/home/buildmaster/cruisecontrol/logs"
+- fi
+ fi
+
+ if [ -x "/usr/bin/python2" ]; then
+END_DELTA
+ ),
+ make_delta(filename => 'buildCleanup.py',
+ old_linenumber => 28,
+ new_linenumber => 28,
+ revision => 6,
+ text => <<'END_DELTA',
+ # GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
+ # EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
+
+- GCOMDirectories = [ 'testdata/branches/GCOM' ]
+- EPRODirectories = [ 'testdata/branches/EPRODATA' ]
+
+- activeGraingerBuild = database.getActiveBuild("PRD", "gcom")
+- activeEPROBuild = database.getActiveBuild("PRD", "eprodata")
+
+ print activeGraingerBuild.getBranchIdentifier()
+ print activeEPROBuild.getBranchIdentifier()
+END_DELTA
+ ));
+
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff6.txt',
+ make_delta(filename => 'parseBuildLogs',
+ old_linenumber => 9,
+ new_linenumber => 9,
+ revision => 6,
+ text => <<'END_DELTA',
+ if [[ "${MYHOSTNAME}" == "compaq" ]]; then
+ DATABASEHOST="elmo";
+ XMLDIR="$HOME/downloads/cruise-xml"
+- else
+- DATABASEHOST="webdev2";
+- XMLDIR="/export/home/buildmaster/cruisecontrol/logs"
+- fi
+ fi
+
+ if [ -x "/usr/bin/python2" ]; then
+END_DELTA
+ ),
+ make_delta(filename => 'buildCleanup.py',
+ old_linenumber => 28,
+ new_linenumber => 28,
+ revision => 6,
+ text => <<'END_DELTA',
+ # GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
+ # EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
+
+- GCOMDirectories = [ 'testdata/branches/GCOM' ]
+- EPRODirectories = [ 'testdata/branches/EPRODATA' ]
+
+- activeGraingerBuild = database.getActiveBuild("PRD", "gcom")
+- activeEPROBuild = database.getActiveBuild("PRD", "eprodata")
+
+ print activeGraingerBuild.getBranchIdentifier()
+ print activeEPROBuild.getBranchIdentifier()
+END_DELTA
+ ));
+
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff7.txt',
+ make_delta(filename => 'users/clechasseur/local/devsetup/CoveoDevSetup.iss',
+ old_linenumber => 31,
+ new_linenumber => 31,
+ revision => 44307,
+ text => <<'END_DELTA',
+
+ [Languages]
+ Name: english; MessagesFile: compiler:Default.isl
++; woo!
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-Propdiff8.txt',
+ make_delta(filename => 'users/clechasseur/local/devsetup/CoveoDevSetup.iss',
+ old_linenumber => 31,
+ new_linenumber => 31,
+ revision => 44309,
+ text => <<'END_DELTA',
+
+ [Languages]
+ Name: english; MessagesFile: compiler:Default.isl
++; woo!
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff1.txt',
+ make_delta(filename => 't1.txt',
+ old_linenumber => 0,
+ new_linenumber => 1,
+ revision => 0,
+ text => <<'END_DELTA',
++line1
++line2
++line3
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff2.txt',
+ make_delta(filename => 't1.txt',
+ old_linenumber => 1,
+ new_linenumber => 1,
+ revision => 89,
+ text => <<'END_DELTA',
++line0
+ line1
+ line2
++line2.2
+ line3
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff3.txt',
+ make_delta(filename => 't1.txt',
+ old_linenumber => 1,
+ new_linenumber => 0,
+ revision => 90,
+ text => <<'END_DELTA',
+-line0
+-line1
+-line2
+-line2.2
+-line3
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff4.txt',
+ make_delta(filename => 't1.txt',
+ old_linenumber => 1,
+ new_linenumber => 1,
+ revision => 92,
+ text => <<'END_DELTA',
+-l1
++l1
++l2
++l3
+END_DELTA
+ ),
+ make_delta(filename => 't2.txt',
+ old_linenumber => 1,
+ new_linenumber => 0,
+ revision => 92,
+ text => <<'END_DELTA',
+-l1
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff5.txt',
+ make_delta(filename => 'show_user_photo.jpg',
+ old_linenumber => -1,
+ new_linenumber => -1,
+ text => '',
+ binary => 1,
+ ),
+ make_delta(filename => 't2.txt',
+ old_linenumber => 0,
+ new_linenumber => 1,
+ revision => 93,
+ text => <<'END_DELTA',
++aaa
++bbb
++ccc
+END_DELTA
+));
+
+assert_delta_equals('../../test/testtopictexts/svn-look-diff6.txt',
+ make_delta(filename => 'show_user_photo.jpg',
+ old_linenumber => -1,
+ new_linenumber => -1,
+ text => '',
+ binary => 1,
+ ),
+ make_delta(filename => 't1.txt',
+ old_linenumber => 1,
+ new_linenumber => 1,
+ revision => 94,
+ text => <<'END_DELTA',
+ l1
++l11
+ l2
++l22
+ l3
+END_DELTA
+ ),
+ make_delta(filename => 't2.txt',
+ old_linenumber => 1,
+ new_linenumber => 0,
+ revision => 94,
+ text => <<'END_DELTA',
+-aaa
+-bbb
+-ccc
+END_DELTA
+ ),
+ make_delta(filename => 't3.txt',
+ old_linenumber => 0,
+ new_linenumber => 1,
+ revision => 0,
+ text => <<'END_DELTA',
++labuda
+END_DELTA
+));
+
+# Convenience function for creating a delta object.
+sub make_delta {
+
+ # Set constant properties for all subversion deltas.
+ my $delta = {};
+ $delta->{binary} = 0;
+ $delta->{repmatch} = 1;
+ $delta->{description} = '';
+
+ # Apply the passed in arguments.
+ my %arg = @_;
+ $delta->{filename} = $arg{filename};
+ $delta->{revision} = $arg{revision};
+ $delta->{old_linenumber} = $arg{old_linenumber};
+ $delta->{new_linenumber} = $arg{new_linenumber};
+ $delta->{text} = $arg{text};
+ $delta->{binary} = $arg{binary} if exists $arg{binary};
+
+ return $delta;
+}
+
+# Function for parsing the topic text, and check that the parsed deltas
+# matched the expected deltas.
+sub assert_delta_equals {
+ my $filename = shift;
+ my @expected = @_;
+
+ # Open up the specified file and attempt to parse the deltas
+ # from it.
+ my $fh;
+ open( $fh, '<', $filename );
+ my @actual = Codestriker::FileParser::SubversionDiff->parse($fh);
+ close($fh);
+
+ # Check that the extracted deltas match what is expected.
+ is( @actual, @expected, "Number of deltas for file: $filename" );
+ for ( my $index = 0; $index < @actual; $index++ ) {
+ is_deeply( $actual[$index], $expected[$index],
+ "Delta $index in file $filename" );
+ }
+}
\ No newline at end of file
Index: SubversionDiff.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/FileParser/SubversionDiff.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SubversionDiff.pm 17 Jun 2008 06:51:37 -0000 1.9
+++ SubversionDiff.pm 2 Aug 2008 04:47:40 -0000 1.10
@@ -45,36 +45,37 @@
while ($line =~ /^.*Property changes on: .*$/o) {
$line = <$fh>;
return () unless defined $line &&
- $line =~ /^___________________________________________________________________$/o;
+ $line =~ /^___________________________________________________________________$/o;
- # Keep reading until we either get to an Index: line, a property
- # block, an Added/Deleted/Modified lines or the end of file.
- while (defined $line &&
- $line !~ /^.*Index:/o &&
- $line !~ /^.*Added:/o &&
- $line !~ /^.*Deleted:/o &&
- $line !~ /^.*Modified:/o &&
- $line !~ /^.*Copied:/o &&
- $line !~ /^.*Property changes on:/o) {
- $line = <$fh>;
- }
-
- if (! defined $line) {
- # End of file has been reached, return what we have parsed.
- return @result;
- }
- }
+ # Keep reading until we either get to the separator line or end of file.
+ while (defined $line &&
+ $line !~ /^===================================================================$/o) {
+ if ($line =~ /^.*(Index|Added|Modified|Copied|Deleted): (.*)$/o) {
+ $entry_type = $1;
+ $filename = $2;
+ }
+ $line = <$fh>;
+ }
+
+ if (!defined $line) {
+ # End of file has been reached, return what we have parsed.
+ return @result;
+ }
+ }
- return () unless
- $line =~ /^.*(Index|Added|Modified|Copied|Deleted): (.*)$/o;
- $entry_type = $1;
- $filename = $2;
- $line = <$fh>;
+ if ($line =~ /^.*(Index|Added|Modified|Copied|Deleted): (.*)$/o) {
+ $entry_type = $1;
+ $filename = $2;
+ $line = <$fh>;
+ }
# The separator line appears next.
return () unless defined $line && $line =~ /^===================================================================$/o;
$line = <$fh>;
+ # Check if this is a file entry with no content. If so, skip it.
+ next if ! defined $line || $line =~ /^\s*$/o;
+
# Check if the delta represents a binary file.
if ($line =~ /^Cannot display: file marked as a binary type\./o ||
$line =~ /^\(Binary files differ\)/o) {
Index: UnidiffUtils.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/FileParser/UnidiffUtils.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UnidiffUtils.pm 18 Aug 2007 04:54:08 -0000 1.6
+++ UnidiffUtils.pm 2 Aug 2008 04:47:40 -0000 1.7
@@ -52,6 +52,10 @@
if ($num_matched_old_lines >= $number_old_lines &&
$num_matched_new_lines >= $number_new_lines) {
last unless $line =~ /^\s*$/o;
+
+ # Consume excessive blank lines.
+ $line = <$fh>;
+ next;
}
else {
if ($line =~ /^\-/o) {
Index: svn-PropDiff8.txt
===================================================================
RCS file: svn-PropDiff8.txt
diff -N svn-PropDiff8.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ svn-PropDiff8.txt 2 Aug 2008 04:47:40 -0000 1.1
@@ -0,0 +1,16 @@
+Index: users/clechasseur/local/devsetup/CoveoDevSetup.iss
+===================================================================
+--- users/clechasseur/local/devsetup/CoveoDevSetup.iss (revision 44309)
++++ users/clechasseur/local/devsetup/CoveoDevSetup.iss (revision 44310)
+@@ -31,3 +31,4 @@
+
+ [Languages]
+ Name: english; MessagesFile: compiler:Default.isl
++; woo!
+
+Property changes on: CoveoDevSetup.iss
+___________________________________________________________________
+Added: test:foo
+ + bar
+
+
Index: svn-PropDiff7.txt
===================================================================
RCS file: svn-PropDiff7.txt
diff -N svn-PropDiff7.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ svn-PropDiff7.txt 2 Aug 2008 04:47:40 -0000 1.1
@@ -0,0 +1,19 @@
+Index: users/clechasseur/local/devsetup/CoveoDevSetup.iss
+===================================================================
+--- users/clechasseur/local/devsetup/CoveoDevSetup.iss (revision 44307)
++++ users/clechasseur/local/devsetup/CoveoDevSetup.iss (revision 44308)
+@@ -31,3 +31,4 @@
+
+ [Languages]
+ Name: english; MessagesFile: compiler:Default.isl
++; woo!
+Index: users/clechasseur/local/devsetup/New Text Document.txt
+===================================================================
+
+Property changes on: New Text Document.txt
+___________________________________________________________________
+Added: svn:keywords
+ + Id HeadURL
+
+Index: users/clechasseur/local/devsetup/New Text Document (2).datata
+===================================================================
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- CHANGELOG 22 Jul 2008 00:57:49 -0000 1.247
+++ CHANGELOG 2 Aug 2008 04:47:41 -0000 1.248
@@ -28,6 +28,9 @@
* Scmbug integration now works correctly if multiple bug IDs are
specified is the create topic screen. Fixed by
rob...@us....
+
+* Fixed the parsing of Subversion diffs which contained modifications
+ within property sets. Reported by cle...@us....
Version 1.9.5
|
|
From: <si...@us...> - 2008-07-22 00:57:50
|
User: sits
Date: 08/07/21 17:57:50
Modified: . CHANGELOG
lib/Codestriker/Repository ScmBug.pm
Log:
* Scmbug integration now works correctly if multiple bug IDs are
specified is the create topic screen. Fixed by
rob...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- CHANGELOG 22 Jul 2008 00:50:44 -0000 1.246
+++ CHANGELOG 22 Jul 2008 00:57:49 -0000 1.247
@@ -23,7 +23,11 @@
* Better detection of filename extensions for highlighting. This
previously caused issues for temporary directories which contained
a period, but the filename itself didn't. Reported by
- rob...@us....
+ rob...@us....
+
+* Scmbug integration now works correctly if multiple bug IDs are
+ specified is the create topic screen. Fixed by
+ rob...@us....
Version 1.9.5
Index: ScmBug.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/ScmBug.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScmBug.pm 22 Feb 2008 00:32:07 -0000 1.2
+++ ScmBug.pm 22 Jul 2008 00:57:49 -0000 1.3
@@ -58,7 +58,11 @@
sub getDiff {
my ($self, $bugids, $stdout_fh, $stderr_fh, $default_to_head) = @_;
- my $affected_files_list = $self->{scmbug}->get_affected_files( $bugids );
+ # Remove spaces from the comma-separated list of bug ids so that
+ # "123, 456" is transformed to "123,456" which is the form
+ # Scmbug::ActivityUtilities expects.
+ $bugids =~ s/ //g;
+ my $affected_files_list = $self->{scmbug}->get_affected_files($bugids);
foreach my $changeset ( @{ $affected_files_list } ) {
|
|
From: <si...@us...> - 2008-07-22 00:50:45
|
User: sits
Date: 08/07/21 17:50:44
Modified: . CHANGELOG
lib/Codestriker/Http HighlightLineFilter.pm
Log:
* Better detection of filename extensions for highlighting. This
previously caused issues for temporary directories which contained
a period, but the filename itself didn't. Reported by
rob...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- CHANGELOG 11 Jul 2008 23:12:50 -0000 1.245
+++ CHANGELOG 22 Jul 2008 00:50:44 -0000 1.246
@@ -18,7 +18,12 @@
of Subversion. This has now been fixed by
rob...@us....
-* Ability to parse git patches correctly.
+* Ability to parse git patches correctly.
+
+* Better detection of filename extensions for highlighting. This
+ previously caused issues for temporary directories which contained
+ a period, but the filename itself didn't. Reported by
+ rob...@us....
Version 1.9.5
Index: HighlightLineFilter.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/HighlightLineFilter.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HighlightLineFilter.pm 1 Jul 2008 05:59:50 -0000 1.6
+++ HighlightLineFilter.pm 22 Jul 2008 00:50:44 -0000 1.7
@@ -75,7 +75,8 @@
# Determine the filename extension so the highlighter knows what language
# to apply highlighting to. Handle CVS files which might end in ,v.
my $extension = ".txt";
- if ($delta->{filename} =~ /^.*(\..*),v$/o || $delta->{filename} =~ /^.*(\..*)$/o) {
+ if ($delta->{filename} =~ /^.*(\.[^\/\\]*),v$/o ||
+ $delta->{filename} =~ /^.*(\.[^\/\\]*)$/o) {
$extension = $1;
}
|
|
From: <si...@us...> - 2008-07-14 06:54:01
|
User: sits
Date: 08/07/13 23:54:00
Modified: t/FileParser git.t
Log:
Ran perltidy over it.
Index: git.t
===================================================================
RCS file: /cvsroot/codestriker/codestriker/t/FileParser/git.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.t 14 Jul 2008 05:35:59 -0000 1.1
+++ git.t 14 Jul 2008 06:54:00 -0000 1.2
@@ -9,17 +9,18 @@
# Parse the test git patch file.
my $fh;
-open($fh, '<', '../../test/testtopictexts/git-diff1.txt');
+open( $fh, '<', '../../test/testtopictexts/git-diff1.txt' );
my @deltas = Codestriker::FileParser::PatchUnidiff->parse($fh);
close($fh);
# Set what the expected output should be.
my @expected;
push @expected, make_delta(
- filename => 'b/builtin-apply.c',
+ filename => 'b/builtin-apply.c',
old_linenumber => 2296,
new_linenumber => 2296,
- description => 'static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *',
+ description =>
+ 'static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *',
text => <<'END_DELTA',
strbuf_init(&buf, 0);
@@ -34,10 +35,11 @@
);
push @expected, make_delta(
- filename => 'b/builtin-apply.c',
+ filename => 'b/builtin-apply.c',
old_linenumber => 2375,
new_linenumber => 2376,
- description => 'static int verify_index_match(struct cache_entry *ce, struct stat *st)',
+ description =>
+ 'static int verify_index_match(struct cache_entry *ce, struct stat *st)',
text => <<'END_DELTA',
static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
{
@@ -51,10 +53,11 @@
);
push @expected, make_delta(
- filename => 'b/builtin-apply.c',
+ filename => 'b/builtin-apply.c',
old_linenumber => 2389,
new_linenumber => 2390,
- description => 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
+ description =>
+ 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
text => <<'END_DELTA',
return 0;
@@ -70,10 +73,11 @@
);
push @expected, make_delta(
- filename => 'b/builtin-apply.c',
+ filename => 'b/builtin-apply.c',
old_linenumber => 2399,
new_linenumber => 2402,
- description => 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
+ description =>
+ 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
text => <<'END_DELTA',
if (stat_ret && errno != ENOENT)
return error("%s: %s", old_name, strerror(errno));
@@ -86,11 +90,11 @@
);
push @expected, make_delta(
- filename => 'b/t/t4112-apply-renames.sh',
+ filename => 'b/t/t4112-apply-renames.sh',
old_linenumber => 36,
new_linenumber => 36,
- description => 'typedef struct __jmp_buf jmp_buf[1];',
- text => <<'END_DELTA',
+ description => 'typedef struct __jmp_buf jmp_buf[1];',
+ text => <<'END_DELTA',
#endif /* _SETJMP_H */
EOF
@@ -104,11 +108,11 @@
);
push @expected, make_delta(
- filename => 'b/t/t4112-apply-renames.sh',
+ filename => 'b/t/t4112-apply-renames.sh',
old_linenumber => 113,
new_linenumber => 116,
- description => 'rename to include/arch/m32r/klibc/archsetjmp.h',
- text => <<'END_DELTA',
+ description => 'rename to include/arch/m32r/klibc/archsetjmp.h',
+ text => <<'END_DELTA',
-#endif /* _SETJMP_H */
+#endif /* _KLIBC_ARCHSETJMP_H */
@@ -136,26 +140,28 @@
);
# Check that the extracted deltas match what is expected.
-is(@deltas, @expected, "Number of deltas in git patch 1");
-for (my $index = 0; $index < @deltas; $index++) {
- is_deeply($deltas[$index], $expected[$index], "Delta $index in git patch 1");
+is( @deltas, @expected, "Number of deltas in git patch 1" );
+for ( my $index = 0; $index < @deltas; $index++ ) {
+ is_deeply( $deltas[$index], $expected[$index],
+ "Delta $index in git patch 1" );
}
# Convenience function for creating a delta object.
sub make_delta {
+
# Set constant properties for all git deltas.
my $delta = {};
- $delta->{binary} = 0;
- $delta->{repmatch} = 0;
- $delta->{revision} = $Codestriker::PATCH_REVISION;
+ $delta->{binary} = 0;
+ $delta->{repmatch} = 0;
+ $delta->{revision} = $Codestriker::PATCH_REVISION;
# Apply the passed in arguments.
my %arg = @_;
- $delta->{filename} = $arg{filename};
+ $delta->{filename} = $arg{filename};
$delta->{old_linenumber} = $arg{old_linenumber};
$delta->{new_linenumber} = $arg{new_linenumber};
- $delta->{description} = $arg{description};
- $delta->{text} = $arg{text};
+ $delta->{description} = $arg{description};
+ $delta->{text} = $arg{text};
- return $delta;
-}
\ No newline at end of file
+ return $delta;
+}
|
|
From: <si...@us...> - 2008-07-14 05:36:01
|
User: sits
Date: 08/07/13 22:35:59
Modified: lib/Codestriker/FileParser PatchUnidiff.pm
Added: t/FileParser git.t
Log:
Added unit test for parsing git patches.
Index: git.t
===================================================================
RCS file: git.t
diff -N git.t
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ git.t 14 Jul 2008 05:35:59 -0000 1.1
@@ -0,0 +1,161 @@
+# Tests to ensure that git patches are handled correctly.
+
+use strict;
+use Fatal qw / open close /;
+use Test::More tests => 7;
+
+use lib '../../lib';
+use Codestriker::FileParser::PatchUnidiff;
+
+# Parse the test git patch file.
+my $fh;
+open($fh, '<', '../../test/testtopictexts/git-diff1.txt');
+my @deltas = Codestriker::FileParser::PatchUnidiff->parse($fh);
+close($fh);
+
+# Set what the expected output should be.
+my @expected;
+push @expected, make_delta(
+ filename => 'b/builtin-apply.c',
+ old_linenumber => 2296,
+ new_linenumber => 2296,
+ description => 'static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *',
+ text => <<'END_DELTA',
+
+ strbuf_init(&buf, 0);
+
+- if ((tpatch = in_fn_table(patch->old_name)) != NULL) {
++ if (!(patch->is_copy || patch->is_rename) &&
++ ((tpatch = in_fn_table(patch->old_name)) != NULL)) {
+ if (tpatch == (struct patch *) -1) {
+ return error("patch %s has been renamed/deleted",
+ patch->old_name);
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/builtin-apply.c',
+ old_linenumber => 2375,
+ new_linenumber => 2376,
+ description => 'static int verify_index_match(struct cache_entry *ce, struct stat *st)',
+ text => <<'END_DELTA',
+ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
+ {
+ const char *old_name = patch->old_name;
+- struct patch *tpatch;
++ struct patch *tpatch = NULL;
+ int stat_ret = 0;
+ unsigned st_mode = 0;
+
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/builtin-apply.c',
+ old_linenumber => 2389,
+ new_linenumber => 2390,
+ description => 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
+ text => <<'END_DELTA',
+ return 0;
+
+ assert(patch->is_new <= 0);
+- if ((tpatch = in_fn_table(old_name)) != NULL) {
++
++ if (!(patch->is_copy || patch->is_rename) &&
++ (tpatch = in_fn_table(old_name)) != NULL) {
+ if (tpatch == (struct patch *) -1) {
+ return error("%s: has been deleted/renamed", old_name);
+ }
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/builtin-apply.c',
+ old_linenumber => 2399,
+ new_linenumber => 2402,
+ description => 'static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s',
+ text => <<'END_DELTA',
+ if (stat_ret && errno != ENOENT)
+ return error("%s: %s", old_name, strerror(errno));
+ }
++
+ if (check_index && !tpatch) {
+ int pos = cache_name_pos(old_name, strlen(old_name));
+ if (pos < 0) {
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/t/t4112-apply-renames.sh',
+ old_linenumber => 36,
+ new_linenumber => 36,
+ description => 'typedef struct __jmp_buf jmp_buf[1];',
+ text => <<'END_DELTA',
+
+ #endif /* _SETJMP_H */
+ EOF
++cat >klibc/README <<\EOF
++This is a simple readme file.
++EOF
+
+ cat >patch <<\EOF
+ diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/cris/klibc/archsetjmp.h
+END_DELTA
+);
+
+push @expected, make_delta(
+ filename => 'b/t/t4112-apply-renames.sh',
+ old_linenumber => 113,
+ new_linenumber => 116,
+ description => 'rename to include/arch/m32r/klibc/archsetjmp.h',
+ text => <<'END_DELTA',
+
+ -#endif /* _SETJMP_H */
+ +#endif /* _KLIBC_ARCHSETJMP_H */
++diff --git a/klibc/README b/klibc/README
++--- a/klibc/README
+++++ b/klibc/README
++@@ -1,1 +1,4 @@
++ This is a simple readme file.
+++And we add a few
+++lines at the
+++end of it.
++diff --git a/klibc/README b/klibc/arch/README
++copy from klibc/README
++copy to klibc/arch/README
++--- a/klibc/README
+++++ b/klibc/arch/README
++@@ -1,1 +1,3 @@
++ This is a simple readme file.
+++And we copy it to one level down, and
+++add a few lines at the end of it.
+ EOF
+
+ find klibc -type f -print | xargs git update-index --add --
+END_DELTA
+);
+
+# Check that the extracted deltas match what is expected.
+is(@deltas, @expected, "Number of deltas in git patch 1");
+for (my $index = 0; $index < @deltas; $index++) {
+ is_deeply($deltas[$index], $expected[$index], "Delta $index in git patch 1");
+}
+
+# Convenience function for creating a delta object.
+sub make_delta {
+ # Set constant properties for all git deltas.
+ my $delta = {};
+ $delta->{binary} = 0;
+ $delta->{repmatch} = 0;
+ $delta->{revision} = $Codestriker::PATCH_REVISION;
+
+ # Apply the passed in arguments.
+ my %arg = @_;
+ $delta->{filename} = $arg{filename};
+ $delta->{old_linenumber} = $arg{old_linenumber};
+ $delta->{new_linenumber} = $arg{new_linenumber};
+ $delta->{description} = $arg{description};
+ $delta->{text} = $arg{text};
+
+ return $delta;
+}
\ No newline at end of file
Index: PatchUnidiff.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/FileParser/PatchUnidiff.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PatchUnidiff.pm 11 Jul 2008 09:50:22 -0000 1.6
+++ PatchUnidiff.pm 14 Jul 2008 05:35:59 -0000 1.7
@@ -69,7 +69,7 @@
} elsif ($line =~ /^\-\-\- \/dev\/null/o) {
# File has been added.
$revision = $Codestriker::ADDED_REVISION;
- } elsif ($line =~ /^\-\-\- ([^\t]+)/o) {
+ } elsif ($line =~ /^\-\-\- ([^\t\n]+)/o) {
# Note git and quilt diffs don't have a tab character unlike normal diffs.
$filename = $1;
} else {
@@ -85,7 +85,7 @@
if ($line =~ /^\+\+\+ \/dev\/null/o) {
# File has been removed.
$revision = $Codestriker::REMOVED_REVISION;
- } elsif ($line =~ /^\+\+\+ ([^\t]+)/o) {
+ } elsif ($line =~ /^\+\+\+ ([^\t\n]+)/o) {
$filename = $1;
} else {
return ();
|
|
From: <si...@us...> - 2008-07-14 05:35:56
|
User: sits Date: 08/07/13 22:35:55 codestriker/t/FileParser - New directory |
|
From: <si...@us...> - 2008-07-14 05:35:56
|
User: sits Date: 08/07/13 22:35:55 codestriker/t - New directory |
|
From: <si...@us...> - 2008-07-12 03:10:41
|
User: sits
Date: 08/07/11 20:10:40
Modified: lib/Codestriker/Template/Plugin AutomagicLinks.pm
Log:
Fixed the corner case where the link wasn't shown correctly if at the end of the comment.
Index: AutomagicLinks.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Template/Plugin/AutomagicLinks.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AutomagicLinks.pm 9 Feb 2006 23:19:38 -0000 1.3
+++ AutomagicLinks.pm 12 Jul 2008 03:10:40 -0000 1.4
@@ -16,19 +16,19 @@
# First handle any URL linking.
my @words = split /(\s)/, $text;
my $result = "";
- for (my $i = 0; $i <= $#words; $i++) {
- if ($words[$i] =~ /^([A-Za-z]+:\/\/.*[A-Za-z0-9_])(.*)$/o) {
+ for my $word (@words) {
+ if ($word =~ /^([A-Za-z]+:\/\/[^<]+[^<\.])(.*)$/o) {
# A URL, create a link to it.
- $result .= "<A HREF=\"$1\">$1</A>$2";
+ $result .= "<a href=\"$1\">$1</a>$2";
} else {
- $result .= $words[$i];
+ $result .= $word;
}
}
# If there is a link to a bug tracking system, automagically modify all
# text of the form "[Bb]ug \d+" to a hyperlink for that bug record.
if (defined $Codestriker::bugtracker && $Codestriker::bugtracker ne "") {
- $result =~ s/(\b)([Bb][Uu][Gg]\s*(\d+))(\b)/$1<A HREF="${Codestriker::bugtracker}$3">$1$2$4<\/A>/mg;
+ $result =~ s/(\b)([Bb][Uu][Gg]\s*(\d+))(\b)/$1<a href="${Codestriker::bugtracker}$3">$1$2$4<\/a>/mg;
}
return $result;
|
|
From: <si...@us...> - 2008-07-11 23:12:51
|
User: sits
Date: 08/07/11 16:12:50
Modified: . CHANGELOG
lib/Codestriker/Repository Subversion.pm
Log:
* Creation of Subversion topics which use a file for the module field
in the create topic screen may not work correctly for some versions
of Subversion. This has now been fixed by
rob...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- CHANGELOG 11 Jul 2008 09:50:21 -0000 1.244
+++ CHANGELOG 11 Jul 2008 23:12:50 -0000 1.245
@@ -11,7 +11,12 @@
Perl 5.10 from rob...@us....
* Deleting a topic connected with a TestDirector bug has been fixed
- from rob...@us....
+ by rob...@us....
+
+* Creation of Subversion topics which use a file for the module field
+ in the create topic screen may not work correctly for some versions
+ of Subversion. This has now been fixed by
+ rob...@us....
* Ability to parse git patches correctly.
Index: Subversion.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/Subversion.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Subversion.pm 18 Jun 2008 04:47:14 -0000 1.21
+++ Subversion.pm 11 Jul 2008 23:12:50 -0000 1.22
@@ -135,7 +135,7 @@
open($read_stdout_fh, '<', \$read_data);
while (<$read_stdout_fh>) {
if (/kind\s*\=\s*\"(\w+)\"/) {
- $file_url = $1 eq "File";
+ $file_url = $1 =~ /^File$/io;
last;
}
}
|
|
From: <si...@us...> - 2008-07-11 09:50:24
|
User: sits
Date: 08/07/11 02:50:22
Modified: . CHANGELOG
template/en/default viewdeltas.html.tmpl
viewdeltaheader.html.tmpl
lib/Codestriker/FileParser PatchUnidiff.pm
Added: test/testtopictexts git-diff1.txt
Log:
Ability to parse git patches correctly.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- CHANGELOG 11 Jul 2008 04:49:28 -0000 1.243
+++ CHANGELOG 11 Jul 2008 09:50:21 -0000 1.244
@@ -12,6 +12,8 @@
* Deleting a topic connected with a TestDirector bug has been fixed
from rob...@us....
+
+* Ability to parse git patches correctly.
Version 1.9.5
Index: viewdeltas.html.tmpl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewdeltas.html.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viewdeltas.html.tmpl 1 Jul 2008 11:08:47 -0000 1.9
+++ viewdeltas.html.tmpl 11 Jul 2008 09:50:22 -0000 1.10
@@ -18,8 +18,8 @@
[%# Output the diff description if it is present. #%]
[% IF delta.description != "" %]
<tr>
- <td class="line" colspan="2">[% delta.description | html_entity %]</td>
- <td class="line" colspan="2">[% delta.description | html_entity %]</td>
+ <td class="line" align="left">[% delta.description | html_entity %]</td>
+ <td class="line" align="right">[% delta.description | html_entity %]</td>
</tr>
[% END %]
</table>
Index: viewdeltaheader.html.tmpl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewdeltaheader.html.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- viewdeltaheader.html.tmpl 13 Mar 2008 22:39:07 -0000 1.2
+++ viewdeltaheader.html.tmpl 11 Jul 2008 09:50:22 -0000 1.3
@@ -10,7 +10,7 @@
[% ELSE %]
[% delta.filename | html_entity %]
[% END %]
- (Revision [% delta.revision %])
+ [% IF delta.revision != "0.1" %](Revision [% delta.revision %])[% END %]
</td>
<td class="file" align="right">
Index: PatchUnidiff.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/FileParser/PatchUnidiff.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PatchUnidiff.pm 29 Jun 2007 05:38:31 -0000 1.5
+++ PatchUnidiff.pm 11 Jul 2008 09:50:22 -0000 1.6
@@ -46,6 +46,14 @@
$line = <$fh>;
}
return () unless defined $line;
+
+ # Git patches might have an index: line, such as:
+ # index b3fc290..d13313f 100644
+ if ($line =~ /^index /o) {
+ $line = <$fh>;
+ }
+ return () unless defined $line;
+
# Need to check for binary file differences.
# Unfortunately, when you provide the "-N" argument to diff,
@@ -61,7 +69,8 @@
} elsif ($line =~ /^\-\-\- \/dev\/null/o) {
# File has been added.
$revision = $Codestriker::ADDED_REVISION;
- } elsif ($line =~ /^\-\-\- (.*)\t/o) {
+ } elsif ($line =~ /^\-\-\- ([^\t]+)/o) {
+ # Note git and quilt diffs don't have a tab character unlike normal diffs.
$filename = $1;
} else {
return ();
@@ -76,7 +85,7 @@
if ($line =~ /^\+\+\+ \/dev\/null/o) {
# File has been removed.
$revision = $Codestriker::REMOVED_REVISION;
- } elsif ($line =~ /^\+\+\+ (.*)\t/o) {
+ } elsif ($line =~ /^\+\+\+ ([^\t]+)/o) {
$filename = $1;
} else {
return ();
Index: git-diff1.txt
===================================================================
RCS file: git-diff1.txt
diff -N git-diff1.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ git-diff1.txt 11 Jul 2008 09:50:22 -0000 1.1
@@ -0,0 +1,80 @@
+diff --git a/builtin-apply.c b/builtin-apply.c
+index b3fc290..d13313f 100644
+--- a/builtin-apply.c
++++ b/builtin-apply.c
+@@ -2296,7 +2296,8 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
+
+ strbuf_init(&buf, 0);
+
+- if ((tpatch = in_fn_table(patch->old_name)) != NULL) {
++ if (!(patch->is_copy || patch->is_rename) &&
++ ((tpatch = in_fn_table(patch->old_name)) != NULL)) {
+ if (tpatch == (struct patch *) -1) {
+ return error("patch %s has been renamed/deleted",
+ patch->old_name);
+@@ -2375,7 +2376,7 @@ static int verify_index_match(struct cache_entry *ce, struct stat *st)
+ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
+ {
+ const char *old_name = patch->old_name;
+- struct patch *tpatch;
++ struct patch *tpatch = NULL;
+ int stat_ret = 0;
+ unsigned st_mode = 0;
+
+@@ -2389,7 +2390,9 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
+ return 0;
+
+ assert(patch->is_new <= 0);
+- if ((tpatch = in_fn_table(old_name)) != NULL) {
++
++ if (!(patch->is_copy || patch->is_rename) &&
++ (tpatch = in_fn_table(old_name)) != NULL) {
+ if (tpatch == (struct patch *) -1) {
+ return error("%s: has been deleted/renamed", old_name);
+ }
+@@ -2399,6 +2402,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
+ if (stat_ret && errno != ENOENT)
+ return error("%s: %s", old_name, strerror(errno));
+ }
++
+ if (check_index && !tpatch) {
+ int pos = cache_name_pos(old_name, strlen(old_name));
+ if (pos < 0) {
+diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh
+index 70a1859..f9ad183 100755
+--- a/t/t4112-apply-renames.sh
++++ b/t/t4112-apply-renames.sh
+@@ -36,6 +36,9 @@ typedef struct __jmp_buf jmp_buf[1];
+
+ #endif /* _SETJMP_H */
+ EOF
++cat >klibc/README <<\EOF
++This is a simple readme file.
++EOF
+
+ cat >patch <<\EOF
+ diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/cris/klibc/archsetjmp.h
+@@ -113,6 +116,23 @@ rename to include/arch/m32r/klibc/archsetjmp.h
+
+ -#endif /* _SETJMP_H */
+ +#endif /* _KLIBC_ARCHSETJMP_H */
++diff --git a/klibc/README b/klibc/README
++--- a/klibc/README
+++++ b/klibc/README
++@@ -1,1 +1,4 @@
++ This is a simple readme file.
+++And we add a few
+++lines at the
+++end of it.
++diff --git a/klibc/README b/klibc/arch/README
++copy from klibc/README
++copy to klibc/arch/README
++--- a/klibc/README
+++++ b/klibc/arch/README
++@@ -1,1 +1,3 @@
++ This is a simple readme file.
+++And we copy it to one level down, and
+++add a few lines at the end of it.
+ EOF
+
+ find klibc -type f -print | xargs git update-index --add --
|
|
From: <si...@us...> - 2008-07-11 04:49:30
|
User: sits
Date: 08/07/10 21:49:29
Modified: . CHANGELOG
lib/Codestriker/BugDB TestDirectorConnection.pm
Log:
* Deleting a topic connected with a TestDirector bug has been fixed
from rob...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- CHANGELOG 10 Jul 2008 10:43:55 -0000 1.242
+++ CHANGELOG 11 Jul 2008 04:49:28 -0000 1.243
@@ -8,7 +8,10 @@
Spotted by mn...@us....
* Fix for "v-string in use/require non-portable" warning when using
- Perl 5.10 from rob...@us....
+ Perl 5.10 from rob...@us....
+
+* Deleting a topic connected with a TestDirector bug has been fixed
+ from rob...@us....
Version 1.9.5
Index: TestDirectorConnection.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/BugDB/TestDirectorConnection.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestDirectorConnection.pm 22 Feb 2008 00:56:21 -0000 1.3
+++ TestDirectorConnection.pm 11 Jul 2008 04:49:29 -0000 1.4
@@ -128,7 +128,6 @@
}
$attach_counter++;
}
- $attachments->post();
}
}
|
|
From: <si...@us...> - 2008-07-10 10:43:59
|
User: sits
Date: 08/07/10 03:43:55
Modified: bin codestriker.pl.base install.pl
. CHANGELOG
Log:
* Fix for "v-string in use/require non-portable" warning when using
Perl 5.10 from rob...@us....
Index: codestriker.pl.base
===================================================================
RCS file: /cvsroot/codestriker/codestriker/bin/codestriker.pl.base,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- codestriker.pl.base 22 Feb 2008 00:32:00 -0000 1.25
+++ codestriker.pl.base 10 Jul 2008 10:43:55 -0000 1.26
@@ -12,13 +12,13 @@
# This is the top level package which receives all HTTP requests, and
# delegates it to the appropriate Action module.
-require 5.8.0;
+require 5.008_0;
# Set this to the location of the Codestriker libraries on your system.
# Ideally, this should be done in the apache configs, but trying to do this
# in an easy way for Apache1/Apache2 with/without mod_perl with/without taint
# checking turned out to be a major headache. For mod_perl, setting this
-# ensures the first time Codestiker is loaded, it can be compiled properly,
+# ensures the first time Codestriker is loaded, it can be compiled properly,
# even if @INC is blatted later. Also note all the use declarations below
# effectively "pre-load" all of the Codestriker modules in the system, as the
# modules below load all of their supporting modules. That is why the
Index: install.pl
===================================================================
RCS file: /cvsroot/codestriker/codestriker/bin/install.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- install.pl 17 Jun 2008 12:00:54 -0000 1.18
+++ install.pl 10 Jul 2008 10:43:55 -0000 1.19
@@ -24,7 +24,7 @@
use Config;
use lib '../lib';
-require 5.8.0;
+require 5.008_0;
# Now load up the required modules. Do this is a lazy fashion so that Perl
# doesn't try to grab this during compile time, otherwise nasty-looking
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- CHANGELOG 7 Jul 2008 23:11:33 -0000 1.241
+++ CHANGELOG 10 Jul 2008 10:43:55 -0000 1.242
@@ -6,6 +6,9 @@
* "Default to head" option for CVS topic creation was not used when
selected, but when it was unselected. This has now been fixed.
Spotted by mn...@us....
+
+* Fix for "v-string in use/require non-portable" warning when using
+ Perl 5.10 from rob...@us....
Version 1.9.5
|
|
From: <si...@us...> - 2008-07-07 23:11:35
|
User: sits
Date: 08/07/07 16:11:34
Modified: . CHANGELOG
Log:
Updated changelog to reflect that sorting of topic filenames is enabled by default.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- CHANGELOG 5 Jul 2008 04:06:54 -0000 1.240
+++ CHANGELOG 7 Jul 2008 23:11:33 -0000 1.241
@@ -78,7 +78,7 @@
topic should be ordered by filename. Apparently Subversion can
produce diff topics in some circumstances in arbitrary order,
where using this setting would make sense. Default is for this
- setting to disabled.
+ setting to be enabled.
Version 1.9.4
|
|
From: <si...@us...> - 2008-07-05 04:06:55
|
User: sits
Date: 08/07/04 21:06:55
Modified: . CHANGELOG
lib/Codestriker/Repository Cvs.pm
Log:
* "Default to head" option for CVS topic creation was not used when
selected, but when it was unselected. This has now been fixed.
Spotted by mn...@us....
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- CHANGELOG 2 Jul 2008 00:39:53 -0000 1.239
+++ CHANGELOG 5 Jul 2008 04:06:54 -0000 1.240
@@ -1,6 +1,12 @@
*** When upgrading, don't forget to: "cd bin ; ./install.pl" ***
*** Also, it is _highly_ advisable to backup your data before upgrading ***
+Version 1.9.6
+
+* "Default to head" option for CVS topic creation was not used when
+ selected, but when it was unselected. This has now been fixed.
+ Spotted by mn...@us....
+
Version 1.9.5
* Syntax highlighting is now supported using the highlight package from
Index: Cvs.pm
===================================================================
RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Repository/Cvs.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cvs.pm 6 Sep 2007 08:02:17 -0000 1.9
+++ Cvs.pm 5 Jul 2008 04:06:54 -0000 1.10
@@ -142,7 +142,7 @@
}
# Cheat - having two '-u's changes nothing.
- my $extra_options = $default_to_head ? '-u' : '-f';
+ my $extra_options = $default_to_head ? '-f' : '-u';
$ENV{'CVS_RSH'} = $Codestriker::ssh if defined $Codestriker::ssh;
|
|
From: <si...@us...> - 2008-07-02 00:39:56
|
User: sits
Date: 08/07/01 17:39:53
Modified: . CHANGELOG
Log:
Fixed typo.
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- CHANGELOG 2 Jul 2008 00:37:00 -0000 1.238
+++ CHANGELOG 2 Jul 2008 00:39:53 -0000 1.239
@@ -60,7 +60,7 @@
in either the start or end tag field.
* Updated the Codestriker CSS file significantly based on the work by
- Kannan Goundan <ca...@us...> ands Daniel Noll.
+ Kannan Goundan <ca...@us...> and Daniel Noll.
Also changed the appearance of the application to give it a more
modern appearance.
|
164 messages has been excluded from this view by a project administrator.
