upstream/mercurial-mirror Files · tests/test-hgweb-removed.t

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Augie Fackler - - Load All Authors

File last commit:

r12680:d664547e default


                r13155:f02d7a56

default

Download file

             test-hgweb-removed.t
        
                    204 lines
            
             | 5.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgweb-removed.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      setting up repo

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg rm a

        $ hg ci -mdel

      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

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip'

        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" />

        <title>test: c78f6c5cbea9</title>

        </head>

        <body>

        <div class="container">

        <div class="menu">

        <div class="logo">

        <a href="http://mercurial.selenic.com/">

        <img src="/static/hglogo.png" alt="mercurial" /></a>

        </div>

        <ul>

         <li><a href="/shortlog/c78f6c5cbea9">log</a></li>

         <li><a href="/graph/c78f6c5cbea9">graph</a></li>

         <li><a href="/tags">tags</a></li>

         <li><a href="/branches">branches</a></li>

        </ul>

        <ul>

         <li class="active">changeset</li>

         <li><a href="/raw-rev/c78f6c5cbea9">raw</a></li>

         <li><a href="/file/c78f6c5cbea9">browse</a></li>

        </ul>

        <ul>

        </ul>

        <ul>

         <li><a href="/help">help</a></li>

        </ul>

        </div>

        <div class="main">

        <h2><a href="/">test</a></h2>

        <h3>changeset 1:c78f6c5cbea9  <span class="tag">tip</span> </h3>

        <form class="search" action="/log">

        <p><input name="rev" id="search1" type="text" size="30" /></p>

        <div id="hint">find changesets by author, revision,

        files, or words in the commit message</div>

        </form>

        <div class="description">del</div>

        <table id="changesetEntry">

        <tr>

         <th class="author">author</th>

         <td class="author">&#116;&#101;&#115;&#116;</td>

        </tr>

        <tr>

         <th class="date">date</th>

         <td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr>

        <tr>

         <th class="author">parents</th>

         <td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td>

        </tr>

        <tr>

         <th class="author">children</th>

         <td class="author"></td>

        </tr>

        <tr>

         <th class="files">files</th>

         <td class="files">a </td>

        </tr>

        </table>

        <div class="overflow">

        <div class="sourcefirst">   line diff</div>

        <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000

        </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

        </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@

        </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a

        </span></pre></div>

        </div>

        </div>

        </div>

        </body>

        </html>

      diff removed file

        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'

        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" />

        <title>test: a diff</title>

        </head>

        <body>

        <div class="container">

        <div class="menu">

        <div class="logo">

        <a href="http://mercurial.selenic.com/">

        <img src="/static/hglogo.png" alt="mercurial" /></a>

        </div>

        <ul>

        <li><a href="/shortlog/c78f6c5cbea9">log</a></li>

        <li><a href="/graph/c78f6c5cbea9">graph</a></li>

        <li><a href="/tags">tags</a></li>

        <li><a href="/branches">branches</a></li>

        </ul>

        <ul>

        <li><a href="/rev/c78f6c5cbea9">changeset</a></li>

        <li><a href="/file/c78f6c5cbea9">browse</a></li>

        </ul>

        <ul>

        <li><a href="/file/c78f6c5cbea9/a">file</a></li>

        <li><a href="/file/tip/a">latest</a></li>

        <li class="active">diff</li>

        <li><a href="/annotate/c78f6c5cbea9/a">annotate</a></li>

        <li><a href="/log/c78f6c5cbea9/a">file log</a></li>

        <li><a href="/raw-file/c78f6c5cbea9/a">raw</a></li>

        </ul>

        <ul>

        <li><a href="/help">help</a></li>

        </ul>

        </div>

        <div class="main">

        <h2><a href="/">test</a></h2>

        <h3>diff a @ 1:c78f6c5cbea9</h3>

        <form class="search" action="/log">

        <p></p>

        <p><input name="rev" id="search1" type="text" size="30" /></p>

        <div id="hint">find changesets by author, revision,

        files, or words in the commit message</div>

        </form>

        <div class="description">del</div>

        <table id="changesetEntry">

        <tr>

         <th>author</th>

         <td>&#116;&#101;&#115;&#116;</td>

        </tr>

        <tr>

         <th>date</th>

         <td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td>

        </tr>

        <tr>

         <th>parents</th>

         <td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td>

        </tr>

        <tr>

         <th>children</th>

         <td></td>

        </tr>

        </table>

        <div class="overflow">

        <div class="sourcefirst">   line diff</div>

        <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000

        </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000

        </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@

        </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a

        </span></pre></div>

        </div>

        </div>

        </div>

        </body>

        </html>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				setting up repo

				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Ama
				adding a
				$ hg rm a
				$ hg ci -mdel

				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

				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip'
				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" />

				<title>test: c78f6c5cbea9</title>
				</head>
				<body>
				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="http://mercurial.selenic.com/">
				<img src="/static/hglogo.png" alt="mercurial" /></a>
				</div>
				<ul>
				<li><a href="/shortlog/c78f6c5cbea9">log</a></li>
				<li><a href="/graph/c78f6c5cbea9">graph</a></li>
				<li><a href="/tags">tags</a></li>
				<li><a href="/branches">branches</a></li>
				</ul>
				<ul>
				<li class="active">changeset</li>
				<li><a href="/raw-rev/c78f6c5cbea9">raw</a></li>
				<li><a href="/file/c78f6c5cbea9">browse</a></li>
				</ul>
				<ul>

				</ul>
				<ul>
				<li><a href="/help">help</a></li>
				</ul>
				</div>

				<div class="main">

				<h2><a href="/">test</a></h2>
				<h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3>

				<form class="search" action="/log">

				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">find changesets by author, revision,
				files, or words in the commit message</div>
				</form>

				<div class="description">del</div>

				<table id="changesetEntry">
				<tr>
				<th class="author">author</th>
				<td class="author">test</td>
				</tr>
				<tr>
				<th class="date">date</th>
				<td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr>
				<tr>
				<th class="author">parents</th>
				<td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td>
				</tr>
				<tr>
				<th class="author">children</th>
				<td class="author"></td>
				</tr>
				<tr>
				<th class="files">files</th>
				<td class="files">a </td>
				</tr>
				</table>

				<div class="overflow">
				<div class="sourcefirst"> line diff</div>

				<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000
				</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
				</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
				</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
				</span></pre></div>
				</div>

				</div>
				</div>


				</body>
				</html>


				diff removed file

				$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'
				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" />

				<title>test: a diff</title>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="http://mercurial.selenic.com/">
				<img src="/static/hglogo.png" alt="mercurial" /></a>
				</div>
				<ul>
				<li><a href="/shortlog/c78f6c5cbea9">log</a></li>
				<li><a href="/graph/c78f6c5cbea9">graph</a></li>
				<li><a href="/tags">tags</a></li>
				<li><a href="/branches">branches</a></li>
				</ul>
				<ul>
				<li><a href="/rev/c78f6c5cbea9">changeset</a></li>
				<li><a href="/file/c78f6c5cbea9">browse</a></li>
				</ul>
				<ul>
				<li><a href="/file/c78f6c5cbea9/a">file</a></li>
				<li><a href="/file/tip/a">latest</a></li>
				<li class="active">diff</li>
				<li><a href="/annotate/c78f6c5cbea9/a">annotate</a></li>
				<li><a href="/log/c78f6c5cbea9/a">file log</a></li>
				<li><a href="/raw-file/c78f6c5cbea9/a">raw</a></li>
				</ul>
				<ul>
				<li><a href="/help">help</a></li>
				</ul>
				</div>

				<div class="main">
				<h2><a href="/">test</a></h2>
				<h3>diff a @ 1:c78f6c5cbea9</h3>

				<form class="search" action="/log">
				<p></p>
				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">find changesets by author, revision,
				files, or words in the commit message</div>
				</form>

				<div class="description">del</div>

				<table id="changesetEntry">
				<tr>
				<th>author</th>
				<td>test</td>
				</tr>
				<tr>
				<th>date</th>
				<td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td>
				</tr>
				<tr>
				<th>parents</th>
				<td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td>
				</tr>
				<tr>
				<th>children</th>
				<td></td>
				</tr>

				</table>

				<div class="overflow">
				<div class="sourcefirst"> line diff</div>

				<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000
				</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
				</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
				</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
				</span></pre></div>
				</div>
				</div>
				</div>



				</body>
				</html>