##// END OF EJS Templates
merge-lists: make it possible to specify pattern to match...
merge-lists: make it possible to specify pattern to match The `merge-lists` tool doesn't know anything about Python other than its regex that attempts to match import lines. Let's make it possible to pass in a custom regex so it's easy to use the tool for e.g. C/C++ `#include` lines or Rust `use` lines (given the limited). Differential Revision: https://phab.mercurial-scm.org/D12392

File last commit:

r44022:94eac340 default
r49875:b999edb1 default
Show More
mercurial.ini
97 lines | 2.3 KiB | text/x-ini | IniLexer
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.
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