templates/search.tmpl
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 538 7140bc781655
child 1410 17703aa4491e
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
538
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     1
#header#
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     2
<title>#repo|escape#: searching for #query|escape#</title>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     3
</head>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     4
<body>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     5
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     6
<div class="buttons">
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     7
<a href="?cmd=changelog;rev=#rev#">changelog</a>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     8
<a href="?cmd=tags">tags</a>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
     9
<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    10
</div>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    11
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    12
<h2>searching for #query|escape#</h2>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    13
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    14
<form>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    15
search:
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    16
<input type="hidden" name="cmd" value="changelog">
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    17
<input name="rev" type="text" width="30" value="#query|escape#">
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    18
</form>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    19
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    20
#entries#
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    21
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    22
<form>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    23
search:
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    24
<input type="hidden" name="cmd" value="changelog">
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    25
<input name="rev" type="text" width="30">
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    26
</form>
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    27
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents:
diff changeset
    28
#footer#