Mercurial > public > mercurial-scm > hg

annotate contrib/mergetools.hgrc @ 11109:a2bc2f2d77a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test
author Edouard Gomez <ed.gomez@free.fr>
date Sat, 01 May 2010 23:05:19 +0200
parents 6b354a763617
children bdc8f048166e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # Some default global settings for common merge tools
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 [merge-tools]
6559
8b67211d9140 mergetools.hgrc patch
Neal Becker <ndbecker2@gmail.com>
parents: 6075
diff changeset
4 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 kdiff3.regkey=Software\KDiff3
6011
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
6 kdiff3.regappend=\kdiff3.exe
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
7 kdiff3.fixeol=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 kdiff3.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 gvimdiff.args=--nofork -d -g -O $local $other $base
6014
2f424fc4edb3 mergetools: correct vim typo
Matt Mackall <mpm@selenic.com>
parents: 6011
diff changeset
11 gvimdiff.regkey=Software\Vim\GVim
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 gvimdiff.regname=path
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 gvimdiff.priority=-9
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 merge.checkconflicts=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 merge.priority=-10
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
18 gpyfm.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
19
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 meld.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
21 meld.args=--label='local' $local --label='base' $base --label='other' $other
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
22
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23 tkdiff.args=$local $other -a $base -o $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
24 tkdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 tkdiff.priority=-8
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
28 xxdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29 xxdiff.priority=-8
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
31 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
32 diffmerge.regname=Location
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
33 diffmerge.priority=-7
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
34 diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
6075
63e0e57ab157 filemerge: add 'checkchanged' merge tool property
Steve Borho <steve@borho.org>
parents: 6014
diff changeset
35 diffmerge.checkchanged=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
36 diffmerge.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
37
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
38 p4merge.args=$base $local $other $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
39 p4merge.regkey=Software\Perforce\Environment
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
40 p4merge.regname=P4INSTROOT
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
41 p4merge.regappend=\p4merge.exe
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
42 p4merge.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
43 p4merge.priority=-8
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
44
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
45 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
46 tortoisemerge.regkey=Software\TortoiseSVN
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
47 tortoisemerge.checkchanged=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
48 tortoisemerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
49 tortoisemerge.priority=-8
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
50
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
51 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
52 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
53 ecmerge.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
54
7385
8119c1a607c4 mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com>
parents: 6559
diff changeset
55 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
56 filemerge.args=-left $other -right $local -ancestor $base -merge $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
57 filemerge.gui=True
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
58
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
59 ; Windows version of Beyond Compare
7867
01bd0efef1b5 merge tools: fix typo in Beyond Compare's 3 command line
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7797
diff changeset
60 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
7683
39ae4fb8cf17 Retrieve Beyond Compare's path from registry
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7665
diff changeset
61 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
39ae4fb8cf17 Retrieve Beyond Compare's path from registry
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7665
diff changeset
62 beyondcompare3.regname=ExePath
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
63 beyondcompare3.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
64 beyondcompare3.priority=-2
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
65
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
66 ; Linux version of Beyond Compare
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
67 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
68 bcompare.premerge=False
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
69 bcompare.gui=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
70 bcompare.priority=-1
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
71
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
72 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
73 winmerge.regkey=Software\Thingamahoochie\WinMerge
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
74 winmerge.regname=Executable
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
75 winmerge.checkchanged=True
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
76 winmerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
77 winmerge.priority=-10
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
78
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
79 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
80 araxis.regappend=\ConsoleCompare.exe
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
81 araxis.priority=-2
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
82 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
83 araxis.premerge=False
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
84 araxis.checkconflict=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
85 araxis.binary=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
86 araxis.gui=True