2014-08-06 20:43:59 +04:00
|
|
|
#require serve
|
2011-11-07 06:14:54 +04:00
|
|
|
|
2010-09-26 22:41:32 +04:00
|
|
|
setting up repo
|
|
|
|
|
|
|
|
$ hg init test
|
|
|
|
$ cd test
|
|
|
|
$ echo a > a
|
|
|
|
$ echo b > b
|
|
|
|
$ hg ci -Ama
|
|
|
|
adding a
|
|
|
|
adding b
|
|
|
|
|
|
|
|
change permissions for git diffs
|
|
|
|
|
2012-07-04 14:43:13 +04:00
|
|
|
$ hg import -q --bypass - <<EOF
|
|
|
|
> # HG changeset patch
|
|
|
|
> # User test
|
|
|
|
> # Date 0 0
|
|
|
|
> b
|
|
|
|
>
|
|
|
|
> diff --git a/a b/a
|
|
|
|
> old mode 100644
|
|
|
|
> new mode 100755
|
|
|
|
> diff --git a/b b/b
|
|
|
|
> deleted file mode 100644
|
|
|
|
> --- a/b
|
|
|
|
> +++ /dev/null
|
|
|
|
> @@ -1,1 +0,0 @@
|
|
|
|
> -b
|
|
|
|
> EOF
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
set up hgweb
|
|
|
|
|
|
|
|
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
|
|
|
|
revision
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'rev/0'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
2011-04-28 19:02:39 +04:00
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<title>test: 0cd96de13884</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2010-09-26 22:41:32 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/0">log</a></li>
|
|
|
|
<li><a href="/graph/0">graph</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
2011-03-12 13:20:03 +03:00
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li class="active">changeset</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/raw-rev/0">raw</a></li>
|
|
|
|
<li><a href="/file/0">browse</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
|
2010-10-09 21:27:14 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
|
|
|
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
|
|
|
|
|
|
|
|
</h3>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">a</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th class="author">author</th>
|
|
|
|
<td class="author">test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="date">date</th>
|
2015-01-10 16:37:42 +03:00
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
2010-09-26 22:41:32 +04:00
|
|
|
<tr>
|
|
|
|
<th class="author">parents</th>
|
|
|
|
<td class="author"></td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="author">children</th>
|
2012-05-14 14:56:43 +04:00
|
|
|
<td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="files">files</th>
|
|
|
|
<td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
|
|
|
|
</tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<tr>
|
|
|
|
<th class="diffstat">diffstat</th>
|
|
|
|
<td class="diffstat">
|
|
|
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
|
2015-01-10 13:00:57 +03:00
|
|
|
<a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
|
2011-06-11 17:24:50 +04:00
|
|
|
<div id="diffstatdetails" style="display:none;">
|
2015-01-10 13:00:57 +03:00
|
|
|
<a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
|
2015-02-05 15:34:30 +03:00
|
|
|
<table class="diffstat-table stripes2"> <tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<td class="diffstat-file"><a href="#l1.1">a</a></td>
|
|
|
|
<td class="diffstat-total" align="right">1</td>
|
|
|
|
<td class="diffstat-graph">
|
|
|
|
<span class="diffstat-add" style="width:100.0%;"> </span>
|
|
|
|
<span class="diffstat-remove" style="width:0.0%;"> </span>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2013-07-13 18:06:57 +04:00
|
|
|
<tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<td class="diffstat-file"><a href="#l2.1">b</a></td>
|
|
|
|
<td class="diffstat-total" align="right">1</td>
|
|
|
|
<td class="diffstat-graph">
|
|
|
|
<span class="diffstat-add" style="width:100.0%;"> </span>
|
|
|
|
<span class="diffstat-remove" style="width:0.0%;"> </span>
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2010-09-26 22:41:32 +04:00
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
2013-07-13 00:57:56 +04:00
|
|
|
<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
|
2013-07-13 00:57:10 +04:00
|
|
|
<div class="sourcefirst"> line diff</div>
|
|
|
|
<div class="stripes2 diffblocks">
|
|
|
|
<div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l1.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
|
|
|
|
<span id="l1.2" class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
|
|
|
|
<span id="l1.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.3"></a>
|
|
|
|
<span id="l1.4" class="plusline">+a</span><a href="#l1.4"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l2.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.1"></a>
|
|
|
|
<span id="l2.2" class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.2"></a>
|
|
|
|
<span id="l2.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.3"></a>
|
|
|
|
<span id="l2.4" class="plusline">+b</span><a href="#l2.4"></a></pre></div>
|
|
|
|
</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
|
|
|
raw revision
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
|
|
|
|
# HG changeset patch
|
|
|
|
# User test
|
|
|
|
# Date 0 0
|
|
|
|
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
|
|
|
|
|
|
|
|
a
|
|
|
|
|
|
|
|
diff -r 000000000000 -r 0cd96de13884 a
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+a
|
|
|
|
diff -r 000000000000 -r 0cd96de13884 b
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/b Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+b
|
|
|
|
|
|
|
|
|
|
|
|
diff removed file
|
|
|
|
|
hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
Before this patch, "parents" in pages for file doesn't show as same
parents as "hg parents -r REV FILE", when the specified file is not
modified in the specified revision.
For example, it is assumed that revision A, B and D change file "f".
changelog (A) ---> (B) ---> (C) ---> (D)
filelog "f" (x) ---> (y) ------------> (z)
"/file/D/f" invokes "webutil.parents()" with filectx(z) gotten from
changectx(D), and it returns changectx(B). This is as same result as
"hg parents -r D f".
In the other hand, "/file/C/f" invokes "webutil.parents()" with
filectx(y') gotten from changectx(C), and it returns changectx(A),
because filectx(y') is linked to changectx(B), and works like
filectx(y) in some cases.
In this case, revision B is hidden from users browsing file "f" in
revision C.
This patch shows as same parents as "hg parents -r REV FILE" in pages
for file, by making "webutil.parents()" return:
- "linkrev()"-ed revision only, if:
- specified context instance is "filectx" (because
"webutil.parents()" is invoked with changectx, too), and
- (1) the revision from which filectx is gotten and (2) the one to
which filectx is linked are different from each other
- revision gotten from "ctx.parents()", otherwise
2014-04-17 04:36:08 +04:00
|
|
|
$ hg log --template "{file_mods}\n{file_dels}\n" -r tip
|
|
|
|
a
|
|
|
|
b
|
|
|
|
$ hg parents --template "{node|short}\n" -r tip
|
|
|
|
0cd96de13884
|
|
|
|
$ hg parents --template "{node|short}\n" -r tip b
|
|
|
|
0cd96de13884
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'diff/tip/b'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
2011-04-28 19:02:39 +04:00
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
2012-05-14 14:56:43 +04:00
|
|
|
<title>test: b diff</title>
|
2010-09-26 22:41:32 +04:00
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2010-09-26 22:41:32 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/tip">log</a></li>
|
|
|
|
<li><a href="/graph/tip">graph</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
2011-03-12 13:20:03 +03:00
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/tip">changeset</a></li>
|
|
|
|
<li><a href="/file/tip">browse</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/tip/b">file</a></li>
|
2012-05-14 14:56:43 +04:00
|
|
|
<li><a href="/file/tip/b">latest</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li class="active">diff</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/comparison/tip/b">comparison</a></li>
|
|
|
|
<li><a href="/annotate/tip/b">annotate</a></li>
|
|
|
|
<li><a href="/log/tip/b">file log</a></li>
|
|
|
|
<li><a href="/raw-file/tip/b">raw</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
2010-10-10 02:58:48 +04:00
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
|
|
|
|
<span class="tag">tip</span>
|
|
|
|
</h3>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">b</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
hgweb: fix dynamic date calculation not working under Safari
While Chrome, Firefox, and IE 6+ support the current date format being
passed to Date(), Safari doesn't:
> new Date('Mon Oct 24 13:58:01 2011 +0200')
Invalid Date
However, the rfc822date format--officially supported by
ECMAScript[1]--does work:
> new Date('Mon, 24 Oct 2011 13:58:01 +0200')
Mon Oct 24 2011 04:58:01 GMT-0700 (PDT)
This change replaces all instances of {date|date} in HTML with
{date|rfc822date}. For elements that only have the "age" class,
there's no outward change for users with JavaScript enabled. For
elements with both the "age" and "date" classes, the full date
displayed uses the new format.
Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1.
[1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse
2011-10-27 22:57:08 +04:00
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
2012-05-14 14:56:43 +04:00
|
|
|
<td><a href="/file/0cd96de13884/b">0cd96de13884</a> </td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
2013-07-13 00:57:56 +04:00
|
|
|
<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
|
2013-07-13 00:57:10 +04:00
|
|
|
<div class="sourcefirst"> line diff</div>
|
|
|
|
<div class="stripes2 diffblocks">
|
|
|
|
<div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l1.1" class="minusline">--- a/b Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
|
|
|
|
<span id="l1.2" class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
|
|
|
|
<span id="l1.3" class="atline">@@ -1,1 +0,0 @@</span><a href="#l1.3"></a>
|
|
|
|
<span id="l1.4" class="minusline">-b</span><a href="#l1.4"></a></pre></div>
|
|
|
|
</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
|
|
|
set up hgweb with git diffs
|
|
|
|
|
2015-06-08 22:55:40 +03:00
|
|
|
$ killdaemons.py
|
2010-09-26 22:41:32 +04:00
|
|
|
$ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
|
|
|
|
revision
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'rev/0'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
2011-04-28 19:02:39 +04:00
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<title>test: 0cd96de13884</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2010-09-26 22:41:32 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/0">log</a></li>
|
|
|
|
<li><a href="/graph/0">graph</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
2011-03-12 13:20:03 +03:00
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li class="active">changeset</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/raw-rev/0">raw</a></li>
|
|
|
|
<li><a href="/file/0">browse</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
|
2010-10-09 21:27:14 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
|
|
|
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
|
|
|
|
|
|
|
|
</h3>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">a</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th class="author">author</th>
|
|
|
|
<td class="author">test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="date">date</th>
|
2015-01-10 16:37:42 +03:00
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
2010-09-26 22:41:32 +04:00
|
|
|
<tr>
|
|
|
|
<th class="author">parents</th>
|
|
|
|
<td class="author"></td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="author">children</th>
|
2012-05-14 14:56:43 +04:00
|
|
|
<td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th class="files">files</th>
|
|
|
|
<td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
|
|
|
|
</tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<tr>
|
|
|
|
<th class="diffstat">diffstat</th>
|
|
|
|
<td class="diffstat">
|
|
|
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
|
2015-01-10 13:00:57 +03:00
|
|
|
<a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
|
2011-06-11 17:24:50 +04:00
|
|
|
<div id="diffstatdetails" style="display:none;">
|
2015-01-10 13:00:57 +03:00
|
|
|
<a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
|
2015-02-05 15:34:30 +03:00
|
|
|
<table class="diffstat-table stripes2"> <tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<td class="diffstat-file"><a href="#l1.1">a</a></td>
|
|
|
|
<td class="diffstat-total" align="right">1</td>
|
|
|
|
<td class="diffstat-graph">
|
|
|
|
<span class="diffstat-add" style="width:100.0%;"> </span>
|
|
|
|
<span class="diffstat-remove" style="width:0.0%;"> </span>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2013-07-13 18:06:57 +04:00
|
|
|
<tr>
|
2011-06-11 17:24:50 +04:00
|
|
|
<td class="diffstat-file"><a href="#l2.1">b</a></td>
|
|
|
|
<td class="diffstat-total" align="right">1</td>
|
|
|
|
<td class="diffstat-graph">
|
|
|
|
<span class="diffstat-add" style="width:100.0%;"> </span>
|
|
|
|
<span class="diffstat-remove" style="width:0.0%;"> </span>
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2010-09-26 22:41:32 +04:00
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
2013-07-13 00:57:56 +04:00
|
|
|
<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
|
2013-07-13 00:57:10 +04:00
|
|
|
<div class="sourcefirst"> line diff</div>
|
|
|
|
<div class="stripes2 diffblocks">
|
|
|
|
<div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l1.1">new file mode 100644</span><a href="#l1.1"></a>
|
|
|
|
<span id="l1.2" class="minusline">--- /dev/null</span><a href="#l1.2"></a>
|
|
|
|
<span id="l1.3" class="plusline">+++ b/a</span><a href="#l1.3"></a>
|
|
|
|
<span id="l1.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.4"></a>
|
|
|
|
<span id="l1.5" class="plusline">+a</span><a href="#l1.5"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l2.1">new file mode 100644</span><a href="#l2.1"></a>
|
|
|
|
<span id="l2.2" class="minusline">--- /dev/null</span><a href="#l2.2"></a>
|
|
|
|
<span id="l2.3" class="plusline">+++ b/b</span><a href="#l2.3"></a>
|
|
|
|
<span id="l2.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.4"></a>
|
|
|
|
<span id="l2.5" class="plusline">+b</span><a href="#l2.5"></a></pre></div>
|
|
|
|
</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
|
|
|
revision
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
|
|
|
|
# HG changeset patch
|
|
|
|
# User test
|
|
|
|
# Date 0 0
|
|
|
|
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
|
|
|
|
|
|
|
|
a
|
|
|
|
|
|
|
|
diff --git a/a b/a
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/a
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+a
|
|
|
|
diff --git a/b b/b
|
|
|
|
new file mode 100644
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/b
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+b
|
|
|
|
|
|
|
|
|
hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
Before this patch, "parents" in pages for file doesn't show as same
parents as "hg parents -r REV FILE", when the specified file is not
modified in the specified revision.
For example, it is assumed that revision A, B and D change file "f".
changelog (A) ---> (B) ---> (C) ---> (D)
filelog "f" (x) ---> (y) ------------> (z)
"/file/D/f" invokes "webutil.parents()" with filectx(z) gotten from
changectx(D), and it returns changectx(B). This is as same result as
"hg parents -r D f".
In the other hand, "/file/C/f" invokes "webutil.parents()" with
filectx(y') gotten from changectx(C), and it returns changectx(A),
because filectx(y') is linked to changectx(B), and works like
filectx(y) in some cases.
In this case, revision B is hidden from users browsing file "f" in
revision C.
This patch shows as same parents as "hg parents -r REV FILE" in pages
for file, by making "webutil.parents()" return:
- "linkrev()"-ed revision only, if:
- specified context instance is "filectx" (because
"webutil.parents()" is invoked with changectx, too), and
- (1) the revision from which filectx is gotten and (2) the one to
which filectx is linked are different from each other
- revision gotten from "ctx.parents()", otherwise
2014-04-17 04:36:08 +04:00
|
|
|
diff modified file
|
|
|
|
|
|
|
|
$ hg log --template "{file_mods}\n{file_dels}\n" -r tip
|
|
|
|
a
|
|
|
|
b
|
|
|
|
$ hg parents --template "{node|short}\n" -r tip
|
|
|
|
0cd96de13884
|
|
|
|
$ hg parents --template "{node|short}\n" -r tip a
|
|
|
|
0cd96de13884
|
2010-09-26 22:41:32 +04:00
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'diff/tip/a'
|
2010-09-26 22:41:32 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
2011-04-28 19:02:39 +04:00
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<title>test: a diff</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2010-09-26 22:41:32 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/tip">log</a></li>
|
|
|
|
<li><a href="/graph/tip">graph</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
2011-03-12 13:20:03 +03:00
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/tip">changeset</a></li>
|
|
|
|
<li><a href="/file/tip">browse</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/tip/a">file</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
<li><a href="/file/tip/a">latest</a></li>
|
|
|
|
<li class="active">diff</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/comparison/tip/a">comparison</a></li>
|
|
|
|
<li><a href="/annotate/tip/a">annotate</a></li>
|
|
|
|
<li><a href="/log/tip/a">file log</a></li>
|
|
|
|
<li><a href="/raw-file/tip/a">raw</a></li>
|
2010-09-26 22:41:32 +04:00
|
|
|
</ul>
|
2010-10-10 02:58:48 +04:00
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
|
|
|
|
<span class="tag">tip</span>
|
|
|
|
</h3>
|
2010-09-26 22:41:32 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">b</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
hgweb: fix dynamic date calculation not working under Safari
While Chrome, Firefox, and IE 6+ support the current date format being
passed to Date(), Safari doesn't:
> new Date('Mon Oct 24 13:58:01 2011 +0200')
Invalid Date
However, the rfc822date format--officially supported by
ECMAScript[1]--does work:
> new Date('Mon, 24 Oct 2011 13:58:01 +0200')
Mon Oct 24 2011 04:58:01 GMT-0700 (PDT)
This change replaces all instances of {date|date} in HTML with
{date|rfc822date}. For elements that only have the "age" class,
there's no outward change for users with JavaScript enabled. For
elements with both the "age" and "date" classes, the full date
displayed uses the new format.
Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1.
[1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse
2011-10-27 22:57:08 +04:00
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
Before this patch, "parents" in pages for file doesn't show as same
parents as "hg parents -r REV FILE", when the specified file is not
modified in the specified revision.
For example, it is assumed that revision A, B and D change file "f".
changelog (A) ---> (B) ---> (C) ---> (D)
filelog "f" (x) ---> (y) ------------> (z)
"/file/D/f" invokes "webutil.parents()" with filectx(z) gotten from
changectx(D), and it returns changectx(B). This is as same result as
"hg parents -r D f".
In the other hand, "/file/C/f" invokes "webutil.parents()" with
filectx(y') gotten from changectx(C), and it returns changectx(A),
because filectx(y') is linked to changectx(B), and works like
filectx(y) in some cases.
In this case, revision B is hidden from users browsing file "f" in
revision C.
This patch shows as same parents as "hg parents -r REV FILE" in pages
for file, by making "webutil.parents()" return:
- "linkrev()"-ed revision only, if:
- specified context instance is "filectx" (because
"webutil.parents()" is invoked with changectx, too), and
- (1) the revision from which filectx is gotten and (2) the one to
which filectx is linked are different from each other
- revision gotten from "ctx.parents()", otherwise
2014-04-17 04:36:08 +04:00
|
|
|
<td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
|
2010-09-26 22:41:32 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
2013-07-13 00:57:56 +04:00
|
|
|
<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
|
2013-07-13 00:57:10 +04:00
|
|
|
<div class="sourcefirst"> line diff</div>
|
|
|
|
<div class="stripes2 diffblocks">
|
|
|
|
<div class="bottomline inc-lineno"><pre class="sourcelines wrap">
|
|
|
|
<span id="l1.1">old mode 100644</span><a href="#l1.1"></a>
|
|
|
|
<span id="l1.2">new mode 100755</span><a href="#l1.2"></a></pre></div>
|
|
|
|
</div>
|
2010-09-26 22:41:32 +04:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
2012-07-08 19:17:02 +04:00
|
|
|
|
|
|
|
comparison new file
|
|
|
|
|
2014-04-17 04:36:09 +04:00
|
|
|
$ hg parents --template "{rev}:{node|short}\n" -r 0
|
|
|
|
$ hg log --template "{rev}:{node|short}\n" -r 0
|
|
|
|
0:0cd96de13884
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'comparison/0/a'
|
2012-07-08 19:17:02 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
|
|
|
|
|
|
|
<title>test: a comparison</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2012-07-08 19:17:02 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/0">log</a></li>
|
|
|
|
<li><a href="/graph/0">graph</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/0">changeset</a></li>
|
|
|
|
<li><a href="/file/0">browse</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/0/a">file</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/file/tip/a">latest</a></li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/diff/0/a">diff</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li class="active">comparison</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/annotate/0/a">annotate</a></li>
|
|
|
|
<li><a href="/log/0/a">file log</a></li>
|
|
|
|
<li><a href="/raw-file/0/a">raw</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
comparison a @ 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
|
|
|
|
|
|
|
|
</h3>
|
2012-07-08 19:17:02 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2012-07-08 19:17:02 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">a</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
2012-07-31 02:59:38 +04:00
|
|
|
<td></td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
|
|
|
<div class="sourcefirst"> comparison</div>
|
|
|
|
<div class="legend">
|
|
|
|
<span class="legendinfo equal">equal</span>
|
|
|
|
<span class="legendinfo delete">deleted</span>
|
|
|
|
<span class="legendinfo insert">inserted</span>
|
|
|
|
<span class="legendinfo replace">replaced</span>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<table class="bigtable">
|
2012-07-31 16:14:15 +04:00
|
|
|
<thead class="header">
|
|
|
|
<tr>
|
|
|
|
<th>-1:000000000000</th>
|
2014-04-17 04:36:09 +04:00
|
|
|
<th>0:0cd96de13884</th>
|
2012-07-31 16:14:15 +04:00
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
|
2012-07-08 19:17:02 +04:00
|
|
|
<tbody class="block">
|
|
|
|
|
2013-07-13 17:32:54 +04:00
|
|
|
<tr id="r1">
|
|
|
|
<td class="source insert"><a href="#r1"> </a> </td>
|
|
|
|
<td class="source insert"><a href="#r1"> 1</a> a</td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
|
|
|
comparison existing file
|
|
|
|
|
|
|
|
$ hg up
|
2013-01-10 03:44:23 +04:00
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2012-07-08 19:17:02 +04:00
|
|
|
$ echo a >> a
|
|
|
|
$ hg ci -mc
|
2014-04-17 04:36:09 +04:00
|
|
|
|
|
|
|
$ hg parents --template "{rev}:{node|short}\n" -r tip
|
|
|
|
1:559edbd9ed20
|
|
|
|
$ hg log --template "{rev}:{node|short}\n" -r tip
|
|
|
|
2:d73db4d812ff
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
|
2012-07-08 19:17:02 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
|
|
|
|
|
|
|
<title>test: a comparison</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2012-07-08 19:17:02 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/tip">log</a></li>
|
|
|
|
<li><a href="/graph/tip">graph</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/tip">changeset</a></li>
|
|
|
|
<li><a href="/file/tip">browse</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/tip/a">file</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/file/tip/a">latest</a></li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/diff/tip/a">diff</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li class="active">comparison</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/annotate/tip/a">annotate</a></li>
|
|
|
|
<li><a href="/log/tip/a">file log</a></li>
|
|
|
|
<li><a href="/raw-file/tip/a">raw</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a>
|
|
|
|
<span class="tag">tip</span>
|
|
|
|
</h3>
|
2012-07-08 19:17:02 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2012-07-08 19:17:02 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">c</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
2012-07-31 02:59:38 +04:00
|
|
|
<td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
|
|
|
<div class="sourcefirst"> comparison</div>
|
|
|
|
<div class="legend">
|
|
|
|
<span class="legendinfo equal">equal</span>
|
|
|
|
<span class="legendinfo delete">deleted</span>
|
|
|
|
<span class="legendinfo insert">inserted</span>
|
|
|
|
<span class="legendinfo replace">replaced</span>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<table class="bigtable">
|
2012-07-31 16:14:15 +04:00
|
|
|
<thead class="header">
|
|
|
|
<tr>
|
2014-04-17 04:36:09 +04:00
|
|
|
<th>1:559edbd9ed20</th>
|
|
|
|
<th>2:d73db4d812ff</th>
|
2012-07-31 16:14:15 +04:00
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
|
2012-07-08 19:17:02 +04:00
|
|
|
<tbody class="block">
|
|
|
|
|
2013-07-13 17:32:54 +04:00
|
|
|
<tr id="l1r1">
|
|
|
|
<td class="source equal"><a href="#l1r1"> 1</a> a</td>
|
|
|
|
<td class="source equal"><a href="#l1r1"> 1</a> a</td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
2013-07-13 17:32:54 +04:00
|
|
|
<tr id="r2">
|
|
|
|
<td class="source insert"><a href="#r2"> </a> </td>
|
|
|
|
<td class="source insert"><a href="#r2"> 2</a> a</td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
|
|
|
comparison removed file
|
|
|
|
|
|
|
|
$ hg rm a
|
|
|
|
$ hg ci -md
|
2014-04-17 04:36:09 +04:00
|
|
|
|
|
|
|
$ hg parents --template "{rev}:{node|short}\n" -r tip
|
|
|
|
2:d73db4d812ff
|
|
|
|
$ hg log --template "{rev}:{node|short}\n" -r tip
|
|
|
|
3:20e80271eb7a
|
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
|
2012-07-08 19:17:02 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
|
|
|
|
|
|
|
<title>test: a comparison</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2012-07-08 19:17:02 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/tip">log</a></li>
|
|
|
|
<li><a href="/graph/tip">graph</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/tip">changeset</a></li>
|
|
|
|
<li><a href="/file/tip">browse</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/tip/a">file</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li><a href="/file/tip/a">latest</a></li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/diff/tip/a">diff</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
<li class="active">comparison</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/annotate/tip/a">annotate</a></li>
|
|
|
|
<li><a href="/log/tip/a">file log</a></li>
|
|
|
|
<li><a href="/raw-file/tip/a">raw</a></li>
|
2012-07-08 19:17:02 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
2013-01-09 04:16:29 +04:00
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a>
|
|
|
|
<span class="tag">tip</span>
|
|
|
|
</h3>
|
2012-07-08 19:17:02 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
2013-09-06 13:30:57 +04:00
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
2012-07-08 19:17:02 +04:00
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">d</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
2015-11-28 11:02:22 +03:00
|
|
|
<td><a href="/file/d73db4d812ff/a">d73db4d812ff</a> </td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
|
|
|
<div class="sourcefirst"> comparison</div>
|
|
|
|
<div class="legend">
|
|
|
|
<span class="legendinfo equal">equal</span>
|
|
|
|
<span class="legendinfo delete">deleted</span>
|
|
|
|
<span class="legendinfo insert">inserted</span>
|
|
|
|
<span class="legendinfo replace">replaced</span>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<table class="bigtable">
|
2012-07-31 16:14:15 +04:00
|
|
|
<thead class="header">
|
|
|
|
<tr>
|
2014-04-17 04:36:09 +04:00
|
|
|
<th>2:d73db4d812ff</th>
|
|
|
|
<th>3:20e80271eb7a</th>
|
2012-07-31 16:14:15 +04:00
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
|
2012-07-08 19:17:02 +04:00
|
|
|
<tbody class="block">
|
|
|
|
|
2013-07-13 17:32:54 +04:00
|
|
|
<tr id="l1">
|
|
|
|
<td class="source delete"><a href="#l1"> 1</a> a</td>
|
|
|
|
<td class="source delete"><a href="#l1"> </a> </td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
2013-07-13 17:32:54 +04:00
|
|
|
<tr id="l2">
|
|
|
|
<td class="source delete"><a href="#l2"> 2</a> a</td>
|
|
|
|
<td class="source delete"><a href="#l2"> </a> </td>
|
2012-07-08 19:17:02 +04:00
|
|
|
</tr>
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
|
|
|
|
2014-04-17 04:36:08 +04:00
|
|
|
comparison not-modified file
|
|
|
|
|
|
|
|
$ echo e > e
|
|
|
|
$ hg add e
|
|
|
|
$ hg ci -m e
|
|
|
|
$ echo f > f
|
|
|
|
$ hg add f
|
|
|
|
$ hg ci -m f
|
2014-04-17 04:36:09 +04:00
|
|
|
$ hg tip --template "{rev}:{node|short}\n"
|
|
|
|
5:41d9fc4a6ae1
|
2014-04-17 04:36:08 +04:00
|
|
|
$ hg diff -c tip e
|
2014-04-17 04:36:09 +04:00
|
|
|
$ hg parents --template "{rev}:{node|short}\n" -r tip
|
|
|
|
4:402bea3b0976
|
|
|
|
$ hg parents --template "{rev}:{node|short}\n" -r tip e
|
|
|
|
4:402bea3b0976
|
2014-04-17 04:36:08 +04:00
|
|
|
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'comparison/tip/e'
|
2014-04-17 04:36:08 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
|
|
|
<head>
|
|
|
|
<link rel="icon" href="/static/hgicon.png" type="image/png" />
|
|
|
|
<meta name="robots" content="index, nofollow" />
|
|
|
|
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
|
|
|
|
<script type="text/javascript" src="/static/mercurial.js"></script>
|
|
|
|
|
|
|
|
<title>test: e comparison</title>
|
|
|
|
</head>
|
|
|
|
<body>
|
|
|
|
|
|
|
|
<div class="container">
|
|
|
|
<div class="menu">
|
|
|
|
<div class="logo">
|
2015-09-30 23:43:49 +03:00
|
|
|
<a href="https://mercurial-scm.org/">
|
2014-04-17 04:36:08 +04:00
|
|
|
<img src="/static/hglogo.png" alt="mercurial" /></a>
|
|
|
|
</div>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/shortlog/tip">log</a></li>
|
|
|
|
<li><a href="/graph/tip">graph</a></li>
|
2014-04-17 04:36:08 +04:00
|
|
|
<li><a href="/tags">tags</a></li>
|
|
|
|
<li><a href="/bookmarks">bookmarks</a></li>
|
|
|
|
<li><a href="/branches">branches</a></li>
|
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/rev/tip">changeset</a></li>
|
|
|
|
<li><a href="/file/tip">browse</a></li>
|
2014-04-17 04:36:08 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/file/tip/e">file</a></li>
|
2014-04-17 04:36:08 +04:00
|
|
|
<li><a href="/file/tip/e">latest</a></li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/diff/tip/e">diff</a></li>
|
2014-04-17 04:36:08 +04:00
|
|
|
<li class="active">comparison</li>
|
2015-06-16 11:07:39 +03:00
|
|
|
<li><a href="/annotate/tip/e">annotate</a></li>
|
|
|
|
<li><a href="/log/tip/e">file log</a></li>
|
|
|
|
<li><a href="/raw-file/tip/e">raw</a></li>
|
2014-04-17 04:36:08 +04:00
|
|
|
</ul>
|
|
|
|
<ul>
|
|
|
|
<li><a href="/help">help</a></li>
|
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<div class="main">
|
|
|
|
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
|
2015-06-18 12:06:18 +03:00
|
|
|
<h3>
|
|
|
|
comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a>
|
|
|
|
<span class="tag">tip</span>
|
|
|
|
</h3>
|
2014-04-17 04:36:08 +04:00
|
|
|
|
|
|
|
<form class="search" action="/log">
|
|
|
|
<p></p>
|
|
|
|
<p><input name="rev" id="search1" type="text" size="30" /></p>
|
|
|
|
<div id="hint">Find changesets by keywords (author, files, the commit message), revision
|
|
|
|
number or hash, or <a href="/help/revsets">revset expression</a>.</div>
|
|
|
|
</form>
|
|
|
|
|
|
|
|
<div class="description">f</div>
|
|
|
|
|
|
|
|
<table id="changesetEntry">
|
|
|
|
<tr>
|
|
|
|
<th>author</th>
|
|
|
|
<td>test</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>date</th>
|
|
|
|
<td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>parents</th>
|
hgweb: show as same parents as "hg parents -r REV FILE" in pages for file
Before this patch, "parents" in pages for file doesn't show as same
parents as "hg parents -r REV FILE", when the specified file is not
modified in the specified revision.
For example, it is assumed that revision A, B and D change file "f".
changelog (A) ---> (B) ---> (C) ---> (D)
filelog "f" (x) ---> (y) ------------> (z)
"/file/D/f" invokes "webutil.parents()" with filectx(z) gotten from
changectx(D), and it returns changectx(B). This is as same result as
"hg parents -r D f".
In the other hand, "/file/C/f" invokes "webutil.parents()" with
filectx(y') gotten from changectx(C), and it returns changectx(A),
because filectx(y') is linked to changectx(B), and works like
filectx(y) in some cases.
In this case, revision B is hidden from users browsing file "f" in
revision C.
This patch shows as same parents as "hg parents -r REV FILE" in pages
for file, by making "webutil.parents()" return:
- "linkrev()"-ed revision only, if:
- specified context instance is "filectx" (because
"webutil.parents()" is invoked with changectx, too), and
- (1) the revision from which filectx is gotten and (2) the one to
which filectx is linked are different from each other
- revision gotten from "ctx.parents()", otherwise
2014-04-17 04:36:08 +04:00
|
|
|
<td><a href="/file/402bea3b0976/e">402bea3b0976</a> </td>
|
2014-04-17 04:36:08 +04:00
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<th>children</th>
|
|
|
|
<td></td>
|
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<div class="overflow">
|
|
|
|
<div class="sourcefirst"> comparison</div>
|
|
|
|
<div class="legend">
|
|
|
|
<span class="legendinfo equal">equal</span>
|
|
|
|
<span class="legendinfo delete">deleted</span>
|
|
|
|
<span class="legendinfo insert">inserted</span>
|
|
|
|
<span class="legendinfo replace">replaced</span>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<table class="bigtable">
|
|
|
|
<thead class="header">
|
|
|
|
<tr>
|
2014-04-17 04:36:09 +04:00
|
|
|
<th>4:402bea3b0976</th>
|
|
|
|
<th>5:41d9fc4a6ae1</th>
|
2014-04-17 04:36:08 +04:00
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
|
|
|
|
</table>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
</html>
|
|
|
|
|
2010-09-26 22:41:32 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
test import rev as raw-rev
|
|
|
|
|
|
|
|
$ hg clone -r0 test test1
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
|
|
|
updating to branch default
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd test1
|
2012-07-04 14:43:13 +04:00
|
|
|
$ hg import -q --bypass --exact http://localhost:$HGPORT/rev/1
|
2010-09-26 22:41:32 +04:00
|
|
|
|
2012-03-23 04:31:31 +04:00
|
|
|
raw revision with diff block numbers
|
|
|
|
|
2015-06-08 22:55:40 +03:00
|
|
|
$ killdaemons.py
|
2012-03-23 04:31:31 +04:00
|
|
|
$ cat <<EOF > .hg/hgrc
|
|
|
|
> [web]
|
|
|
|
> templates = rawdiff
|
|
|
|
> EOF
|
|
|
|
$ mkdir rawdiff
|
|
|
|
$ cat <<EOF > rawdiff/map
|
|
|
|
> mimetype = 'text/plain; charset={encoding}'
|
|
|
|
> changeset = '{diff}'
|
|
|
|
> difflineplus = '{line}'
|
|
|
|
> difflineminus = '{line}'
|
|
|
|
> difflineat = '{line}'
|
|
|
|
> diffline = '{line}'
|
|
|
|
> filenodelink = ''
|
|
|
|
> filenolink = ''
|
|
|
|
> fileline = '{line}'
|
|
|
|
> diffblock = 'Block: {blockno}\n{lines}\n'
|
|
|
|
> EOF
|
|
|
|
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
2015-06-08 22:44:30 +03:00
|
|
|
$ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
|
2012-03-23 04:31:31 +04:00
|
|
|
200 Script output follows
|
|
|
|
|
|
|
|
Block: 1
|
|
|
|
diff -r 000000000000 -r 0cd96de13884 a
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+a
|
|
|
|
|
|
|
|
Block: 2
|
|
|
|
diff -r 000000000000 -r 0cd96de13884 b
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/b Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+b
|
|
|
|
|
2015-06-08 22:55:40 +03:00
|
|
|
$ killdaemons.py
|
2012-03-23 04:31:31 +04:00
|
|
|
$ rm .hg/hgrc rawdiff/map
|
|
|
|
$ rmdir rawdiff
|
|
|
|
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
|
|
|
|
$ cat hg.pid >> $DAEMON_PIDS
|
|
|
|
|
2010-09-26 22:41:32 +04:00
|
|
|
errors
|
|
|
|
|
|
|
|
$ cat ../test/errors.log
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|