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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23524:a1a7c94d

default

Download file

             test-hgweb-descend-empties.t
        
                    146 lines
            
             | 3.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgweb-descend-empties.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        Mads Kiilerich
    
tests: use 'hghave serve' to guard tests that requires serve daemon management

              r15446
            
        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
      Test chains of near empty directories, terminating 3 different ways:

      - a1: file at level 4 (deepest)

      - b1: two dirs at level 3

      - e1: file at level 2

      Set up the repo

        $ hg init test

        $ cd test

        $ mkdir -p a1/a2/a3/a4

        $ mkdir -p b1/b2/b3/b4

        $ mkdir -p b1/b2/c3/c4

        $ mkdir -p d1/d2/d3/d4

        $ echo foo > a1/a2/a3/a4/foo

        $ echo foo > b1/b2/b3/b4/foo

        $ echo foo > b1/b2/c3/c4/foo

        $ echo foo > d1/d2/d3/d4/foo

        $ echo foo > d1/d2/foo

        $ hg ci -Ama

        adding a1/a2/a3/a4/foo

        adding b1/b2/b3/b4/foo

        adding b1/b2/c3/c4/foo

        adding d1/d2/d3/d4/foo

        adding d1/d2/foo

        $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

      manifest with descending

        Mads Kiilerich
    
tests: prepare get-with-headers.py for MSYS...

              r17017
            
        $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file'

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        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
    
web: Made elapsed time calculation dynamic (javascript)....

              r14046
            
        <script type="text/javascript" src="/static/mercurial.js"></script>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        <title>test: 9087c84a0f5d /</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/9087c84a0f5d">log</a></li>

        <li><a href="/graph/9087c84a0f5d">graph</a></li>

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
        <li><a href="/bookmarks">bookmarks</a></li>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

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

        </ul>

        <ul>

        <li><a href="/rev/9087c84a0f5d">changeset</a></li>

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

        </ul>

        <ul>

        </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
        <ul>

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

        </ul>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        </div>

        <div class="main">

        Bryan O'Sullivan
    
tests: update hgweb tests to include breadcrumbs

              r18264
            
        <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        <h3>directory / @ 0:9087c84a0f5d <span class="tag">tip</span> </h3>

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

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

        Alexander Plavin
    
paper: edit search hint to include new feature description

              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
    
tests: unify test-hgweb-descend-empties

              r12434
            
        </form>

        <table class="bigtable">

        <tr>

          <th class="name">name</th>

          <th class="size">size</th>

          <th class="permissions">permissions</th>

        </tr>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
        <tbody class="stripes2">

        <tr class="fileline">

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
          <td class="name"><a href="/file/9087c84a0f5d/">[up]</a></td>

          <td class="size"></td>

          <td class="permissions">drwxr-xr-x</td>

        </tr>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
        <tr class="fileline">

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        <td class="name">

        <a href="/file/9087c84a0f5d/a1">

        <img src="/static/coal-folder.png" alt="dir."/> a1/

        </a>

        <a href="/file/9087c84a0f5d/a1/a2/a3/a4">

        a2/a3/a4

        </a>

        </td>

        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

        </tr>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
        <tr class="fileline">

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        <td class="name">

        <a href="/file/9087c84a0f5d/b1">

        <img src="/static/coal-folder.png" alt="dir."/> b1/

        </a>

        <a href="/file/9087c84a0f5d/b1/b2">

        b2

        </a>

        </td>

        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

        </tr>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
        <tr class="fileline">

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        <td class="name">

        <a href="/file/9087c84a0f5d/d1">

        <img src="/static/coal-folder.png" alt="dir."/> d1/

        </a>

        <a href="/file/9087c84a0f5d/d1/d2">

        d2

        </a>

        </td>

        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

        </tr>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
        </tbody>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        </table>

        </div>

        </div>

        Benoit Allard
    
web: Made elapsed time calculation dynamic (javascript)....

              r14046
            
        <script type="text/javascript">process_dates()</script>

        Matt Mackall
    
