This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2012

merge: use operation-provided labels (ex: dest/source) in several merge-tools
ClosedPublic

Authored by spectral on Feb 2 2018, 5:10 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGa9802c9ecfb5: merge: use operation-provided labels (ex: dest/source) in several merge-tools
Summary

Tools that did not use labels already, used only one, or used some label other
than the exact strings of "local" or "other" were unmodified. Cases that used
the label "base" were modified as well, if they were otherwise changed in this
CL; "merged" was *not* changed.

There are other possible changes we might want to make, but I didn't:

  • bcompare (linux and osx) uses the labels "parent1" and "parent2" instead of "local" and "other", so it was left alone, even though beyondcompare3 (windows) *was* changed.
  • araxis used the labels "Other", "Base", and "Local :$local", so it was also left alone.
  • UltraCompare didn't provide a label for 'local', just for 'base' and 'other', so it was left alone.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

spectral created this revision.Feb 2 2018, 5:10 PM
yuja accepted this revision.Feb 3 2018, 9:36 PM
This revision is now accepted and ready to land.Feb 3 2018, 9:36 PM
Closed by commit rHGa9802c9ecfb5: merge: use operation-provided labels (ex: dest/source) in several merge-tools (authored by spectral). · Explain WhyFeb 3 2018, 9:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/default.d/mergetools.rc (14 lines)

Diff 5166

mercurial/default.d/mergetools.rc

# Some default global settings for common merge tools # Some default global settings for common merge tools
[merge-tools] [merge-tools]
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.args=--auto --L1 $labelbase --L2 $labellocal --L3 $labelother $base $local $other -o $output
kdiff3.regkey=Software\KDiff3 kdiff3.regkey=Software\KDiff3
kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
kdiff3.regappend=\kdiff3.exe kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True kdiff3.fixeol=True
kdiff3.gui=True kdiff3.gui=True
kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
gvimdiff.args=--nofork -d -g -O $local $other $base gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim gvimdiff.regkey=Software\Vim\GVim
gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
gvimdiff.regname=path gvimdiff.regname=path
gvimdiff.priority=-9 gvimdiff.priority=-9
gvimdiff.diffargs=--nofork -d -g -O $parent $child gvimdiff.diffargs=--nofork -d -g -O $parent $child
vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
vimdiff.check=changed vimdiff.check=changed
vimdiff.priority=-10 vimdiff.priority=-10
merge.check=conflicts merge.check=conflicts
merge.priority=-100 merge.priority=-100
gpyfm.gui=True gpyfm.gui=True
meld.gui=True meld.gui=True
meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output
meld.check=changed meld.check=changed
meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
tkdiff.args=$local $other -a $base -o $output tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True tkdiff.gui=True
tkdiff.priority=-8 tkdiff.priority=-8
tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 $labellocal --title2 $labelbase --title3 $labelother --merged-filename $output --merge $local $base $other
xxdiff.gui=True xxdiff.gui=True
xxdiff.priority=-8 xxdiff.priority=-8
xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
diffmerge.regname=Location diffmerge.regname=Location
diffmerge.priority=-7 diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
diffmerge.check=changed diffmerge.check=changed
diffmerge.gui=True diffmerge.gui=True
diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
p4merge.args=$base $local $other $output p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment p4merge.regkey=Software\Perforce\Environment
p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
p4merge.regname=P4INSTROOT p4merge.regname=P4INSTROOT
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
tortoisemerge.regkey=Software\TortoiseSVN tortoisemerge.regkey=Software\TortoiseSVN
tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
tortoisemerge.check=changed tortoisemerge.check=changed
tortoisemerge.gui=True tortoisemerge.gui=True
tortoisemerge.priority=-8 tortoisemerge.priority=-8
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output ecmerge.args=$base $local $other --mode=merge3 --title0=$labelbase --title1=$labellocal --title2=$labelother --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True ecmerge.gui=True
ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
# editmerge is a small script shipped in contrib. # editmerge is a small script shipped in contrib.
# It needs this config otherwise it behaves the same as internal:local # It needs this config otherwise it behaves the same as internal:local
editmerge.args=$output editmerge.args=$output
editmerge.check=changed editmerge.check=changed
editmerge.premerge=keep editmerge.premerge=keep
filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.args=-left $other -right $local -ancestor $base -merge $output
filemerge.gui=True filemerge.gui=True
filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
filemergexcode.args=-left $other -right $local -ancestor $base -merge $output filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
filemergexcode.gui=True filemergexcode.gui=True
; Windows version of Beyond Compare ; Windows version of Beyond Compare
beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath beyondcompare3.regname=ExePath
beyondcompare3.gui=True beyondcompare3.gui=True
beyondcompare3.priority=-2 beyondcompare3.priority=-2
beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
; Linux version of Beyond Compare ; 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.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcompare.gui=True bcompare.gui=True
bcompare.priority=-1 bcompare.priority=-1
bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
; OS X version of Beyond Compare ; OS X version of Beyond Compare
bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp
bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcomposx.gui=True bcomposx.gui=True
bcomposx.priority=-1 bcomposx.priority=-1
bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output winmerge.args=/e /x /wl /ub /dl $labelother /dr $labellocal $other $local $output
winmerge.regkey=Software\Thingamahoochie\WinMerge winmerge.regkey=Software\Thingamahoochie\WinMerge
winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
winmerge.regname=Executable winmerge.regname=Executable
winmerge.check=changed winmerge.check=changed
winmerge.gui=True winmerge.gui=True
winmerge.priority=-10 winmerge.priority=-10
winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child