tests/test-hgweb-diffs.t
author Matt Mackall <mpm@selenic.com>
Mon, 14 May 2012 12:56:43 +0200
branchstable
changeset 16722 7bf48bc7de23
parent 16308 2695aaf4eb72
child 16913 f2719b387380
permissions -rw-r--r--
hgweb: fix filediff base calculation Previously, we were finding the most recent version of a file in a changeset and comparing it against its first file parent. This was wrong on three counts: - it would show a diff in revisions where there was no change to a file - it would show a diff when only the exec bit changed - it would potentially compare against a much older changeset, which could be very expensive if git-style rename detection was enabled This compares the file in the current context with that context's parent, which may result in an empty diff when looking at a file not touched by the current changeset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
     1
  $ "$TESTDIR/hghave" serve execbit || exit 80
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 15375
diff changeset
     2
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     3
setting up repo
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     4
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     5
  $ hg init test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     6
  $ cd test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     7
  $ echo a > a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     8
  $ echo b > b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
     9
  $ hg ci -Ama
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    10
  adding a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    11
  adding b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    12
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    13
change permissions for git diffs
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    14
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 15375
diff changeset
    15
  $ chmod +x a
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
    16
  $ hg rm b
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    17
  $ hg ci -Amb
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    18
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    19
set up hgweb
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    20
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    21
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    22
  $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    23
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    24
revision
8452
cb93eee1fbcd tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents: 7428
diff changeset
    25
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    26
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    27
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    28
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    29
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    30
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    31
  <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    32
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    33
  <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    34
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
    35
  <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    36
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    37
  <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    38
  </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    39
  <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    40
  <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    41
  <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    42
  <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    43
  <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    44
  <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    45
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    46
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    47
   <li><a href="/shortlog/0cd96de13884">log</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    48
   <li><a href="/graph/0cd96de13884">graph</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    49
   <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
    50
   <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    51
   <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    52
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    53
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    54
   <li class="active">changeset</li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    55
   <li><a href="/raw-rev/0cd96de13884">raw</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    56
   <li><a href="/file/0cd96de13884">browse</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    57
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    58
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    59
   
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    60
  </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
    61
  <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
    62
   <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
    63
  </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    64
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    65
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    66
  <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    67
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    68
  <h2><a href="/">test</a></h2>