tests: unify test-hgweb-descend-empties

              r12434
            
        </body>

        </html>

        $ cat errors.log

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require serve
Mads Kiilerich tests: use 'hghave serve' to guard tests that requires serve daemon management	r15446
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	Test chains of near empty directories, terminating 3 different ways:
		- a1: file at level 4 (deepest)
		- b1: two dirs at level 3
		- e1: file at level 2

		Set up the repo

		$ hg init test
		$ cd test
		$ mkdir -p a1/a2/a3/a4
		$ mkdir -p b1/b2/b3/b4
		$ mkdir -p b1/b2/c3/c4
		$ mkdir -p d1/d2/d3/d4
		$ echo foo > a1/a2/a3/a4/foo
		$ echo foo > b1/b2/b3/b4/foo
		$ echo foo > b1/b2/c3/c4/foo
		$ echo foo > d1/d2/d3/d4/foo
		$ echo foo > d1/d2/foo
		$ hg ci -Ama
		adding a1/a2/a3/a4/foo
		adding b1/b2/b3/b4/foo
		adding b1/b2/c3/c4/foo
		adding d1/d2/d3/d4/foo
		adding d1/d2/foo
		$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
		$ cat hg.pid >> $DAEMON_PIDS

		manifest with descending

Mads Kiilerich tests: prepare get-with-headers.py for MSYS...	r17017	$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file'
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	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 web: Made elapsed time calculation dynamic (javascript)....	r14046	<script type="text/javascript" src="/static/mercurial.js"></script>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434
		<title>test: 9087c84a0f5d /</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/9087c84a0f5d">log</a></li>
		<li><a href="/graph/9087c84a0f5d">graph</a></li>
		<li><a href="/tags">tags</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<li><a href="/bookmarks">bookmarks</a></li>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<li><a href="/branches">branches</a></li>
		</ul>
		<ul>
		<li><a href="/rev/9087c84a0f5d">changeset</a></li>
		<li class="active">browse</li>
		</ul>
		<ul>

		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<ul>
		<li><a href="/help">help</a></li>
		</ul>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	</div>

		<div class="main">
Bryan O'Sullivan tests: update hgweb tests to include breadcrumbs	r18264	<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<h3>directory / @ 0:9087c84a0f5d <span class="tag">tip</span> </h3>

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

		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: edit search hint to include new feature description	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 tests: unify test-hgweb-descend-empties	r12434	</form>

		<table class="bigtable">
		<tr>
		<th class="name">name</th>
		<th class="size">size</th>
		<th class="permissions">permissions</th>
		</tr>
Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	<tbody class="stripes2">
		<tr class="fileline">
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<td class="name"><a href="/file/9087c84a0f5d/">[up]</a></td>
		<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>

Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	<tr class="fileline">
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<td class="name">
		<a href="/file/9087c84a0f5d/a1">
		<img src="/static/coal-folder.png" alt="dir."/> a1/
		</a>
		<a href="/file/9087c84a0f5d/a1/a2/a3/a4">
		a2/a3/a4
		</a>
		</td>
		<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>
Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	<tr class="fileline">
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<td class="name">
		<a href="/file/9087c84a0f5d/b1">
		<img src="/static/coal-folder.png" alt="dir."/> b1/
		</a>
		<a href="/file/9087c84a0f5d/b1/b2">
		b2
		</a>
		</td>
		<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>
Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	<tr class="fileline">
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	<td class="name">
		<a href="/file/9087c84a0f5d/d1">
		<img src="/static/coal-folder.png" alt="dir."/> d1/
		</a>
		<a href="/file/9087c84a0f5d/d1/d2">
		d2
		</a>
		</td>
		<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>

Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	</tbody>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434	</table>
		</div>
		</div>
Benoit Allard web: Made elapsed time calculation dynamic (javascript)....	r14046	<script type="text/javascript">process_dates()</script>
Matt Mackall tests: unify test-hgweb-descend-empties	r12434

		</body>
		</html>


		$ cat errors.log
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..