upstream/mercurial-mirror Files · contrib/win32/mercurial.ini

streamclone: disable the volatile file open handle optimization on Windows...

streamclone: disable the volatile file open handle optimization on Windows Leaving files open caused new failures like this, since a47f09da8bd1: diff --git a/tests/test-persistent-nodemap-stream-clone.t b/tests/test-persistent-nodemap-stream-clone.t --- a/tests/test-persistent-nodemap-stream-clone.t +++ b/tests/test-persistent-nodemap-stream-clone.t @@ -115,7 +115,12 @@ Do a mix of clone and commit at the same $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-1 --debug 2>> clone-output | grep -E '00(changelog|manifest)' >> clone-output; touch $HG_TEST_STREAM_WALKED_FILE_3) & $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1 $ hg -R test-repo/ commit -m foo - created new head + transaction abort! + failed to recover 00changelog.n ([WinError 32] The process cannot access the file because it is being used by another process: b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n' -> b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n-f418dcd6') + rollback failed - please run hg recover + (failure reason: [WinError 32] The process cannot access the file because it is being used by another process: b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n' -> b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n-f418dcd6') + abort: The process cannot access the file because it is being used by another process: '$TESTTMP\test-repo\.hg\store\00changelog.n' + [255] $ touch $HG_TEST_STREAM_WALKED_FILE_2 $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3 $ cat clone-output Since the `VolatileManager` falls back to the old copy method when the open file threshold is exceeded, this just drops the threshold so that only 1 file is open. The actual value used (2) is unexpected, and explained inline. I'd like to have a config option for this so that we can test both ways (in theory, it could resort to copies on non-Windows systems too), but I don't see a `uimod.ui` handy. Alternately, I tried replacing the 3 `open()` calls in the `VolatileManager` with `util.posixfile()`, but that simply hung the test on Windows for some reason, I think on the same line that's indicated as failing above. (There was a `grep` command hanging around, as well as `hg -R test-repo serve --stdio`.)

Matt Harbison - - Load All Authors

File last commit:

r50068:90f7d827 default


                r53081:e4b242f9

stable

Download file

             mercurial.ini
        
                    97 lines
            
             | 2.4 KiB
            
                | text/x-ini
            
             |
                IniLexer
            
             / contrib / win32 / mercurial.ini
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ; System-wide Mercurial config file.

      ;

      ; !!!  Do Not Edit This File !!!

      ;

      ; This file will be replaced by the installer on every upgrade.

      ; Editing this file can cause strange side effects on Vista.

      ;

        Matt Harbison
    
contrib: migrate off of a couple of bitbucket URLs...

              r50068
            
      ; https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/135

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;

      ; To change settings you see in this file, override (or enable) them in

      ; your user Mercurial.ini file, where USERNAME is your Windows user name:

      ;

      ; XP or older    - C:\Documents and Settings\USERNAME\Mercurial.ini

      ; Vista or later - C:\Users\USERNAME\Mercurial.ini

        Lee Cantey
    
Convert default mercurial.ini file to Windows line endings

              r4749
            
        Thomas Arendsen Hein
    
merge with crew-stable

              r5142
            
      [ui]

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ; editor used to enter commit logs, etc.  Most text editors will work.

        Gregory Szorc
    
packaging: stage files and dynamically generate WiX installer...

              r44022
            
      ; editor = notepad

        Pascal Quantin
    
Update mercurial.ini file packaged in win32 installer...

              r7662
            
      ; show changed files and be a bit more verbose if True

      ; verbose = True

        Pierre-Yves David
    
config: update the Windows example config file...

              r31126
            
      ; colorize commands output

      ; color = auto

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
        Pascal Quantin
    
Update mercurial.ini file packaged in win32 installer...

              r7662
            
      ; username data to appear in commits

      ; it usually takes the form: Joe User <joe.user@host.com>

      ; username = Joe User <j.user@example.com>

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ; In order to push/pull over ssh you must specify an ssh tool

      ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2

      ;ssh = C:\cygwin\bin\ssh

        Lee Cantey
    
