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

largefiles: access to specific fields only if largefiles enabled (issue4547)...

largefiles: access to specific fields only if largefiles enabled (issue4547) Even if largefiles extension is enabled in a repository, "repo" object, which isn't "largefiles.reposetup()"-ed, is passed to overridden functions in the cases below unexpectedly, because extensions are enabled for each repositories strictly. (1) clone without -U: (2) pull with -U: (3) pull with --rebase: combination of "enabled@src", "disabled@dst" and "not-required@src" cause this situation. largefiles requirement @src @dst @src result -------- -------- --------------- -------------------- enabled disabled not-required aborted unexpectedly required requirement error (intentional) -------- -------- --------------- -------------------- enabled enabled * success -------- -------- --------------- -------------------- disabled enabled * success (only for "pull") -------- -------- --------------- -------------------- disabled disabled not-required success required requirement error (intentional) -------- -------- --------------- -------------------- (4) update/revert with a subrepo disabling largefiles In these cases, overridden functions cause accessing to largefiles specific fields of not "largefiles.reposetup()"-ed "repo" object, and execution is aborted. - (1), (2), (4) cause accessing to "_lfstatuswriters" in "getstatuswriter()" invoked via "updatelfiles()" - (3) causes accessing to "_lfcommithooks" in "overriderebase()" For safe accessing to these fields, this patch examines whether passed "repo" object is "largefiles.reposetup()"-ed or not before accessing to them. This patch chooses examining existence of newly introduced "_largefilesenabled" instead of "_lfcommithooks" and "_lfstatuswriters" directly, because the former is better name for the generic "largefiles is enabled in this repo" mark than the latter. In the future, all other overridden functions should avoid largefiles specific processing for efficiency, and "_largefilesenabled" is better also for such purpose. BTW, "lfstatus" can't be used for such purpose, because some code paths set it forcibly regardless of existence of it in specified "repo" object.

Martin Geisler - - Load All Authors

File last commit:

r20145:a5354990 stable


                r24158:d414c28d

stable

Download file

             mercurial.ini
        
                    98 lines
            
             | 2.3 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.

      ;

      ; http://bitbucket.org/tortoisehg/stable/issue/135

      ;

      ; 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.

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

              r4749
            
      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

        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

      ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions

      ;

      ; 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 =

      ;color =

      ;convert =

        Martin Geisler
    
win32text: mark this extension as deprecated

              r11269
            
      ;eol =

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

              r9322
            
      ;extdiff =

      ;fetch =

      ;gpg =

      ;hgcia =

      ;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 =

        Pascal Quantin
    
win32: add shelve extension to mercurial.ini

              r19946
            
      ;shelve =

        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.
		;
		; http://bitbucket.org/tortoisehg/stable/issue/135
		;
		; 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.
Lee Cantey Convert default mercurial.ini file to Windows line endings	r4749	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
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
		; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
		;
		; 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 =
		;color =
		;convert =
Martin Geisler win32text: mark this extension as deprecated	r11269	;eol =
Steve Borho mercurial.ini: provide more useful info...	r9322	;extdiff =
		;fetch =
		;gpg =
		;hgcia =
		;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 =
Pascal Quantin win32: add shelve extension to mercurial.ini	r19946	;shelve =
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