Mercurial > hg
view contrib/win32/mercurial.ini @ 10579:f142fa3c0a8c stable
Make annotate --follow an alias for -f/--file to behave like in older versions
Since 98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 03 Mar 2010 22:04:59 +0100 |
parents | 601a9d67825a |
children | 5f01fd602542 |
line wrap: on
line source
; 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 [ui] ; editor used to enter commit logs, etc. Most text editors will work. editor = notepad ; show changed files and be a bit more verbose if True ; verbose = True ; username data to appear in commits ; it usually takes the form: Joe User <joe.user@host.com> ; username = Joe User <j.user@example.com> ; 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 ; ; For more information about mercurial extensions, start here ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions ; ; Extensions shipped with Mercurial ; [extensions] ;acl = ;alias = ;bookmarks = ;bugzilla = ;children = ;churn = ;color = ;convert = ;extdiff = ;fetch = ;gpg = ;graphlog = ;hgcia = ;hgk = ;highlight = ;interhg = ;keyword = ;mq = ;notify = ;pager = ;parentrevspec = ;patchbomb = ;progress = ;purge = ;rebase = ;record = ;transplant = ;win32mbcs = ;win32text = ;zeroconf = ; To use cleverencode/cleverdecode, you must enable win32text extension [encode] ; Encode files that don't contain NUL characters. ; ** = cleverencode: ; Alternatively, you can explicitly specify each file extension that ; you want encoded (any you omit will be left untouched), like this: ; *.txt = dumbencode: [decode] ; Decode files that don't contain NUL characters. ; ** = cleverdecode: ; Alternatively, you can explicitly specify each file extension that ; you want decoded (any you omit will be left untouched), like this: ; **.txt = dumbdecode: [patch] ; If you enable win32text filtering, you will want to enable this ; line as well to allow patching to work correctly. ; eol = crlf ; ; 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 ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' [hgk] ; Replace the following with your path to hgk, uncomment it and ; install ActiveTcl (or another win32 port like tclkit) ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" ; vdiff=vdiff ; ; 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