##// END OF EJS Templates
crecord: rewrite status line text (BC)...
crecord: rewrite status line text (BC) Previously, we display fixed text in the 2-line status header. Now we want to customize some word there to make the "revert" action clear. However, if we simply replace the verb using '%s' like this: "SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; " "(space/A) toggle hunk/all; (e)dit hunk;"), " (f)old/unfold; (c)onfirm %s; (q)uit; (?) help " % verb "| [X]=hunk %s **=folded, toggle [a]mend mode" % verb It could cause trouble for i18n - some languages may expect things like "%(verb) confirm", for example. Therefore, this patch chooses to break the hard-coded 2-line sentences into "segment"s which could be translated (and replaced) separately. With the clean-up, I'm also changing the content being displayed, to make it cleaner and more friendly to (new) users, namely: - Replace "SELECT CHUNKS" to "Select hunks to record". Because: - To eliminate "hunk" / "chunk" inconsistency. - "record" is used in the "text" UI. Do not use "apply", to make it consistent. - To make it clear you are choosing what to record, not revert, or discard etc. This is probably the most important information the user should know. So let's put it first. - "to record" could be replaced to others depending on the operation. The follow-up patches will address them. - Move "[x]" and "**" legends first to explain the current interface. New users should understand what the legends mean, followed by what they can do in the interface. - Replace "j/k/up/dn/pgup/pgdn" with "arrow keys". Because: - "arrow keys" is more friendly to new users. - Mentioning "j/k" first may make emacs users angry. We should stay neutral about editors. - "pgup/pgdn" actually don't work very well. For example, within a hunk of 100-line insertion, "pgdn" just moves one single line. - Left/Right arrow keys are useful for movement and discovery of "expanding" a block. - Replace "fold/unfold" with "collapse/expand", "fold" is well known as a different meaning in histedit and evolve. - Replace "(space/A) toggle hunk/all" to "space: select". Because: - "A: toggle all" is not that useful - It's unclear how "hunk" could be "toggled" to a dumb user. Let's make it clear it's all about "select". - A follow-up will make it use "unselect" when we know the current item is selected. - Remove "(f)old". Use arrow keys instead. - Remove "toggle [a]mend mode". It's just confusing and could be useless. - Remove "(e)dit hunk". It's powerful but not friendly to new users. - Replace "(q)uit" to "q: abort" to make it clear you will lose changes. The result looks like the following in a 73-char-width terminal: Select hunks to record - [x]=selected **=collapsed c: confirm q: abort arrow keys: move/expand/collapse space: select ?: help If the terminal is 132-char wide, the text could fit in a single line.
Jun Wu -
r30546:9b674957 default
Show More
Name Size Modified Last Commit Author
/ contrib / docker / apache-server
Dockerfile Loading ...
README.rst Loading ...
entrypoint.sh Loading ...
hgwebconfig Loading ...
vhost.conf Loading ...

Apache Docker Server

This directory contains code for running a Mercurial hgweb server via mod_wsgi with the Apache HTTP Server inside a Docker container.

Important

This container is intended for testing purposes only: it is not meant to be suitable for production use.

Building Image

The first step is to build a Docker image containing Apache and mod_wsgi:

$ docker build -t hg-apache .

Important

You should rebuild the image whenever the content of this directory changes. Rebuilding after pulling or when you haven't run the container in a while is typically a good idea.

Running the Server

To run the container, you'll execute something like:

$ docker run --rm -it -v `pwd`/../../..:/var/hg/source -p 8000:80 hg-apache

If you aren't a Docker expert:

  • --rm will remove the container when it stops (so it doesn't clutter your system)
  • -i will launch the container in interactive mode so stdin is attached
  • -t will allocate a pseudo TTY
  • -v src:dst will mount the host filesystem at src into dst in the container. In our example, we assume you are running from this directory and use the source code a few directories up.
  • -p 8000:80 will publish port 80 on the container to port 8000 on the host, allowing you to access the HTTP server on the host interface.
  • hg-apache is the container image to run. This should correspond to what we build with docker build.

Important

The container requires that /var/hg/source contain the Mercurial source code.

Upon start, the container will attempt an install of the source in that directory. If the architecture of the host machine doesn't match that of the Docker host (e.g. when running Boot2Docker under OS X), Mercurial's Python C extensions will fail to run. Be sure to make clean your host's source tree before mounting it in the container to avoid this.

When starting the container, you should see some start-up actions (including a Mercurial install) and some output saying Apache has started:

Now if you load http://localhost:8000/ (or whatever interface Docker is using), you should see hgweb running!

For your convenience, we've created an empty repository available at /repo. Feel free to populate it with hg push.

Customizing the Server

By default, the Docker container installs a basic hgweb config and an empty dummy repository. It also uses some reasonable defaults for mod_wsgi.

Customizing the WSGI Dispatcher And Mercurial Config

By default, the Docker environment installs a custom hgweb.wsgi file (based on the example in contrib/hgweb.wsgi). The file is installed into /var/hg/htdocs/hgweb.wsgi.

A default hgweb configuration file is also installed. The hgwebconfig file from this directory is installed into /var/hg/htdocs/config.

You have a few options for customizing these files.

The simplest is to hack up hgwebconfig and entrypoint.sh in this directory and to rebuild the Docker image. This has the downside that the Mercurial working copy is modified and you may accidentally commit unwanted changes.

The next simplest is to copy this directory somewhere, make your changes, then rebuild the image. No working copy changes involved.

The preferred solution is to mount a host file into the container and overwrite the built-in defaults.

For example, say we create a custom hgweb config file in ~/hgweb. We can start the container like so to install our custom config file:

$ docker run -v ~/hgweb:/var/hg/htdocs/config ...

You can do something similar to install a custom WSGI dispatcher:

$ docker run -v ~/hgweb.wsgi:/var/hg/htdocs/hgweb.wsgi ...

Managing Repositories

Repositories are served from /var/hg/repos by default. This directory is configured as a Docker volume. This means you can mount an existing data volume container in the container so repository data is persisted across container invocations. See https://docs.docker.com/userguide/dockervolumes/ for more.

Alternatively, if you just want to perform lightweight repository manipulation, open a shell in the container:

$ docker exec -it <container> /bin/bash

Then run hg init, etc to manipulate the repositories in /var/hg/repos.

mod_wsgi Configuration Settings

mod_wsgi settings can be controlled with the following environment variables.

WSGI_PROCESSES
Number of WSGI processes to run.
WSGI_THREADS
Number of threads to run in each WSGI process
WSGI_MAX_REQUESTS
Maximum number of requests each WSGI process may serve before it is reaped.

See https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIDaemonProcess for more on these settings.

Note

The default is to use 1 thread per process. The reason is that Mercurial doesn't perform well in multi-threaded mode due to the GIL. Most people run a single thread per process in production for this reason, so that's what we default to.