view tests/test-hgweb-non-interactive.t @ 45382:0652a533fe3c

mergestate: use _stateextras instead of merge records for commit related info

There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
committing.

For this purpose, we are using merge records and introduced a merge
entry state for that. However this won't scale and is not clean way to implement
this.

This patch reworks the existing logic related to this to use _stateextras and
read from it.

Right now the information stored is not very descriptive but it will be in next
patch.

Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be
kept for BC.

Differential Revision: https://phab.mercurial-scm.org/D8920

Tests if hgweb can run without touching sys.stdin, as is required
by the WSGI standard and strictly implemented by mod_wsgi.

  $ hg init repo
  $ cd repo
  $ echo foo > bar
  $ hg add bar
  $ hg commit -m "test"
  $ cat > request.py <<EOF
  > from __future__ import absolute_import
  > import os
  > import sys
  > from mercurial import (
  >     dispatch,
  >     encoding,
  >     hg,
  >     ui as uimod,
  >     util,
  > )
  > from mercurial.utils import (
  >     procutil,
  > )
  > ui = uimod.ui
  > from mercurial.hgweb import hgweb_mod
  > stringio = util.stringio
  > 
  > class FileLike(object):
  >     def __init__(self, real):
  >         self.real = real
  >     def fileno(self):
  >         print >> sys.__stdout__, 'FILENO'
  >         return self.real.fileno()
  >     def read(self):
  >         print >> sys.__stdout__, 'READ'
  >         return self.real.read()
  >     def readline(self):
  >         print >> sys.__stdout__, 'READLINE'
  >         return self.real.readline()
  > 
  > sys.stdin = FileLike(sys.stdin)
  > errors = stringio()
  > input = stringio()
  > output = stringio()
  > 
  > def startrsp(status, headers):
  >     print('---- STATUS')
  >     print(status)
  >     print('---- HEADERS')
  >     print([i for i in headers if i[0] != 'ETag'])
  >     print('---- DATA')
  >     return output.write
  > 
  > env = {
  >     'wsgi.version': (1, 0),
  >     'wsgi.url_scheme': 'http',
  >     'wsgi.errors': errors,
  >     'wsgi.input': input,
  >     'wsgi.multithread': False,
  >     'wsgi.multiprocess': False,
  >     'wsgi.run_once': False,
  >     'REQUEST_METHOD': 'GET',
  >     'SCRIPT_NAME': '',
  >     'PATH_INFO': '',
  >     'QUERY_STRING': '',
  >     'SERVER_NAME': '$LOCALIP',
  >     'SERVER_PORT': os.environ['HGPORT'],
  >     'SERVER_PROTOCOL': 'HTTP/1.0'
  > }
  > 
  > i = hgweb_mod.hgweb(b'.')
  > for c in i(env, startrsp):
  >     pass
  > sys.stdout.flush()
  > procutil.stdout.write(b'---- ERRORS\n')
  > procutil.stdout.write(b'%s\n' % errors.getvalue())
  > print('---- OS.ENVIRON wsgi variables')
  > print(sorted([x for x in os.environ if x.startswith('wsgi')]))
  > print('---- request.ENVIRON wsgi variables')
  > with i._obtainrepo() as repo:
  >     print(sorted([encoding.strfromlocal(x) for x in repo.ui.environ
  >                   if x.startswith(b'wsgi')]))
  > EOF
  $ "$PYTHON" request.py
  ---- STATUS
  200 Script output follows
  ---- HEADERS
  [('Content-Type', 'text/html; charset=ascii')]
  ---- DATA
  ---- ERRORS
  
  ---- OS.ENVIRON wsgi variables
  []
  ---- request.ENVIRON wsgi variables
  ['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version']

  $ cd ..