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 ();
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Codestriker-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/codestriker-commits
