upstream/mercurial-mirror Files · contrib/vagrant/provision.sh

simplemerge: change _minimize() to minimize a single conflict...

simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981

anatoly techtonik - - Load All Authors

File last commit:

r21874:8da01b6e default


                r49396:da04f362

default

Download file

             provision.sh
        
                    10 lines
            
             | 292 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / vagrant / provision.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        anatoly techtonik
    
contrib/vagrant: use Vagrant for running tests on virtual machine...

              r21874
            
      #!/bin/sh

      # This scripts is used to install dependencies for

      # testing Mercurial. Mainly used by Vagrant (see

      # Vagrantfile for details).

      export DEBIAN_FRONTEND=noninteractive

      apt-get update

      apt-get install -y -q python-dev unzip

      # run-tests.sh is added by Vagrantfile

      chmod +x run-tests.sh

	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

anatoly techtonik contrib/vagrant: use Vagrant for running tests on virtual machine...	r21874	#!/bin/sh
		# This scripts is used to install dependencies for
		# testing Mercurial. Mainly used by Vagrant (see
		# Vagrantfile for details).

		export DEBIAN_FRONTEND=noninteractive
		apt-get update
		apt-get install -y -q python-dev unzip
		# run-tests.sh is added by Vagrantfile
		chmod +x run-tests.sh