git: Do the revert operation in a secondary working tree

[git.ikiwiki.info.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 788b9682706c9e3a303b0920267e8ea20061305e..38f090ff782f8799edbe074b9778477809f9d045 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -21,6 +21,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -93,8 +94,9 @@ sub preprocess (@) {
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;
                my $baseitem=IkiWiki::dirname($item);
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;
                my $baseitem=IkiWiki::dirname($item);

-               while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
-                       $parent=IkiWiki::dirname($parent);
+               my $parentbase=IkiWiki::dirname($parent);
+               while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
+                       $parentbase=IkiWiki::dirname($parentbase);

                        last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
                        $addparent="";
                        $indent--;
                        last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
                        $addparent="";
                        $indent--;


@@ -112,14 +114,10 @@ sub preprocess (@) {
                }
                my @bits=split("/", $item);
                my $p="";
                }
                my @bits=split("/", $item);
                my $p="";

+               $indent++  unless length $parent;

                $p.="/".shift(@bits) for 1..$indent;
                while ($depth > $indent) {
                $p.="/".shift(@bits) for 1..$indent;
                while ($depth > $indent) {

-                       $indent++;
-                       if ($indent > 1) {
-                               $map .= "<ul>\n";
-                       }
-                       if ($depth > $indent) {
-                               $p.="/".shift(@bits);
+                       if (@bits && !(length $parent && "/$parent" eq $p)) {

                                $addparent=$p;
                                $addparent=~s/^\///;
                                $map .= "<li>"
                                $addparent=$p;
                                $addparent=~s/^\///;
                                $map .= "<li>"


@@ -132,6 +130,11 @@ sub preprocess (@) {
                        else {
                                $openli=0;
                        }
                        else {
                                $openli=0;
                        }

+                       $indent++;
+                       $p.="/".shift(@bits) if @bits;
+                       if ($indent > 1) {
+                               $map .= "<ul>\n";
+                       }

                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"