From b298493377d7d59cca066c3e847904f01b44a796 Mon Sep 17 00:00:00 2001 From: jeckyhl Date: Mon, 4 Mar 2013 21:24:18 +0100 Subject: [PATCH 1/2] Plugin SourceSFSVN : fix wrong comparison of SourceChangeset action --- SourceSFSVN/SourceSFSVN.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceSFSVN/SourceSFSVN.php b/SourceSFSVN/SourceSFSVN.php index fbd986fa6..a12b9edc0 100644 --- a/SourceSFSVN/SourceSFSVN.php +++ b/SourceSFSVN/SourceSFSVN.php @@ -48,7 +48,7 @@ public function url_changeset( $p_repo, $p_changeset ) { } public function url_file( $p_repo, $p_changeset, $p_file ) { - if ( $p_file->action == 'D' ) { + if ( $p_file->action == 'rm' ) { return ''; } return $this->sf_url( $p_repo ) . urlencode( $p_file->filename ) . @@ -56,7 +56,7 @@ public function url_file( $p_repo, $p_changeset, $p_file ) { } public function url_diff( $p_repo, $p_changeset, $p_file ) { - if ( $p_file->action == 'D' || $p_file->action == 'A' ) { + if ( $p_file->action == 'rm' || $p_file->action == 'add' ) { return ''; } $t_diff = '?r1=' . urlencode( $p_changeset->revision ) . '&r2=' . urlencode( $p_changeset->revision - 1 ); From df68930b08c33f045d6a6f0ded7942fc38f813f9 Mon Sep 17 00:00:00 2001 From: jeckyhl Date: Mon, 4 Mar 2013 21:32:22 +0100 Subject: [PATCH 2/2] Plugin SourceSFSVN: Allow viewing removed files --- SourceSFSVN/SourceSFSVN.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SourceSFSVN/SourceSFSVN.php b/SourceSFSVN/SourceSFSVN.php index a12b9edc0..e4761f2ef 100644 --- a/SourceSFSVN/SourceSFSVN.php +++ b/SourceSFSVN/SourceSFSVN.php @@ -48,11 +48,13 @@ public function url_changeset( $p_repo, $p_changeset ) { } public function url_file( $p_repo, $p_changeset, $p_file ) { - if ( $p_file->action == 'rm' ) { - return ''; - } + # if the file has been removed, it doesn't exist in current revision + # so we generate a link to (current revision - 1) + $t_revision = ($p_file->action == 'rm') + ? $p_changeset->revision - 1 + : $p_changeset->revision; return $this->sf_url( $p_repo ) . urlencode( $p_file->filename ) . - '?view=markup&pathrev=' . urlencode( $p_changeset->revision ); + '?view=markup&pathrev=' . urlencode( $t_revision ); } public function url_diff( $p_repo, $p_changeset, $p_file ) {