test-hgweb-diffs.t
1190 lines
| 32.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-hgweb-diffs.t
Matt Mackall
|
r22046 | #require serve | ||
Mads Kiilerich
|
r15442 | |||
|
Matt Mackall
|
r12435 | 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 | ||||
Adrian Buehlmann
|
r17109 | $ 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 | ||||
|
Matt Mackall
|
r12435 | |||
| 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 | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'rev/0' | ||
|
Matt Mackall
|
r12435 | 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" /> | ||||
Benoit Allard
|
r14046 | <script type="text/javascript" src="/static/mercurial.js"></script> | ||
|
Matt Mackall
|
r12435 | |||
| <title>test: 0cd96de13884</title> | ||||
| </head> | ||||
| <body> | ||||
| <div class="container"> | ||||
| <div class="menu"> | ||||
| <div class="logo"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
Matt Mackall
|
r12435 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/0">log</a></li> | |||
| <li><a href="/graph/0">graph</a></li> | ||||
|
Matt Mackall
|
r12435 | <li><a href="/tags">tags</a></li> | ||
Alexander Solovyov
|
r13597 | <li><a href="/bookmarks">bookmarks</a></li> | ||
|
Matt Mackall
|
r12435 | <li><a href="/branches">branches</a></li> | ||
| </ul> | ||||
| <ul> | ||||
| <li class="active">changeset</li> | ||||
| r25606 | <li><a href="/raw-rev/0">raw</a></li> | |||
| <li><a href="/file/0">browse</a></li> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
| <ul> | ||||
| </ul> | ||||
Augie Fackler
|
r12666 | <ul> | ||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| <div class="main"> | ||||
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a> | ||||
| r35064 | <span class="phase">draft</span> | |||
| r25617 | </h3> | |||
|
Matt Mackall
|
r12435 | |||
Gregory Szorc
|
r32758 | |||
|
Matt Mackall
|
r12435 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||
Alexander Plavin
|
r19796 | <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> | ||||
|
Matt Mackall
|
r12435 | </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> | ||||
Anton Shestakov
|
r24130 | <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> | ||
| </tr> | ||||
| r35501 | ||||
| r36973 | ||||
|
Matt Mackall
|
r12435 | <tr> | ||
| <th class="author">parents</th> | ||||
| <td class="author"></td> | ||||
| </tr> | ||||
| <tr> | ||||
| <th class="author">children</th> | ||||
|
Matt Mackall
|
r16722 | <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td> | ||
|
Matt Mackall
|
r12435 | </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> | ||||
Steven Brown
|
r14571 | <tr> | ||
| <th class="diffstat">diffstat</th> | ||||
| <td class="diffstat"> | ||||
| 2 files changed, 2 insertions(+), 0 deletions(-) | ||||
|
Gregory Szorc
|
r37849 | <a id="diffstatexpand" class="diffstattoggle" href="#">[<tt>+</tt>]</a> | ||
|
Steven Brown
|
r14571 | <div id="diffstatdetails" style="display:none;"> | ||
|
Gregory Szorc
|
r37849 | <a class="diffstattoggle" href="#">[<tt>-</tt>]</a> | ||
|
Anton Shestakov
|
r24042 | <table class="diffstat-table stripes2"> <tr> | ||
|
Steven Brown
|
r14571 | <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> | ||||
Alexander Plavin
|
r19455 | <tr> | ||
|
Steven Brown
|
r14571 | <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> | ||||
|
Matt Mackall
|
r12435 | </table> | ||
| <div class="overflow"> | ||||
|
Gregory Szorc
|
r37849 | <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div> | ||
|
Alexander Plavin
|
r19432 | <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> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
| raw revision | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'raw-rev/0' | ||
|
Matt Mackall
|
r12435 | 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 | ||||
FUJIWARA Katsunori
|
r21122 | $ 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 | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'diff/tip/b' | ||
|
Matt Mackall
|
r12435 | 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" /> | ||||
|
Benoit Allard
|
r14046 | <script type="text/javascript" src="/static/mercurial.js"></script> | ||
|
Matt Mackall
|
r12435 | |||
|
Matt Mackall
|
r16722 | <title>test: b diff</title> | ||
|
Matt Mackall
|
r12435 | </head> | ||
| <body> | ||||
| <div class="container"> | ||||
| <div class="menu"> | ||||
| <div class="logo"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
Matt Mackall
|
r12435 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/tip">log</a></li> | |||
| <li><a href="/graph/tip">graph</a></li> | ||||
|
Matt Mackall
|
r12435 | <li><a href="/tags">tags</a></li> | ||
|
Alexander Solovyov
|
r13597 | <li><a href="/bookmarks">bookmarks</a></li> | ||
|
Matt Mackall
|
r12435 | <li><a href="/branches">branches</a></li> | ||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/tip">changeset</a></li> | |||
| <li><a href="/file/tip">browse</a></li> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/tip/b">file</a></li> | |||
|
Matt Mackall
|
r16722 | <li><a href="/file/tip/b">latest</a></li> | ||
|
Matt Mackall
|
r12435 | <li class="active">diff</li> | ||
| r25606 | <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> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
|
Augie Fackler
|
r12680 | <ul> | ||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a> | ||||
| r35064 | <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> | |||
| r25617 | </h3> | |||
|
Matt Mackall
|
r12435 | |||
|
Gregory Szorc
|
r32758 | |||
|
Matt Mackall
|
r12435 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
Matt Mackall
|
r12435 | </form> | ||
| <div class="description">b</div> | ||||
| <table id="changesetEntry"> | ||||
| <tr> | ||||
| <th>author</th> | ||||
| <td>test</td> | ||||
| </tr> | ||||
| <tr> | ||||
| <th>date</th> | ||||
Brodie Rao
|
r15375 | <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> | ||
|
Matt Mackall
|
r12435 | </tr> | ||
| <tr> | ||||
| <th>parents</th> | ||||
|
Matt Mackall
|
r16722 | <td><a href="/file/0cd96de13884/b">0cd96de13884</a> </td> | ||
|
Matt Mackall
|
r12435 | </tr> | ||
| <tr> | ||||
| <th>children</th> | ||||
| <td></td> | ||||
| </tr> | ||||
| </table> | ||||
| <div class="overflow"> | ||||
|
Gregory Szorc
|
r37849 | <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div> | ||
|
Alexander Plavin
|
r19432 | <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> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
Yuya Nishihara
|
r35445 | set up hgweb with git diffs + noprefix | ||
| $ killdaemons.py | ||||
| $ hg serve --config 'diff.git=1' --config 'diff.noprefix=1' -p $HGPORT -d \ | ||||
| > --pid-file=hg.pid -A access.log -E errors.log | ||||
| $ cat hg.pid >> $DAEMON_PIDS | ||||
| patch header and diffstat | ||||
| $ get-with-headers.py localhost:$HGPORT 'rev/0' \ | ||||
| > | egrep 'files changed|---|\+\+\+' | ||||
| 2 files changed, 2 insertions(+), 0 deletions(-) | ||||
| <span id="l1.2" class="minusline">--- /dev/null</span><a href="#l1.2"></a> | ||||
| <span id="l1.3" class="plusline">+++ a</span><a href="#l1.3"></a> | ||||
| <span id="l2.2" class="minusline">--- /dev/null</span><a href="#l2.2"></a> | ||||
| <span id="l2.3" class="plusline">+++ b</span><a href="#l2.3"></a> | ||||
|
Matt Mackall
|
r12435 | set up hgweb with git diffs | ||
|
Matt Mackall
|
r25474 | $ killdaemons.py | ||
|
Matt Mackall
|
r12435 | $ 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 | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'rev/0' | ||
|
Matt Mackall
|
r12435 | 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" /> | ||||
|
Benoit Allard
|
r14046 | <script type="text/javascript" src="/static/mercurial.js"></script> | ||
|
Matt Mackall
|
r12435 | |||
| <title>test: 0cd96de13884</title> | ||||
| </head> | ||||
| <body> | ||||
| <div class="container"> | ||||
| <div class="menu"> | ||||
| <div class="logo"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
Matt Mackall
|
r12435 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/0">log</a></li> | |||
| <li><a href="/graph/0">graph</a></li> | ||||
|
Matt Mackall
|
r12435 | <li><a href="/tags">tags</a></li> | ||
|
Alexander Solovyov
|
r13597 | <li><a href="/bookmarks">bookmarks</a></li> | ||
|
Matt Mackall
|
r12435 | <li><a href="/branches">branches</a></li> | ||
| </ul> | ||||
| <ul> | ||||
| <li class="active">changeset</li> | ||||
| r25606 | <li><a href="/raw-rev/0">raw</a></li> | |||
| <li><a href="/file/0">browse</a></li> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
| <ul> | ||||
| </ul> | ||||
|
Augie Fackler
|
r12666 | <ul> | ||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a> | ||||
| r35064 | <span class="phase">draft</span> | |||
| r25617 | </h3> | |||
|
Matt Mackall
|
r12435 | |||
|
Gregory Szorc
|
r32758 | |||
|
Matt Mackall
|
r12435 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
Matt Mackall
|
r12435 | </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> | ||||
|
Anton Shestakov
|
r24130 | <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> | ||
| </tr> | ||||
| r35501 | ||||
| r36973 | ||||
|
Matt Mackall
|
r12435 | <tr> | ||
| <th class="author">parents</th> | ||||
| <td class="author"></td> | ||||
| </tr> | ||||
| <tr> | ||||
| <th class="author">children</th> | ||||
|
Matt Mackall
|
r16722 | <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td> | ||
|
Matt Mackall
|
r12435 | </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> | ||||
|
Steven Brown
|
r14571 | <tr> | ||
| <th class="diffstat">diffstat</th> | ||||
| <td class="diffstat"> | ||||
| 2 files changed, 2 insertions(+), 0 deletions(-) | ||||
|
Gregory Szorc
|
r37849 | <a id="diffstatexpand" class="diffstattoggle" href="#">[<tt>+</tt>]</a> | ||
|
Steven Brown
|
r14571 | <div id="diffstatdetails" style="display:none;"> | ||
|
Gregory Szorc
|
r37849 | <a class="diffstattoggle" href="#">[<tt>-</tt>]</a> | ||
|
Anton Shestakov
|
r24042 | <table class="diffstat-table stripes2"> <tr> | ||
|
Steven Brown
|
r14571 | <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> | ||||
|
Alexander Plavin
|
r19455 | <tr> | ||
|
Steven Brown
|
r14571 | <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> | ||||
|
Matt Mackall
|
r12435 | </table> | ||
| <div class="overflow"> | ||||
|
Gregory Szorc
|
r37849 | <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div> | ||
|
Alexander Plavin
|
r19432 | <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> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
| revision | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'raw-rev/0' | ||
|
Matt Mackall
|
r12435 | 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 | ||||
|
FUJIWARA Katsunori
|
r21122 | 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 | ||||
|
Matt Mackall
|
r12435 | |||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'diff/tip/a' | ||
|
Matt Mackall
|
r12435 | 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" /> | ||||
|
Benoit Allard
|
r14046 | <script type="text/javascript" src="/static/mercurial.js"></script> | ||
|
Matt Mackall
|
r12435 | |||
| <title>test: a diff</title> | ||||
| </head> | ||||
| <body> | ||||
| <div class="container"> | ||||
| <div class="menu"> | ||||
| <div class="logo"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
Matt Mackall
|
r12435 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/tip">log</a></li> | |||
| <li><a href="/graph/tip">graph</a></li> | ||||
|
Matt Mackall
|
r12435 | <li><a href="/tags">tags</a></li> | ||
|
Alexander Solovyov
|
r13597 | <li><a href="/bookmarks">bookmarks</a></li> | ||
|
Matt Mackall
|
r12435 | <li><a href="/branches">branches</a></li> | ||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/tip">changeset</a></li> | |||
| <li><a href="/file/tip">browse</a></li> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/tip/a">file</a></li> | |||
|
Matt Mackall
|
r12435 | <li><a href="/file/tip/a">latest</a></li> | ||
| <li class="active">diff</li> | ||||
| r25606 | <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> | ||||
|
Matt Mackall
|
r12435 | </ul> | ||
|
Augie Fackler
|
r12680 | <ul> | ||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a> | ||||
| r35064 | <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> | |||
| r25617 | </h3> | |||
|
Matt Mackall
|
r12435 | |||
|
Gregory Szorc
|
r32758 | |||
|
Matt Mackall
|
r12435 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
Matt Mackall
|
r12435 | </form> | ||
| <div class="description">b</div> | ||||
| <table id="changesetEntry"> | ||||
| <tr> | ||||
| <th>author</th> | ||||
| <td>test</td> | ||||
| </tr> | ||||
| <tr> | ||||
| <th>date</th> | ||||
|
Brodie Rao
|
r15375 | <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td> | ||
|
Matt Mackall
|
r12435 | </tr> | ||
| <tr> | ||||
| <th>parents</th> | ||||
|
FUJIWARA Katsunori
|
r21122 | <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td> | ||
|
Matt Mackall
|
r12435 | </tr> | ||
| <tr> | ||||
| <th>children</th> | ||||
| <td></td> | ||||
| </tr> | ||||
| </table> | ||||
| <div class="overflow"> | ||||
|
Gregory Szorc
|
r37849 | <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div> | ||
|
Alexander Plavin
|
r19432 | <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> | ||||
|
Matt Mackall
|
r12435 | </div> | ||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
wujek srujek
|
r17202 | |||
| comparison new file | ||||
|
FUJIWARA Katsunori
|
r21123 | $ hg parents --template "{rev}:{node|short}\n" -r 0 | ||
| $ hg log --template "{rev}:{node|short}\n" -r 0 | ||||
| 0:0cd96de13884 | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'comparison/0/a' | ||
|
wujek srujek
|
r17202 | 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"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
wujek srujek
|
r17202 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/0">log</a></li> | |||
| <li><a href="/graph/0">graph</a></li> | ||||
|
wujek srujek
|
r17202 | <li><a href="/tags">tags</a></li> | ||
| <li><a href="/bookmarks">bookmarks</a></li> | ||||
| <li><a href="/branches">branches</a></li> | ||||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/0">changeset</a></li> | |||
| <li><a href="/file/0">browse</a></li> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/0/a">file</a></li> | |||
|
wujek srujek
|
r17202 | <li><a href="/file/tip/a">latest</a></li> | ||
| r25606 | <li><a href="/diff/0/a">diff</a></li> | |||
|
wujek srujek
|
r17202 | <li class="active">comparison</li> | ||
| r25606 | <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> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
| </div> | ||||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| comparison a @ 0:<a href="/rev/0cd96de13884">0cd96de13884</a> | ||||
| r35064 | <span class="phase">draft</span> | |||
| r25617 | </h3> | |||
|
wujek srujek
|
r17202 | |||
|
Gregory Szorc
|
r32758 | |||
|
wujek srujek
|
r17202 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
wujek srujek
|
r17202 | </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> | ||||
wujek srujek
|
r17303 | <td></td> | ||
|
wujek srujek
|
r17202 | </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"> | ||||
|
wujek srujek
|
r17302 | <thead class="header"> | ||
| <tr> | ||||
| <th>-1:000000000000</th> | ||||
|
FUJIWARA Katsunori
|
r21123 | <th>0:0cd96de13884</th> | ||
|
wujek srujek
|
r17302 | </tr> | ||
| </thead> | ||||
|
wujek srujek
|
r17202 | <tbody class="block"> | ||
|
Alexander Plavin
|
r19459 | <tr id="r1"> | ||
| <td class="source insert"><a href="#r1"> </a> </td> | ||||
| <td class="source insert"><a href="#r1"> 1</a> a</td> | ||||
|
wujek srujek
|
r17202 | </tr> | ||
| </tbody> | ||||
| </table> | ||||
| </div> | ||||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
| comparison existing file | ||||
| $ hg up | ||||
|
Mads Kiilerich
|
r18334 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
wujek srujek
|
r17202 | $ echo a >> a | ||
| $ hg ci -mc | ||||
|
FUJIWARA Katsunori
|
r21123 | |||
| $ hg parents --template "{rev}:{node|short}\n" -r tip | ||||
| 1:559edbd9ed20 | ||||
| $ hg log --template "{rev}:{node|short}\n" -r tip | ||||
| 2:d73db4d812ff | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a' | ||
|
wujek srujek
|
r17202 | 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"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
wujek srujek
|
r17202 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/tip">log</a></li> | |||
| <li><a href="/graph/tip">graph</a></li> | ||||
|
wujek srujek
|
r17202 | <li><a href="/tags">tags</a></li> | ||
| <li><a href="/bookmarks">bookmarks</a></li> | ||||
| <li><a href="/branches">branches</a></li> | ||||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/tip">changeset</a></li> | |||
| <li><a href="/file/tip">browse</a></li> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/tip/a">file</a></li> | |||
|
wujek srujek
|
r17202 | <li><a href="/file/tip/a">latest</a></li> | ||
| r25606 | <li><a href="/diff/tip/a">diff</a></li> | |||
|
wujek srujek
|
r17202 | <li class="active">comparison</li> | ||
| r25606 | <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> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
| </div> | ||||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a> | ||||
| r35064 | <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> | |||
| r25617 | </h3> | |||
|
wujek srujek
|
r17202 | |||
|
Gregory Szorc
|
r32758 | |||
|
wujek srujek
|
r17202 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
wujek srujek
|
r17202 | </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> | ||||
|
wujek srujek
|
r17303 | <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td> | ||
|
wujek srujek
|
r17202 | </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"> | ||||
|
wujek srujek
|
r17302 | <thead class="header"> | ||
| <tr> | ||||
|
FUJIWARA Katsunori
|
r21123 | <th>1:559edbd9ed20</th> | ||
| <th>2:d73db4d812ff</th> | ||||
|
wujek srujek
|
r17302 | </tr> | ||
| </thead> | ||||
|
wujek srujek
|
r17202 | <tbody class="block"> | ||
|
Alexander Plavin
|
r19459 | <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> | ||||
|
wujek srujek
|
r17202 | </tr> | ||
|
Alexander Plavin
|
r19459 | <tr id="r2"> | ||
| <td class="source insert"><a href="#r2"> </a> </td> | ||||
| <td class="source insert"><a href="#r2"> 2</a> a</td> | ||||
|
wujek srujek
|
r17202 | </tr> | ||
| </tbody> | ||||
| </table> | ||||
| </div> | ||||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
| comparison removed file | ||||
| $ hg rm a | ||||
| $ hg ci -md | ||||
|
FUJIWARA Katsunori
|
r21123 | |||
| $ hg parents --template "{rev}:{node|short}\n" -r tip | ||||
| 2:d73db4d812ff | ||||
| $ hg log --template "{rev}:{node|short}\n" -r tip | ||||
| 3:20e80271eb7a | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a' | ||
|
wujek srujek
|
r17202 | 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"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
wujek srujek
|
r17202 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/tip">log</a></li> | |||
| <li><a href="/graph/tip">graph</a></li> | ||||
|
wujek srujek
|
r17202 | <li><a href="/tags">tags</a></li> | ||
| <li><a href="/bookmarks">bookmarks</a></li> | ||||
| <li><a href="/branches">branches</a></li> | ||||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/tip">changeset</a></li> | |||
| <li><a href="/file/tip">browse</a></li> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/tip/a">file</a></li> | |||
|
wujek srujek
|
r17202 | <li><a href="/file/tip/a">latest</a></li> | ||
| r25606 | <li><a href="/diff/tip/a">diff</a></li> | |||
|
wujek srujek
|
r17202 | <li class="active">comparison</li> | ||
| r25606 | <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> | ||||
|
wujek srujek
|
r17202 | </ul> | ||
| <ul> | ||||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
| </div> | ||||
| <div class="main"> | ||||
|
Bryan O'Sullivan
|
r18264 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||
| r25617 | <h3> | |||
| comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a> | ||||
| r35064 | <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> | |||
| r25617 | </h3> | |||
|
wujek srujek
|
r17202 | |||
|
Gregory Szorc
|
r32758 | |||
|
wujek srujek
|
r17202 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
Alexander Plavin
|
r19796 | <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> | ||||
|
wujek srujek
|
r17202 | </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> | ||||
| r27158 | <td><a href="/file/d73db4d812ff/a">d73db4d812ff</a> </td> | |||
|
wujek srujek
|
r17202 | </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"> | ||||
|
wujek srujek
|
r17302 | <thead class="header"> | ||
| <tr> | ||||
|
FUJIWARA Katsunori
|
r21123 | <th>2:d73db4d812ff</th> | ||
| <th>3:20e80271eb7a</th> | ||||
|
wujek srujek
|
r17302 | </tr> | ||
| </thead> | ||||
|
wujek srujek
|
r17202 | <tbody class="block"> | ||
|
Alexander Plavin
|
r19459 | <tr id="l1"> | ||
| <td class="source delete"><a href="#l1"> 1</a> a</td> | ||||
| <td class="source delete"><a href="#l1"> </a> </td> | ||||
|
wujek srujek
|
r17202 | </tr> | ||
|
Alexander Plavin
|
r19459 | <tr id="l2"> | ||
| <td class="source delete"><a href="#l2"> 2</a> a</td> | ||||
| <td class="source delete"><a href="#l2"> </a> </td> | ||||
|
wujek srujek
|
r17202 | </tr> | ||
| </tbody> | ||||
| </table> | ||||
| </div> | ||||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
|
FUJIWARA Katsunori
|
r21121 | comparison not-modified file | ||
| $ echo e > e | ||||
| $ hg add e | ||||
| $ hg ci -m e | ||||
| $ echo f > f | ||||
| $ hg add f | ||||
| $ hg ci -m f | ||||
|
FUJIWARA Katsunori
|
r21123 | $ hg tip --template "{rev}:{node|short}\n" | ||
| 5:41d9fc4a6ae1 | ||||
|
FUJIWARA Katsunori
|
r21121 | $ hg diff -c tip e | ||
|
FUJIWARA Katsunori
|
r21123 | $ hg parents --template "{rev}:{node|short}\n" -r tip | ||
| 4:402bea3b0976 | ||||
| $ hg parents --template "{rev}:{node|short}\n" -r tip e | ||||
| 4:402bea3b0976 | ||||
|
FUJIWARA Katsunori
|
r21121 | |||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'comparison/tip/e' | ||
|
FUJIWARA Katsunori
|
r21121 | 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"> | ||||
|
Matt Mackall
|
r26421 | <a href="https://mercurial-scm.org/"> | ||
|
FUJIWARA Katsunori
|
r21121 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
| </div> | ||||
| <ul> | ||||
| r25606 | <li><a href="/shortlog/tip">log</a></li> | |||
| <li><a href="/graph/tip">graph</a></li> | ||||
|
FUJIWARA Katsunori
|
r21121 | <li><a href="/tags">tags</a></li> | ||
| <li><a href="/bookmarks">bookmarks</a></li> | ||||
| <li><a href="/branches">branches</a></li> | ||||
| </ul> | ||||
| <ul> | ||||
| r25606 | <li><a href="/rev/tip">changeset</a></li> | |||
| <li><a href="/file/tip">browse</a></li> | ||||
|
FUJIWARA Katsunori
|
r21121 | </ul> | ||
| <ul> | ||||
| r25606 | <li><a href="/file/tip/e">file</a></li> | |||
|
FUJIWARA Katsunori
|
r21121 | <li><a href="/file/tip/e">latest</a></li> | ||
| r25606 | <li><a href="/diff/tip/e">diff</a></li> | |||
|
FUJIWARA Katsunori
|
r21121 | <li class="active">comparison</li> | ||
| r25606 | <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> | ||||
|
FUJIWARA Katsunori
|
r21121 | </ul> | ||
| <ul> | ||||
| <li><a href="/help">help</a></li> | ||||
| </ul> | ||||
| </div> | ||||
| <div class="main"> | ||||
| <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | ||||
| r25617 | <h3> | |||
| comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a> | ||||
| r35064 | <span class="phase">draft</span> <span class="branchhead">default</span> <span class="tag">tip</span> | |||
| r25617 | </h3> | |||
|
FUJIWARA Katsunori
|
r21121 | |||
|
Gregory Szorc
|
r32758 | |||
|
FUJIWARA Katsunori
|
r21121 | <form class="search" action="/log"> | ||
|
Gregory Szorc
|
r32758 | |||
| <p><input name="rev" id="search1" type="text" size="30" value="" /></p> | ||||
|
FUJIWARA Katsunori
|
r21121 | <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> | ||||
|
FUJIWARA Katsunori
|
r21122 | <td><a href="/file/402bea3b0976/e">402bea3b0976</a> </td> | ||
|
FUJIWARA Katsunori
|
r21121 | </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> | ||||
|
FUJIWARA Katsunori
|
r21123 | <th>4:402bea3b0976</th> | ||
| <th>5:41d9fc4a6ae1</th> | ||||
|
FUJIWARA Katsunori
|
r21121 | </tr> | ||
| </thead> | ||||
| </table> | ||||
| </div> | ||||
| </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
|
Matt Mackall
|
r12435 | $ 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 | ||||
Denis Laxalde
|
r34662 | new changesets 0cd96de13884 | ||
|
Matt Mackall
|
r12435 | updating to branch default | ||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ cd test1 | ||||
|
Adrian Buehlmann
|
r17109 | $ hg import -q --bypass --exact http://localhost:$HGPORT/rev/1 | ||
|
Matt Mackall
|
r12435 | |||
Paul Boddie
|
r16308 | raw revision with diff block numbers | ||
|
Matt Mackall
|
r25474 | $ killdaemons.py | ||
|
Paul Boddie
|
r16308 | $ 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 | ||||
|
Matt Mackall
|
r25472 | $ get-with-headers.py localhost:$HGPORT 'raw-rev/0' | ||
|
Paul Boddie
|
r16308 | 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 | ||||
|
Matt Mackall
|
r25474 | $ killdaemons.py | ||
|
Paul Boddie
|
r16308 | $ 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 | ||||
|
Matt Mackall
|
r12435 | errors | ||
| $ cat ../test/errors.log | ||||
|
Mads Kiilerich
|
r16913 | |||
| $ cd .. | ||||
