Snippets

Craig Phillips Standard Mercurial Config / ini file

Updated by Craig Phillips

File mercurial.ini Modified

  • Ignore whitespace
  • Hide word diff
 editor="C:\Program Files (x86)\Notepad++\notepad++.exe" -multiInst -nosession
 
 [merge-tools]
-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
+beyondcompare4.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
+beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4
+beyondcompare4.regname=ExePath
+beyondcompare4.gui=True
+beyondcompare4.priority=-2
 
 [extdiff]
-cmd.vdiff=C:\Program Files (x86)\Beyond Compare 3\BCompare.exe
+cmd.vdiff=C:\Program Files\Beyond Compare 4\BCompare.exe
 opts.vdiff=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
 
 [auth]
Updated by Craig Phillips

File mercurial.ini Modified

  • Ignore whitespace
  • Hide word diff
 shelve=
 purge=
 churn=
+rebase=
 
 [alias]
 whoami = showconfig ui.username
 logg = log --graph
 loggc = log --graph --style compact
 s = !hg sum && hg status
+blame = annotate --user --changeset --line-number --date -q
Created by Craig Phillips

File mercurial.ini Added

  • Ignore whitespace
  • Hide word diff
+[ui]
+username = Your Name <andemail@address.here>
+ignore = D:\Documents\hgignore_global.txt
+ssh = "C:\Utils\putty\plink.exe" -ssh -2 -batch -C
+editor="C:\Program Files (x86)\Notepad++\notepad++.exe" -multiInst -nosession
+
+[merge-tools]
+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
+
+[extdiff]
+cmd.vdiff=C:\Program Files (x86)\Beyond Compare 3\BCompare.exe
+opts.vdiff=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
+
+[auth]
+repo.prefix = https://server/repo_path
+repo.username = username
+repo.password = password
+
+[extensions]
+eol=
+color=
+strip=
+shelve=
+purge=
+churn=
+
+[alias]
+whoami = showconfig ui.username
+undo = revert --all --no-backup
+br = branch
+brs = branches
+cb = commit --close-branch
+lg = log --template "{label('yellow',node|short)} {label('red', branch)} {label('cyan', tags)} {desc} [{date|date} by {label('green',author)}]\n"
+logg = log --graph
+loggc = log --graph --style compact
+s = !hg sum && hg status