upstream/mercurial-mirror Files · contrib/docker/apache-server/Dockerfile

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

Gregory Szorc - - Load All Authors

File last commit:

r23399:fd5247a8 default


                r49404:c9141848

default

Download file

             Dockerfile
        
                    23 lines
            
             | 520 B
            
                | text/x-dockerfile-config
            
             |
                DockerLexer
            
             / contrib / docker / apache-server / Dockerfile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      FROM debian:wheezy

      ENV DEBIAN_FRONTEND noninteractive

      ENV WSGI_PROCESSES 4

      ENV WSGI_THREADS 1

      ENV WSGI_MAX_REQUESTS 100000

      EXPOSE 80

      VOLUME ["/var/hg/htdocs", "/var/hg/repos"]

      RUN apt-get update && apt-get -y install libapache2-mod-wsgi python-dev vim

      # Install our own Apache site.

      RUN a2dissite 000-default

      ADD vhost.conf /etc/apache2/sites-available/hg

      RUN a2ensite hg

      ADD hgwebconfig /defaulthgwebconfig

      ADD entrypoint.sh /entrypoint.sh

      ENTRYPOINT ["/entrypoint.sh"]

      CMD ["/usr/sbin/apache2", "-DFOREGROUND"]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				FROM debian:wheezy

				ENV DEBIAN_FRONTEND noninteractive
				ENV WSGI_PROCESSES 4
				ENV WSGI_THREADS 1
				ENV WSGI_MAX_REQUESTS 100000

				EXPOSE 80
				VOLUME ["/var/hg/htdocs", "/var/hg/repos"]

				RUN apt-get update && apt-get -y install libapache2-mod-wsgi python-dev vim

				# Install our own Apache site.
				RUN a2dissite 000-default
				ADD vhost.conf /etc/apache2/sites-available/hg
				RUN a2ensite hg

				ADD hgwebconfig /defaulthgwebconfig

				ADD entrypoint.sh /entrypoint.sh
				ENTRYPOINT ["/entrypoint.sh"]

				CMD ["/usr/sbin/apache2", "-DFOREGROUND"]