%include /google/src/head/depot/google3/experimental/fig_contrib/hgshort/hgshort.hgrc [ui] editor = nvim paginate = never merge = vimdiff username = Christian Nieves # graphnodetemplate = {label("graphnode.{graphnode}", graphnode)} [extdiff] cmd.meld = /usr/bin/meld cmd.pmeld = /usr/bin/meld [extensions] unsupported.tree = unsupported.alices = extdiff = color = beautifygraph = [alices] findings.extra_args = --proxy summarize.extra_args = --proxy [merge-tools] # meld.args = --auto-merge --label='incoming' $local --label='merged' $base --label='existing' $other -o $output # https://www.mercurial-scm.org/wiki/MergingWithVim#More_Useful_3-Way_Diff vimdiff.executable = vimdiff vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write" vimdiff.premerge = keep [committemplate] changeset = {desc}\n\n HG: {extramsg} HG: user: {author}\n{ifeq(p2rev, "-1", "", "HG: branch merge\n") }HG: branch '{branch}'\n{if(currentbookmark, "HG: bookmark '{currentbookmark}'\n") }{subrepos % "HG: subrepo {subrepo}\n" } {splitlines(diff()) % 'HG: {line}\n'} [alias] whatsout = status -n --change . --template=hgshort_status what = status -n --change . --template=hgshort_status whatsoutall = status --rev p4base --no-status --template=hgshort_status # unbranch = cp --forget --at-rev . $1 unbranch = !$HG uncommit --keep $1 && $HG forget $1 && $HG add $1 && $HG amend $1 [trainingwheels] warn-head-paths=False