[use creator hash and original file name in file annotate links
Will <will@glozer.net>**20041020063238] hunk ./cgi/darcs.cgi.in 327
-        $darcs_args .= " --summary ";
-        $fh = darcs_xml($repo, "annotate", $darcs_args, $dir, $file);
+        $darcs_args .= " --summary --xml-output ";
+
+        my $creator_hash  = safe_param('ch', $hash_regex);
+        my $original_path = safe_param('o', $path_regex);
+
+        my $fh = make_xml($repo, $dir, $file);
+        
+        # use the creator hash and original file name when available so
+        # annotations can span renames        
+        if ($creator_hash ne '' && $original_path ne '') {
+            $darcs_args .= " --creator-hash '$creator_hash' ";
+            darcs($fh, $repo, "annotate", $darcs_args, '', $original_path);
+        } else {
+            darcs($fh, $repo, "annotate", $darcs_args, $dir, $file);
+        }
+
+        finish_xml($fh);
hunk ./cgi/xslt/annotate.xslt 16
-  
+
hunk ./cgi/xslt/annotate.xslt 219
-      <xsl:variable name="hash" select="modified/patch/@hash" />      
hunk ./cgi/xslt/annotate.xslt 220
+
+      <xsl:variable name="annotate-href">
+        <xsl:call-template name="make-annotate-href">
+          <xsl:with-param name="hash" select="modified/patch/@hash"/>
+        </xsl:call-template>
+      </xsl:variable>
hunk ./cgi/xslt/annotate.xslt 244
-          <td><a href="{$command}?c=annotate&amp;p={$hash}">annotate</a></td>
+          <td><a href="{$annotate-href}">annotate</a></td>
hunk ./cgi/xslt/annotate.xslt 256
-    <xsl:variable name="hash" select="*/patch/@hash"/>
+    <xsl:variable name="annotate-href">
+      <xsl:call-template name="make-annotate-href">
+        <xsl:with-param name="hash" select="preceding::modified/patch/@hash"/>
+      </xsl:call-template>
+    </xsl:variable>
hunk ./cgi/xslt/annotate.xslt 262
-    <a class="added-line" href="{$command}?c=annotate&amp;p={$hash}">
+    <a class="added-line" href="{$annotate-href}">
hunk ./cgi/xslt/annotate.xslt 265
-    <xsl:call-template name="check_removed_by"/>
+    <xsl:call-template name="check-removed-by"/>
hunk ./cgi/xslt/annotate.xslt 269
-    <xsl:variable name="hash" select="*/patch/@hash"/>
+    <xsl:variable name="annotate-href">
+      <xsl:call-template name="make-annotate-href">
+        <xsl:with-param name="hash" select="*/patch/@hash"/>
+      </xsl:call-template>
+    </xsl:variable>
hunk ./cgi/xslt/annotate.xslt 275
-    <a class="normal-line" href="{$command}?c=annotate&amp;p={$hash}">
+    <a class="normal-line" href="{$annotate-href}">
hunk ./cgi/xslt/annotate.xslt 278
-    <xsl:call-template name="check_removed_by"/>
+    <xsl:call-template name="check-removed-by"/>
hunk ./cgi/xslt/annotate.xslt 282
-    <xsl:variable name="hash" select="*/patch/@hash"/>
+    <xsl:variable name="annotate-href">
+      <xsl:call-template name="make-annotate-href">
+        <xsl:with-param name="hash" select="*/patch/@hash"/>
+      </xsl:call-template>
+    </xsl:variable>
hunk ./cgi/xslt/annotate.xslt 290
-      <a class="removed-line" href="{$command}?c=annotate&amp;p={$hash}">
+      
+      <a class="removed-line" href="{$annotate-href}">
hunk ./cgi/xslt/annotate.xslt 294
-      <xsl:call-template name="check_removed_by"/>
+      <xsl:call-template name="check-removed-by"/>
hunk ./cgi/xslt/annotate.xslt 298
-  <xsl:template name="check_removed_by">
+  <xsl:template name="check-removed-by">
hunk ./cgi/xslt/annotate.xslt 300
-
+    
+    <xsl:variable name="annotate-href">
+      <xsl:call-template name="make-annotate-href">
+        <xsl:with-param name="hash" select="$hash"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
hunk ./cgi/xslt/annotate.xslt 309
-        <a class="removed-by" href="{$command}?c=annotate&amp;p={$hash}">-</a>
+        <a class="removed-by" href="{$annotate-href}">-</a>
hunk ./cgi/xslt/annotate.xslt 341
+  </xsl:template>
+
+  <xsl:template name="make-annotate-href" xml:space="default">
+    <xsl:param name="hash"/>
+
+    <xsl:variable name="created-as" select="/darcs/*/created_as"/>
+    <xsl:variable name="creator-hash" select="$created-as/patch/@hash"/>
+    <xsl:variable name="original-name" select="$created-as/@original_name"/>
+    
+    <xsl:value-of select="$command"/>?c=annotate&amp;p=<xsl:value-of select="$hash"/>&amp;ch=<xsl:value-of select="$creator-hash"/>&amp;o=<xsl:value-of select="$original-name"/>