Commits

Kevin Berridge  committed e86988a

finally checking this stuff in

  • Participants

Comments (0)

Files changed (5)

+; System-wide Mercurial config file.
+
+[alias]
+nudge = push -b .
+pushnb = push --new-branch
+; short log
+slog = log --style=/projects/hg-prefs/map-cmdline.slog
+; short log w/ dates
+dlog = log --style=/projects/hg-prefs/map-cmdline.dlog
+; includes hg st like file listing
+stlog = log --style=/projects/hg-prefs/map-cmdline.stlog
+sglog = glog --style=/projects/hg-prefs/map-cmdline.sglog
+show = log --color=always -pr
+
+[ui]
+; editor used to enter commit logs, etc.  Most any text editor
+; will suffice.
+editor = vim
+
+; In order to push/pull over ssh you must specify a ssh tool
+ssh = "C:\Program Files\TortoiseHg\TortoisePlink.exe" -ssh -2
+merge = kdiff3
+username = Kevin Berridge <kberridge@pointeblank.net>
+
+[merge-tools]
+kdiff3.priority=-1
+kdiff3.args=-L1 base --L2 local --L3 other $base $local $other -o $output
+kdiff3.regkey=Software\KDiff3
+kdiff3.regappend=\kdiff3.exe
+kdiff3.fixeol=True
+kdiff3.gui=True
+beyondcompare3.priority=-2
+beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
+beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
+beyondcompare3.regname=ExePath
+beyondcompare3.gui=True
+diffmerge.priority=-7
+diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
+diffmerge.checkchanged=True
+diffmerge.gui=True
+p4merge.priority=-8
+p4merge.args=$base $local $other $output
+p4merge.regkey=Software\Perforce\Environment
+p4merge.regname=P4INSTROOT
+p4merge.regappend=\p4merge.exe
+p4merge.gui=True
+tortoisemerge.priority=-9
+tortoisemerge.args=/base:$output /mine:$local /theirs:$other /merged:$output
+tortoisemerge.regkey=Software\TortoiseSVN
+tortoisemerge.gui=True
+winmergeu.regkey=Software\Thingamahoochie\WinMerge\
+winmergeu.regname=Executable
+winmergeu.priority=-10
+winmergeu.args=/e /ub /dl other /dr local $other $local $output
+winmergeu.fixeol=True
+winmergeu.gui=True
+
+;
+; For more information about mercurial extensions, start here
+; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
+;
+
+[extensions]
+prj = C:\projects\hgprjext\prj.py
+color =
+convert =
+extdiff =
+fetch = 
+graphlog = 
+mq =
+churn = 
+hgk = 
+patchbomb = 
+rebase = 
+record = 
+progress =
+; extensions shipped with Mercurial by default
+;
+;acl =
+;alias =
+;bookmarks =
+;bugzilla =
+;children =
+; Warning: the color extension is not recommended for Windows
+;gpg =
+;hgcia =
+;hgk =
+;highlight = 
+;interhg =
+;keyword =
+;notify =
+;pager =
+;parentrevspec =
+;patchbomb =
+;purge =
+;win32mbcs =
+;win32text =
+;zeroconf =
+;
+; extra extensions provided by TortoiseHg
+;
+;qct =
+;forest =
+
+; To use cleverencode/cleverdecode, you must enable win32text extension
+;
+; By default, we try to encode and decode all files that do not
+; contain ASCII NUL characters.  What this means is that we try to set
+; line endings to Windows style on update, and to Unix style on
+; commit.  This lets us cooperate with Linux and Unix users, so
+; everybody sees files with their native line endings.
+
+[encode]
+; Encode files that don't contain NUL characters.
+
+; ** = cleverencode:
+
+; Alternatively, you can explicitly specify each file extension that
+; you want encoded (any you omit will be left untouched), like this:
+
+; *.txt = dumbencode:
+
+
+[decode]
+; Decode files that don't contain NUL characters.
+
+; ** = cleverdecode:
+
+; Alternatively, you can explicitly specify each file extension that
+; you want decoded (any you omit will be left untouched), like this:
+
+; **.txt = dumbdecode:
+
+
+;
+; Define external diff commands
+;
+[extdiff]
+cmd.vdiff = C:\Program Files\TortoiseHg\kdiff3
+;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
+;cmd.vimdiff = gvim.exe
+;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
+
+[qct]
+;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details
+;path="C:\Program Files\qct\qct.exe"
+
+[hgk]
+;See http://bitbucket.org/tortoisehg/stable/wiki/FAQ for details
+;path=C:\Program Files\TortoiseHg\scripts\hgk.cmd
+;vdiff=vdiff
+ 
+;
+; The git extended diff format will properly store binary files,
+; file permission changes, and rename information that the normal
+; patch format cannot cover.  However it is also not 100% compatible
+; with tools which expect normal patches. so enable these at your
+; own risk.
+;
+[diff]
+;git = false
+;nodates = false
+
+;
+; Some optional defaults
+;
+[defaults]
+;view = --limit 100
+;log = --limit 100
+;revert = --no-backup
+;log = --style=changelog
+
+;
+; Keyword extension example configuration.  To use, one must
+; enable the keyword extension, then uncomment and modify these
+; two sections.  Before using the keyword extension, be sure to
+; thoroughly read it's documentation and understand how it works,
+; and why it is not a core feature of Mercurial.
+;
+; http://www.selenic.com/mercurial/wiki/index.cgi/KeywordExtension
+; http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan
+;
+; If you encounter strange problems using Mercurial, a good first
+; debugging step would be to disable this extension.
+;
+[keyword]
+; expand keywords in all python files in working dir
+;**.py =
+
+[keywordmaps]
+; See documentation for examples
+
+
+[tortoisehg]
+vdiff = kdiff3
+
+[color]
+mode = win32