Convert default mercurial.ini file to Windows line endings

              r4749
            
        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;

      ; For more information about mercurial extensions, start here

        av6
    
win32: update wiki link in mercurial.ini

              r29665
            
      ; https://www.mercurial-scm.org/wiki/UsingExtensions

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;

      ; Extensions shipped with Mercurial

      ;

        Lee Cantey
    
Convert default mercurial.ini file to Windows line endings

              r4749
            
      [extensions]

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;acl =

        Pascal Quantin
    
win32: update Inno Setup installer script and extensions list

              r19512
            
      ;blackbox =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;bugzilla =

      ;children =

      ;churn =

      ;convert =

        Martin Geisler
    
win32text: mark this extension as deprecated

              r11269
            
      ;eol =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;extdiff =

      ;fetch =

      ;gpg =

      ;hgk =

      ;highlight = 

        Pascal Quantin
    
win32: update Inno Setup installer extensions list

              r17278
            
      ;histedit =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;interhg =

        Pascal Quantin
    
win32: update Inno Setup installer extensions list

              r17278
            
      ;largefiles =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;keyword =

      ;mq =

      ;notify =

      ;pager =

      ;patchbomb =

        Pascal Quantin
    
Add progress extension to win32 default config file

              r10474
            
      ;progress =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;purge =

      ;rebase =

      ;record =

        Pascal Quantin
    
win32: update Inno Setup installer extensions list

              r17278
            
      ;relink =

      ;schemes =

      ;share =

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;transplant =

      ;win32mbcs =

      ;zeroconf =

        Lee Cantey
    
Convert default mercurial.ini file to Windows line endings

              r4749
            
        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;

      ; Define external diff commands

      ;

      [extdiff]

      ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe

      ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe

      ;cmd.vimdiff = gvim.exe

        Thomas Arendsen Hein
    
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows...

              r16242
            
      ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
        Pascal Quantin
    
Package hgk Tcl/Tk script in win32 installer...

              r7663
            
      [hgk]

      ; Replace the following with your path to hgk, uncomment it and 

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ; install ActiveTcl (or another win32 port like tclkit)

        Pascal Quantin
    
Package hgk Tcl/Tk script in win32 installer...

              r7663
            
      ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"

        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ; vdiff=vdiff

        Lee Cantey
    
Convert default mercurial.ini file to Windows line endings

              r4749
            
        Steve Borho
    
mercurial.ini: provide more useful info...

              r9322
            
      ;

      ; The git extended diff format can represent binary files, file

      ; permission changes, and rename information that the normal patch format

      ; cannot describe.  However it is also not compatible with tools which

      ; expect normal patches. so enable git patches at your own risk.

      ;

      [diff]

      ;git = false

      ;nodates = false

        Pascal Quantin
    
Update mercurial.ini file packaged in win32 installer...

              r7662

	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

Steve Borho mercurial.ini: provide more useful info...	r9322	; System-wide Mercurial config file.
		;
		; !!! Do Not Edit This File !!!
		;
		; This file will be replaced by the installer on every upgrade.
		; Editing this file can cause strange side effects on Vista.
		;
Matt Harbison contrib: migrate off of a couple of bitbucket URLs...	r50068	; https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/135
Steve Borho mercurial.ini: provide more useful info...	r9322	;
		; To change settings you see in this file, override (or enable) them in
		; your user Mercurial.ini file, where USERNAME is your Windows user name:
		;
		; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini
		; Vista or later - C:\Users\USERNAME\Mercurial.ini

Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749
Thomas Arendsen Hein merge with crew-stable	r5142	[ui]
Steve Borho mercurial.ini: provide more useful info...	r9322	; editor used to enter commit logs, etc. Most text editors will work.
Gregory Szorc packaging: stage files and dynamically generate WiX installer...	r44022	; editor = notepad
Pascal Quantin Update mercurial.ini file packaged in win32 installer...	r7662	; show changed files and be a bit more verbose if True
		; verbose = True
