##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts....
shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts. Based on a patch by Benoit Boissinot, adapted to the pluggable sort algorithm design. toposort_reversepostorder() is a very good performer; it's designed to recreate what the revlog would have looked like if Mercurial had parent deltas now. toposort_postorderreverse() is unstable and very inconsistent, but perhaps with some work it could be made better.
Steve Borho - - Load All Authors

File last commit:

r10486:6b354a76 stable
r10623:64e286c2 default
Show More
mergetools.hgrc
86 lines | 2.9 KiB | text/plain | TextLexer
/ contrib / mergetools.hgrc
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 # Some default global settings for common merge tools
[merge-tools]
Neal Becker
mergetools.hgrc patch
 r6559 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 kdiff3.regkey=Software\KDiff3
Steve Borho
filemerge: two fixes for kdiff3 example configuration
 r6011 kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 kdiff3.gui=True
gvimdiff.args=--nofork -d -g -O $local $other $base
Matt Mackall
mergetools: correct vim typo
 r6014 gvimdiff.regkey=Software\Vim\GVim
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 gvimdiff.regname=path
gvimdiff.priority=-9
merge.checkconflicts=True
merge.priority=-10
gpyfm.gui=True
meld.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 meld.args=--label='local' $local --label='base' $base --label='other' $other
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008
tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True
tkdiff.priority=-8
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
xxdiff.gui=True
xxdiff.priority=-8
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
diffmerge.regname=Location
diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
Steve Borho
filemerge: add 'checkchanged' merge tool property
 r6075 diffmerge.checkchanged=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 diffmerge.gui=True
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
p4merge.priority=-8
Pascal Quantin
Update win32 merge tools configuration...
 r7665 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 tortoisemerge.regkey=Software\TortoiseSVN
Pascal Quantin
Update win32 merge tools configuration...
 r7665 tortoisemerge.checkchanged=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 tortoisemerge.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 tortoisemerge.priority=-8
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
Brendan Cully
mergetools: add pointer to the usual filemerge path
 r7385 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 filemerge.args=-left $other -right $local -ancestor $base -merge $output
filemerge.gui=True
Pascal Quantin
Update win32 merge tools configuration...
 r7665
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 ; Windows version of Beyond Compare
Pascal Quantin
merge tools: fix typo in Beyond Compare's 3 command line...
 r7867 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
Pascal Quantin
Retrieve Beyond Compare's path from registry...
 r7683 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
Pascal Quantin
Update win32 merge tools configuration...
 r7665 beyondcompare3.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 beyondcompare3.priority=-2
Pascal Quantin
Update win32 merge tools configuration...
 r7665
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 ; Linux version of Beyond Compare
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcompare.premerge=False
bcompare.gui=True
bcompare.priority=-1
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
Pascal Quantin
Update win32 merge tools configuration...
 r7665 winmerge.regkey=Software\Thingamahoochie\WinMerge
winmerge.regname=Executable
winmerge.checkchanged=True
winmerge.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
 r10486 winmerge.priority=-10
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
araxis.regappend=\ConsoleCompare.exe
araxis.priority=-2
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
araxis.premerge=False
araxis.checkconflict=True
araxis.binary=True
araxis.gui=True