File map-cmdline.dlog

+changeset = '{rev}{branches} {desc|firstline|strip} (on {date|shortdate} by {author|person})\n'
+
+changeset_quiet = '{rev}\n'
+
+changeset_verbose = '{rev}:{node|short}{branches} {desc|firstline|strip} (on {date|shortdate} by {author|person}){bookmarks}{tags}\n'
+
+start_branches = ' '
+branch = '{branch}'
+
+start_tags = ' '
+tag = '{tag}, '
+last_tag = '{tag}'
+
+start_bookmarks = ' '
+bookmark = '[{bookmark}] '
+last_bookmark = '[{bookmark}]'

File map-cmdline.sglog

+changeset = '{rev} {desc|firstline|strip}{branches}{bookmarks}{tags}\n\n'
+
+changeset_verbose = '{rev}:{node|short} {desc|firstline|strip}{branches}{bookmarks}{tags}\n({date|age} by {author|person})\n\n'
+
+start_branches = ' '
+branch = '{branch}'
+
+start_bookmarks = ' '
+bookmark = '[{bookmark}] '
+last_bookmark = '[{bookmark}]'
+
+start_tags = ' '
+tag = '{tag}, '
+last_tag = '{tag}'

File map-cmdline.slog

+changeset = '{rev}{branches} {desc|firstline|strip} ({date|age} by {author|person}){bookmarks}{tags}\n'
+
+changeset_quiet = '{rev}\n'
+
+changeset_verbose = '{rev}: {node|short} {branches} {desc|firstline|strip} ({date|age} by {author|person}){bookmarks} {tags}\n'
+
+start_branches = ' '
+branch = '{branch}'
+
+start_bookmarks = ' '
+bookmark = '{bookmark}, '
+last_bookmark = '{bookmark}'
+
+start_tags = ' '
+tag = '{tag}, '
+last_tag = '{tag}'

File map-cmdline.stlog

+changeset = 'changeset: {rev}:{node|short}{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+
+changeset_verbose = 'changeset: {rev}:{node|short}{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+
+start_file_adds = ''
+file_add = 'A {file_add}\n'
+end_file_adds = ''
+
+start_file_dels = ''
+file_del = 'R {file_del}\n'
+end_file_dels = ''
+
+start_file_mods = ''
+file_mod = 'M {file_mod}\n'
+end_file_mods = ''
+
+start_branches = ' '
+branch = '{branch}'
+
+start_bookmarks = ' '
+bookmark = '[{bookmark}] '
+last_bookmark = '[{bookmark}]'
+
+start_tags = ' '
+tag = '{tag}, '
+last_tag = '{tag}'