From: mhoellein <mhoellein@freenet.de>
Date: Wed, 22 May 2019 06:12:18 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=c321d71f21de82171255c568d458b899c5b3ae89;p=homeserver

committing changes in /etc after apt run

Package changes:
+mercurial 4.5.3-1ubuntu2.1 amd64
+mercurial-common 4.5.3-1ubuntu2.1 all
---

diff --git a/.etckeeper b/.etckeeper
index 68a61b1a..7354b861 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3754,6 +3754,12 @@ maybe chmod 0644 'menu-methods/menu.h'
 maybe chmod 0755 'menu-methods/openbox'
 maybe chmod 0644 'menu-methods/translate_menus'
 maybe chmod 0644 'menu/README'
+maybe chmod 0755 'mercurial'
+maybe chmod 0644 'mercurial/hgrc'
+maybe chmod 0755 'mercurial/hgrc.d'
+maybe chmod 0644 'mercurial/hgrc.d/cacerts.rc'
+maybe chmod 0644 'mercurial/hgrc.d/hgext.rc'
+maybe chmod 0644 'mercurial/hgrc.d/mergetools.rc'
 maybe chmod 0644 'mime.types'
 maybe chmod 0644 'mke2fs.conf'
 maybe chmod 0755 'modprobe.d'
diff --git a/mercurial/hgrc b/mercurial/hgrc
new file mode 100644
index 00000000..dfc34009
--- /dev/null
+++ b/mercurial/hgrc
@@ -0,0 +1,2 @@
+# system-wide mercurial configuration file
+# See hgrc(5) for more information
diff --git a/mercurial/hgrc.d/cacerts.rc b/mercurial/hgrc.d/cacerts.rc
new file mode 100644
index 00000000..35faed2c
--- /dev/null
+++ b/mercurial/hgrc.d/cacerts.rc
@@ -0,0 +1,5 @@
+[web]
+# user can disable this Debian default by overriding this option in ~/.hgrc
+# and/or using the --insecure command line switch
+cacerts = /etc/ssl/certs/ca-certificates.crt
+
diff --git a/mercurial/hgrc.d/hgext.rc b/mercurial/hgrc.d/hgext.rc
new file mode 100644
index 00000000..cf56c572
--- /dev/null
+++ b/mercurial/hgrc.d/hgext.rc
@@ -0,0 +1,125 @@
+# mercurial configuration file for bundled hg extensions
+# See hgrc(5) for more information
+
+# Extensions included in Mercurial listed in alphabetical order
+[extensions]
+
+# changeset access control
+# hgext.acl =
+
+# allow user-defined command aliases
+# hgext.alias =
+
+# provides the 'bookmarks' command
+# hgext.bookmarks =
+
+# bugzilla integration
+# requires python-mysqldb
+# hgext.bugzilla =
+
+# show the children of the given or working dir revision
+# provides the 'children' command
+# hgext.children =
+
+# graph count of revisions grouped by template
+# provides the 'churn' command
+# hgext.churn =
+
+# add color output to status, qseries, and diff-related commands
+# hgext.color =
+
+# converts a foreign SCM to a Mercurial one
+# provides the 'convert' and 'debugsvnlog' commands
+# requires:
+# - bzr to convert from Bazaar
+# - cvs to convert from CVS
+# - python-celementtree or python-elementtree to convert from Darcs
+# - git-core to convert from Git
+# - tla to convert from GNU Arch
+# - monotone to convert from Monotone
+# - python-subversion to convert from Subversion
+# hgext.convert =
+
+# external diff program support
+# hgext.extdiff =
+
+# pull and merge remote changes
+# provides the 'fetch' command
+# hgext.fetch =
+
+# GnuPG signing
+# provides the 'sign', 'sigcheck' and 'sigs' commands
+# requires gnupg
+# hgext.gpg =
+
+# show revision graphs in terminal windows
+# provides the 'glog' command
+# hgext.graphlog =
+
+# CIA notification hook
+# hgext.hgcia =
+
+# allows browsing the history of a repository in a graphical way
+# provides the 'view' command
+# requires wish
+# hgext.hgk =
+
+# syntax highlighting in hgweb
+# requires python-pygments
+# hgext.highlight =
+
+# lets you split a merge into pieces
+# provides the 'imerge' command
+# hgext.imerge =
+
+# inotify-based status acceleration for Linux systems
+# provides the 'inserve' command
+# hgext.inotify =
+
+# allows you to change changelog and summary text
+# hgext.interhg =
+
+# CVS/RCS-like keyword expansion
+# hgext.keyword =
+
+# quilt-like patch queues
+# provides the 'q*' commands
+# hgext.mq =
+
+# email notifications
+# hgext.notify =
+
+# display output using a pager
+# hgext.pager =
+
+# make it easy to refer to the parent of a revision
+# hgext.parentrevspec =
+
+# send changes as series of email patches
+# provides the 'email' command
+# hgext.patchbomb =
+
+# removes files not known to mercurial
+# provides the 'purge' command
+# hgext.purge =
+
+# moves sets of revisions to a different ancestor
+# provides the 'rebase' command
+# hgext.rebase =
+
+# interactive change selection during commit
+# provides the 'record' command
+# hgext.record =
+
+# patch transplanting tool
+# provides the 'transplant' command
+# hgext.transplant =
+
+# non-Unicode MBCS filename support
+# hgext.win32mbcs =
+
+# Unix/Mac/DOS line ending conversion utilities
+# hgext.win32text =
+
+# mDNS/DNS-SD (Zeroconf) support for 'hg serve'
+# hgext.zeroconf =
diff --git a/mercurial/hgrc.d/mergetools.rc b/mercurial/hgrc.d/mergetools.rc
new file mode 100644
index 00000000..95bb5683
--- /dev/null
+++ b/mercurial/hgrc.d/mergetools.rc
@@ -0,0 +1,146 @@
+# 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
+kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
+
+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
+meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
+
+tkdiff.args=$local $other -a $base -o $output
+tkdiff.gui=True
+tkdiff.priority=-8
+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.gui=True
+xxdiff.priority=-8
+xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
+
+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
+diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
+
+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
+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.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
+ecmerge.gui=True
+ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
+
+# 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
+
+filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
+filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
+filemergexcode.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
+beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
+
+; 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
+bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
+
+; 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
+
+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
+winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
+
+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
+araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
+
+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