13596
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12847
diff changeset
    69
  <h3>changeset 0:0cd96de13884   </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    70
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    71
  <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    72
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    73
  <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    74
  <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    75
  files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    76
  </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    77
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    78
  <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    79
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    80
  <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    81
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    82
   <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    83
   <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    84
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    85
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    86
   <th class="date">date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
    87
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    88
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    89
   <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    90
   <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    91
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    92
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    93
   <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
    94
   <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    95
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    96
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    97
   <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    98
   <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
    99
  </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   100
  <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   101
    <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   102
    <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   103
       2 files changed, 2 insertions(+), 0 deletions(-)
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   104
  
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
   105
      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   106
      <div id="diffstatdetails" style="display:none;">
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
   107
        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   108
        <p>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   109
        <table>  <tr class="parity0">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   110
      <td class="diffstat-file"><a href="#l1.1">a</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   111
      <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   112
      <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   113
        <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   114
        <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   115
      </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   116
    </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   117
    <tr class="parity1">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   118
      <td class="diffstat-file"><a href="#l2.1">b</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   119
      <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   120
      <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   121
        <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   122
        <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   123
      </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   124
    </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   125
  </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   126
      </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   127
    </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   128
  </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   129
  </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   130
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   131
  <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   132
  <div class="sourcefirst">   line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   133
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   134
  <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   135
  </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   136
  </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   137
  </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   138
  </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   139
  </span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   140
  </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   141
  </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="plusline">+b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   142
  </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   143
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   144
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   145
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   146
  </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   147
  <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   148
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   149
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   150
  </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   151
  </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   152
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   153
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   154
raw revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   155
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   156
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   157
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   158
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   159
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   160
  # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   161
  # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   162
  # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   163
  # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   164
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   165
  a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   166
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   167
  diff -r 000000000000 -r 0cd96de13884 a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   168
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   169
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   170
  @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   171
  +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   172
  diff -r 000000000000 -r 0cd96de13884 b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   173
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   174
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   175
  @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   176
  +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   177
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   178
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   179
diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   180
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   181
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/b'
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   182
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   183
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   184
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   185
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   186
  <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   187
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   188
  <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   189
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   190
  <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   191
  
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   192
  <title>test: b diff</title>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   193
  </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   194
  <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   195
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   196
  <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   197
  <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   198
  <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   199
  <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   200
  <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   201
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   202
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   203
  <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   204
  <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   205
  <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
   206
  <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   207
  <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   208
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   209
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   210
  <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   211
  <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   212
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   213
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   214
  <li><a href="/file/559edbd9ed20/b">file</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   215
  <li><a href="/file/tip/b">latest</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   216
  <li class="active">diff</li>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   217
  <li><a href="/annotate/559edbd9ed20/b">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   218
  <li><a href="/log/559edbd9ed20/b">file log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   219
  <li><a href="/raw-file/559edbd9ed20/b">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   220
  </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   221
  <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   222
  <li><a href="/help">help</a></li>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   223
  </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   224
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   225
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   226
  <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   227
  <h2><a href="/">test</a></h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   228
  <h3>diff b @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   229
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   230
  <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   231
  <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   232
  <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   233
  <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   234
  files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   235
  </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   236
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   237
  <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   238
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   239
  <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   240
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   241
   <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   242
   <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   243
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   244
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   245
   <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
   246
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   247
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   248
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   249
   <th>parents</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   250
   <td><a href="/file/0cd96de13884/b">0cd96de13884</a> </td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   251
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   252
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   253
   <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   254
   <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   255
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   256
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   257
  </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   258
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   259
  <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   260
  <div class="sourcefirst">   line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   261
  
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   262
  <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/b	Thu Jan 01 00:00:00 1970 +0000
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   263
  </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   264
  </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   265
  </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-b
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   266
  </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   267
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   268
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   269
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   270
  
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   271
  <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   272
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   273
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   274
  </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   275
  </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   276
  
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   277
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   278
set up hgweb with git diffs
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
   279
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   280
  $ "$TESTDIR/killdaemons.py"
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   281
  $ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   282
  $ cat hg.pid >> $DAEMON_PIDS
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   283
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   284
revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   285
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   286
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   287
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   288
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   289
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   290
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   291
  <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   292
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   293
  <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   294
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   295
  <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   296
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   297
  <title>test: 0cd96de13884</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   298
  </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   299
  <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   300
  <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   301
  <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   302
  <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   303
  <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   304
  <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   305
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   306
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   307
   <li><a href="/shortlog/0cd96de13884">log</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   308
   <li><a href="/graph/0cd96de13884">graph</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   309
   <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
   310
   <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   311
   <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   312
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   313
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   314
   <li class="active">changeset</li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   315
   <li><a href="/raw-rev/0cd96de13884">raw</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   316
   <li><a href="/file/0cd96de13884">browse</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   317
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   318
  <ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   319
   
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   320
  </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
   321
  <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
   322
   <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12435
diff changeset
   323
  </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   324
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   325
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   326
  <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   327
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   328
  <h2><a href="/">test</a></h2>