Pierre-Yves David config: update the Windows example config file...	r31126	; colorize commands output
		; color = auto
Steve Borho mercurial.ini: provide more useful info...	r9322
Pascal Quantin Update mercurial.ini file packaged in win32 installer...	r7662	; username data to appear in commits
		; it usually takes the form: Joe User <joe.user@host.com>
		; username = Joe User <j.user@example.com>

Steve Borho mercurial.ini: provide more useful info...	r9322	; In order to push/pull over ssh you must specify an ssh tool
		;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
		;ssh = C:\cygwin\bin\ssh
Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749
Steve Borho mercurial.ini: provide more useful info...	r9322	;
		; For more information about mercurial extensions, start here
av6 win32: update wiki link in mercurial.ini	r29665	; https://www.mercurial-scm.org/wiki/UsingExtensions
Steve Borho mercurial.ini: provide more useful info...	r9322	;
		; Extensions shipped with Mercurial
		;
Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749	[extensions]
Steve Borho mercurial.ini: provide more useful info...	r9322	;acl =
Pascal Quantin win32: update Inno Setup installer script and extensions list	r19512	;blackbox =
Steve Borho mercurial.ini: provide more useful info...	r9322	;bugzilla =
		;children =
		;churn =
		;convert =
Martin Geisler win32text: mark this extension as deprecated	r11269	;eol =
Steve Borho mercurial.ini: provide more useful info...	r9322	;extdiff =
		;fetch =
		;gpg =
		;hgk =
		;highlight =
Pascal Quantin win32: update Inno Setup installer extensions list	r17278	;histedit =
Steve Borho mercurial.ini: provide more useful info...	r9322	;interhg =
Pascal Quantin win32: update Inno Setup installer extensions list	r17278	;largefiles =
Steve Borho mercurial.ini: provide more useful info...	r9322	;keyword =
		;mq =
		;notify =
		;pager =
		;patchbomb =
Pascal Quantin Add progress extension to win32 default config file	r10474	;progress =
Steve Borho mercurial.ini: provide more useful info...	r9322	;purge =
		;rebase =
		;record =
Pascal Quantin win32: update Inno Setup installer extensions list	r17278	;relink =
		;schemes =
		;share =
Steve Borho mercurial.ini: provide more useful info...	r9322	;transplant =
		;win32mbcs =
		;zeroconf =
Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749
Steve Borho mercurial.ini: provide more useful info...	r9322	;
		; Define external diff commands
		;
		[extdiff]
		;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
		;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
		;cmd.vimdiff = gvim.exe
Thomas Arendsen Hein extdiff: escape filenames with vim/DirDiff and make quoting work with Windows...	r16242	;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
Steve Borho mercurial.ini: provide more useful info...	r9322

Pascal Quantin Package hgk Tcl/Tk script in win32 installer...	r7663	[hgk]
		; Replace the following with your path to hgk, uncomment it and
Steve Borho mercurial.ini: provide more useful info...	r9322	; install ActiveTcl (or another win32 port like tclkit)
Pascal Quantin Package hgk Tcl/Tk script in win32 installer...	r7663	; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
Steve Borho mercurial.ini: provide more useful info...	r9322	; vdiff=vdiff

Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749
Steve Borho mercurial.ini: provide more useful info...	r9322	;
		; The git extended diff format can represent binary files, file
		; permission changes, and rename information that the normal patch format
		; cannot describe. However it is also not compatible with tools which
		; expect normal patches. so enable git patches at your own risk.
		;
		[diff]
		;git = false
		;nodates = false
Pascal Quantin Update mercurial.ini file packaged in win32 installer...	r7662