hgweb: log error before attempting I/O Previously, an uncaught exception during HTTP request serving would attempt to send an error response then log the exception. If an exception occurred during I/O, this exception would be raised and the original exception wouldn't be logged. This commit changes behavior so the original exception is logged first, before we attempt to do anything else. This ensures the exception is logged. This change resulted in new tracebacks appearing in various tests. Because tracebacks can vary between Python versions, we added a simple script to filter the stack part of traceback lines. This makes testing much simpler, as we don't need to glob over lines and make lines conditional. Differential Revision: https://phab.mercurial-scm.org/D5749

     1

  $ hg init base

     2

     3

  $ cd base

     4

  $ echo 'alpha' > alpha

     5

  $ hg ci -A -m 'add alpha'

     6

  adding alpha

     7

  $ cd ..

     8

     9

  $ hg clone base work

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

    13

  $ cd work

    14

  $ echo 'beta' > beta

    15

  $ hg ci -A -m 'add beta'

    16

  adding beta

    17

  $ cd ..

    18

    19

  $ cd base

    20

  $ echo 'gamma' > gamma

    21

  $ hg ci -A -m 'add gamma'

    22

  adding gamma

    23

  $ cd ..

    24

    25

  $ cd work

    26

  $ hg pull -q

    27

  $ hg merge

    28

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

  (branch merge, don't forget to commit)

    30

    31

Update --clean to revision 1 to simulate a failed merge:

    32

    33

  $ rm alpha beta gamma

    34

  $ hg update --clean 1

    35

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    36

    37

  $ cd ..