13596
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12847
diff changeset
   329
  <h3>changeset 0:0cd96de13884   </h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   330
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   331
  <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   332
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   333
  <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   334
  <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   335
  files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   336
  </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   337
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   338
  <div class="description">a</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   339
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   340
  <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   341
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   342
   <th class="author">author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   343
   <td class="author">&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   344
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   345
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   346
   <th class="date">date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
   347
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   348
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   349
   <th class="author">parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   350
   <td class="author"></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   351
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   352
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   353
   <th class="author">children</th>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   354
   <td class="author"> <a href="/rev/559edbd9ed20">559edbd9ed20</a></td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   355
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   356
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   357
   <th class="files">files</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   358
   <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   359
  </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   360
  <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   361
    <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   362
    <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   363
       2 files changed, 2 insertions(+), 0 deletions(-)
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   364
  
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
   365
      <a id="diffstatexpand" href="javascript:showDiffstat()"/>[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   366
      <div id="diffstatdetails" style="display:none;">
14608
4aef71839337 paper/coal: use fixed width for diffstat +/- link
Martin Geisler <mg@aragost.com>
parents: 14571
diff changeset
   367
        <a href="javascript:hideDiffstat()"/>[<tt>-</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   368
        <p>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   369
        <table>  <tr class="parity0">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   370
      <td class="diffstat-file"><a href="#l1.1">a</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   371
      <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   372
      <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   373
        <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   374
        <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   375
      </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   376
    </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   377
    <tr class="parity1">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   378
      <td class="diffstat-file"><a href="#l2.1">b</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   379
      <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   380
      <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   381
        <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   382
        <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   383
      </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   384
    </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   385
  </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   386
      </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   387
    </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
   388
  </tr>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   389
  </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   390
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   391
  <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   392
  <div class="sourcefirst">   line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   393
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   394
  <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   395
  <a href="#l1.2" id="l1.2">     1.2</a> <span class="minusline">--- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   396
  </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="plusline">+++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   397
  </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   398
  </span><a href="#l1.5" id="l1.5">     1.5</a> <span class="plusline">+a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   399
  </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   400
  <a href="#l2.2" id="l2.2">     2.2</a> <span class="minusline">--- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   401
  </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="plusline">+++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   402
  </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="atline">@@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   403
  </span><a href="#l2.5" id="l2.5">     2.5</a> <span class="plusline">+b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   404
  </span></pre></div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   405
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   406
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   407
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   408
  </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   409
  <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   410
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   411
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   412
  </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   413
  </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   414
  
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   415
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   416
revision
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   417
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   418
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   419
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   420
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   421
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   422
  # HG changeset patch
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   423
  # User test
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   424
  # Date 0 0
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   425
  # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   426
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   427
  a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   428
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   429
  diff --git a/a b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   430
  new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   431
  --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   432
  +++ b/a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   433
  @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   434
  +a
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   435
  diff --git a/b b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   436
  new file mode 100644
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   437
  --- /dev/null
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   438
  +++ b/b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   439
  @@ -0,0 +1,1 @@
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   440
  +b
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   441
  
9402
5d49fdef6fd0 hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8452
diff changeset
   442
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   443
diff removed file
7309
e74a9173c2d7 hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
   444
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   445
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   446
  200 Script output follows
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   447
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   448
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   449
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   450
  <head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   451
  <link rel="icon" href="/static/hgicon.png" type="image/png" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   452
  <meta name="robots" content="index, nofollow" />
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   453
  <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   454
  <script type="text/javascript" src="/static/mercurial.js"></script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   455
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   456
  <title>test: a diff</title>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   457
  </head>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   458
  <body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   459
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   460
  <div class="container">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   461
  <div class="menu">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   462
  <div class="logo">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   463
  <a href="http://mercurial.selenic.com/">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   464
  <img src="/static/hglogo.png" alt="mercurial" /></a>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   465
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   466
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   467
  <li><a href="/shortlog/559edbd9ed20">log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   468
  <li><a href="/graph/559edbd9ed20">graph</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   469
  <li><a href="/tags">tags</a></li>
13597
38c9837b1f75 hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents: 13596
diff changeset
   470
  <li><a href="/bookmarks">bookmarks</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   471
  <li><a href="/branches">branches</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   472
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   473
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   474
  <li><a href="/rev/559edbd9ed20">changeset</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   475
  <li><a href="/file/559edbd9ed20">browse</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   476
  </ul>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   477
  <ul>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   478
  <li><a href="/file/559edbd9ed20/a">file</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   479
  <li><a href="/file/tip/a">latest</a></li>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   480
  <li class="active">diff</li>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   481
  <li><a href="/annotate/559edbd9ed20/a">annotate</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   482
  <li><a href="/log/559edbd9ed20/a">file log</a></li>
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   483
  <li><a href="/raw-file/559edbd9ed20/a">raw</a></li>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   484
  </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   485
  <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   486
  <li><a href="/help">help</a></li>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
   487
  </ul>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   488
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   489
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   490
  <div class="main">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   491
  <h2><a href="/">test</a></h2>
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   492
  <h3>diff a @ 1:559edbd9ed20</h3>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   493
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   494
  <form class="search" action="/log">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   495
  <p></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   496
  <p><input name="rev" id="search1" type="text" size="30" /></p>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   497
  <div id="hint">find changesets by author, revision,
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   498
  files, or words in the commit message</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   499
  </form>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   500
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   501
  <div class="description">b</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   502
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   503
  <table id="changesetEntry">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   504
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   505
   <th>author</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   506
   <td>&#116;&#101;&#115;&#116;</td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   507
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   508
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   509
   <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
   510
   <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   511
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   512
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   513
   <th>parents</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   514
   <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   515
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   516
  <tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   517
   <th>children</th>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   518
   <td></td>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   519
  </tr>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   520
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   521
  </table>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   522
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   523
  <div class="overflow">
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   524
  <div class="sourcefirst">   line diff</div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   525
  
16722
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   526
  <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> old mode 100644
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   527
  <a href="#l1.2" id="l1.2">     1.2</a> new mode 100755
7bf48bc7de23 hgweb: fix filediff base calculation
Matt Mackall <mpm@selenic.com>
parents: 16308
diff changeset
   528
  </pre></div>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   529
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   530
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   531
  </div>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   532
  
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
   533
  <script type="text/javascript">process_dates()</script>
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   534
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   535
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   536
  </body>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   537
  </html>
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   538
  
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   539
  $ cd ..
9731
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9402
diff changeset
   540
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   541
test import rev as raw-rev
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   542
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   543
  $ hg clone -r0 test test1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   544
  adding changesets
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   545
  adding manifests
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   546
  adding file changes
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   547
  added 1 changesets with 2 changes to 2 files
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   548
  updating to branch default
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   549
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   550
  $ cd test1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   551
  $ hg import -q --exact http://localhost:$HGPORT/rev/1
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   552
16308
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   553
raw revision with diff block numbers
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   554
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   555
  $ "$TESTDIR/killdaemons.py"
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   556
  $ cat <<EOF > .hg/hgrc
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   557
  > [web]
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   558
  > templates = rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   559
  > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   560
  $ mkdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   561
  $ cat <<EOF > rawdiff/map
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   562
  > mimetype = 'text/plain; charset={encoding}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   563
  > changeset = '{diff}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   564
  > difflineplus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   565
  > difflineminus = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   566
  > difflineat = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   567
  > diffline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   568
  > filenodelink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   569
  > filenolink = ''
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   570
  > fileline = '{line}'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   571
  > diffblock = 'Block: {blockno}\n{lines}\n'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   572
  > EOF
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   573
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   574
  $ cat hg.pid >> $DAEMON_PIDS
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   575
  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   576
  200 Script output follows
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   577
  
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   578
  Block: 1
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   579
  diff -r 000000000000 -r 0cd96de13884 a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   580
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   581
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   582
  @@ -0,0 +1,1 @@
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   583
  +a
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   584
  
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   585
  Block: 2
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   586
  diff -r 000000000000 -r 0cd96de13884 b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   587
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   588
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   589
  @@ -0,0 +1,1 @@
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   590
  +b
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   591
  
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   592
  $ "$TESTDIR/killdaemons.py"
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   593
  $ rm .hg/hgrc rawdiff/map
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   594
  $ rmdir rawdiff
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   595
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   596
  $ cat hg.pid >> $DAEMON_PIDS
2695aaf4eb72 hgweb: add block numbers to diff regions and related links
Paul Boddie <paul@boddie.org.uk>
parents: 15446
diff changeset
   597
12435
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   598
errors
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   599
61be1503cfb2 tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents: 9753
diff changeset
   600
  $ cat ../test/errors.log