upstream/mercurial-mirror Files · mercurial/default.d/mergetools.rc

cmdutil: add class to restore dirstate during unexpected failure...

cmdutil: add class to restore dirstate during unexpected failure Before this patch, after "dirstate.write()" execution, there was no way to restore dirstate to the original status before "dirstate.write()". In some code paths, "dirstate.invalidate()" is used as a kind of "restore .hg/dirstate to the original status", but it just avoids writing changes in memory out, and doesn't actually restore the ".hg/dirstate" file. To fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hooks), "dirstate.write()" should be invoked before invocation of external processes. But at the same time, ".hg/dirstate" should be restored to its content before "dirstate.write()" during an unexpected failure in some cases. This patch adds the class "dirstateguard" to easily restore ".hg/dirstate" during unexpected failures. Typical usecase of it is: # (1) build dirstate up .... # (2) write dirstate out, and backup ".hg/dirstate" dsguard = dirstateguard(repo, 'scopename') try: # (3) execute somethig to do: # this may imply making some additional changes on dirstate .... # (4) unlink backed-up dirstate file at the end of dsguard scope dsguard.close() finally: # (5) if execution is aborted before "dsguard.close()", # ".hg/dirstate" is restored from the backup dsguard.release() For this kind of issue, an "extending transaction" approach (in https://titanpad.com/mercurial32-sprint) seems to not be suitable, because: - transaction nesting occurs in some cases (e.g. "shelve => rebase"), and - "dirstate" may be already modified since the beginning of OUTER transaction scope, then - dirstate should be backed up into the file other than "dirstate.journal" at the beginning of INNER transaction scope, but - such alternative backup files are useless for transaction itself, and increases complication of its implementation "transaction" and "dirstateguard" differ from each other also in "what it should do for .hg/dirstate" in cases other than success. ============== ======= ======== ============= type success fail "hg rollback" ============== ======= ======== ============= transaction keep keep restore dirstateguard keep restore (not implied) ============== ======= ======== ============= Some collaboration between transaction and dirstate will probably be introduced in the future. But this layer is needed in all cases.

Mads Kiilerich - - Load All Authors

File last commit:

r24179:14d647d2 default


                r24991:4169a4f8

default

Download file

             mergetools.rc
        
                    142 lines
            
             | 5.6 KiB
            
                | text/x-stsrc
            
             |
                TextLexer

/ mercurial / default.d / mergetools.rc

History | Source | Raw |Copy content |Copy permalink

Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143	# Some default global settings for common merge tools

		[merge-tools]
		kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
		kdiff3.regkey=Software\KDiff3
		kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
		kdiff3.regappend=\kdiff3.exe
		kdiff3.fixeol=True
		kdiff3.gui=True
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		gvimdiff.args=--nofork -d -g -O $local $other $base
		gvimdiff.regkey=Software\Vim\GVim
		gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
		gvimdiff.regname=path
		gvimdiff.priority=-9
		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.check=changed
		vimdiff.priority=-10

		merge.check=conflicts
		merge.priority=-100

		gpyfm.gui=True

		meld.gui=True
		meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
		meld.check=changed
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		tkdiff.args=$local $other -a $base -o $output
		tkdiff.gui=True
		tkdiff.priority=-8
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		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
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
		diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
		diffmerge.regname=Location
		diffmerge.priority=-7
		diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
		diffmerge.check=changed
		diffmerge.gui=True
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		p4merge.args=$base $local $other $output
		p4merge.regkey=Software\Perforce\Environment
		p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
		p4merge.regname=P4INSTROOT
		p4merge.regappend=\p4merge.exe
		p4merge.gui=True
		p4merge.priority=-8
		p4merge.diffargs=$parent $child

		p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
		p4mergeosx.args = $base $local $other $output
		p4mergeosx.gui = True
		p4mergeosx.priority=-8
		p4mergeosx.diffargs=$parent $child

		tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
		tortoisemerge.regkey=Software\TortoiseSVN
		tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
		tortoisemerge.check=changed
		tortoisemerge.gui=True
		tortoisemerge.priority=-8
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
		ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
		ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
		ecmerge.gui=True
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		# editmerge is a small script shipped in contrib.
		# It needs this config otherwise it behaves the same as internal:local
		editmerge.args=$output
		editmerge.check=changed
		editmerge.premerge=keep

		filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
		filemerge.args=-left $other -right $local -ancestor $base -merge $output
		filemerge.gui=True

		; Windows version of Beyond Compare
		beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
		beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
		beyondcompare3.regname=ExePath
		beyondcompare3.gui=True
		beyondcompare3.priority=-2
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		; 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.gui=True
		bcompare.priority=-1
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
Mads Kiilerich merge-tools: configuration for Beyond Compare on OS X...	r24179	; OS X version of Beyond Compare
		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.gui=True
		bcomposx.priority=-1
		bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child

Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143	winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
		winmerge.regkey=Software\Thingamahoochie\WinMerge
		winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
		winmerge.regname=Executable
		winmerge.check=changed
		winmerge.gui=True
		winmerge.priority=-10
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		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.checkconflict=True
		araxis.binary=True
		araxis.gui=True
Mads Kiilerich mergetools: drop incorrect quoting of diffargs variables...	r23968	araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
Mads Kiilerich config: move mergetools configuration from contrib to default configuration...	r23143
		diffuse.priority=-3
		diffuse.args=$local $base $other
		diffuse.gui=True
		diffuse.diffargs=$parent $child

		UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
		UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
		UltraCompare.args = $base $local $other -title1 base -title3 other
		UltraCompare.priority = -2
		UltraCompare.gui = True
		UltraCompare.binary = True
		UltraCompare.check = conflicts,changed
		UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages