From c1a42e76bc6667bfb2882a12d53c25d9f952ca82 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 00:28:02 +0100
Subject: implement typed links; add tagged_is_strict config option

---
 IkiWiki/Render.pm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'IkiWiki/Render.pm')

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index abafb0887..5810fc974 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -167,6 +167,7 @@ sub scan ($) {
 		else {
 			$links{$page}=[];
 		}
+		delete $typedlinks{$page};
 
 		run_hooks(scan => sub {
 			shift->(
@@ -398,6 +399,7 @@ sub find_del_files ($) {
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
+			delete $typedlinks{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
 		}
@@ -499,6 +501,29 @@ sub remove_unrendered () {
 	}
 }
 
+sub link_types_changed ($$) {
+	# each is of the form { type => { link => 1 } }
+	my $new = shift;
+	my $old = shift;
+
+	return 0 if !defined $new && !defined $old;
+	return 1 if !defined $new || !defined $old;
+
+	while (my ($type, $links) = each %$new) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $old{$type}{$link};
+		}
+	}
+
+	while (my ($type, $links) = each %$old) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $new{$type}{$link};
+		}
+	}
+
+	return 0;
+}
+
 sub calculate_changed_links ($$$) {
 	my ($changed, $del, $oldlink_targets)=@_;
 
@@ -525,6 +550,14 @@ sub calculate_changed_links ($$$) {
 			}
 			$linkchangers{lc($page)}=1;
 		}
+
+		# we currently assume that changing the type of a link doesn't
+		# change backlinks
+		if (!exists $linkchangers{lc($page)}) {
+			if (link_types_changed($typedlinks{$page}, $oldlinktypes{$page})) {
+				$linkchangers{lc($page)}=1;
+			}
+		}
 	}
 
 	return \%backlinkchanged, \%linkchangers;
-- 
cgit v1.2.3


From f127857676ad014c97537c39cc7758a423f08b9a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 00:21:01 +0100
Subject: Fix some typos that would break Render during changed-link
 calculation

---
 IkiWiki/Render.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Render.pm')

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5810fc974..e98888d76 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -511,13 +511,13 @@ sub link_types_changed ($$) {
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
-			return 1 unless exists $old{$type}{$link};
+			return 1 unless exists $old->{$type}{$link};
 		}
 	}
 
 	while (my ($type, $links) = each %$old) {
 		foreach my $link (keys %$links) {
-			return 1 unless exists $new{$type}{$link};
+			return 1 unless exists $new->{$type}{$link};
 		}
 	}
 
@@ -554,7 +554,7 @@ sub calculate_changed_links ($$$) {
 		# we currently assume that changing the type of a link doesn't
 		# change backlinks
 		if (!exists $linkchangers{lc($page)}) {
-			if (link_types_changed($typedlinks{$page}, $oldlinktypes{$page})) {
+			if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) {
 				$linkchangers{lc($page)}=1;
 			}
 		}
-- 
cgit v1.2.3