288:fa2ce712a8b0
Anton Shestakov <av6@dwimlabs.net>, Mon, 16 Sep 2024 00:48:36 +0400
.hgrc: dp1 and dp2 aliases to diff for sanity-checks of merges An extra alias "d" is needed to make sure `hg d` still works after we add other commands starting with "d". `--from` and `--to` are hg 5.7+, they provide clearer UI, but you can still use `hg diff -r foo -r bar`.
previous change 284:49dd141d1cd2

.hgrc

Permissions: -rw-r--r--

File Latest Revisions Annotate Diff Comparison
Other formats:
JSON Raw
Feeds:
Atom RSS 
[ui]
username = Anton Shestakov <av6@dwimlabs.net>
ssh = ssh -C
editor = ~/.hgeditor
ignore = ~/.hgignore
mergemarkers = detailed
tweakdefaults = true
[phases]
publish = false
[diff]
git = true
showfunc = true
word-diff = true
merge = true
[extensions]
rebase =
shelve =
histedit =
strip =
beautifygraph =
absorb =
[alias]
gl = log --pager=always -G
pvr = log --pager=always -pvr
stripout = strip -r 'outgoing()'
crecord = !$HG commit --interactive --config ui.interface=curses "$@"
reword = commit -X 're:' --amend
actualize-topic = rebase -s 'topic($1)' -d 'branch(last(::topic($1) and public()))'
. = pvr .
in-release = log -r '$1 + min($1:: and tag())'
d = diff
dp1 = diff --from 'p1($1)' --to '$1'
dp2 = diff --from 'p2($1)' --to '$1'
[experimental]
auto-publish = confirm
[progress]
format = topic bar number item speed estimate
delay = 1
[histedit]
linelen = 120
later-commits-first = true
[patchbomb]
intro = never
confirm = true
[email]
method = smtp
[smtp]
tls = true
[pager]
pager = less -FSRX --ignore-case
[color]
status.added = green
status.unknown = none
changeset.public = green
changeset.secret = red
[committemplate]
changeset = {desc}\n\n
    HG: Enter commit message.  Lines beginning with 'HG:' are removed.
    HG: {extramsg}
    HG: --
    HG: user: {author}\n{ifeq(p2rev, "-1", "",
   "HG: branch merge\n")
   }HG: branch '{branch}'\n{if(activebookmark,
   "HG: bookmark '{activebookmark}'\n")   }{subrepos %
   "HG: subrepo {subrepo}\n"              }{file_adds %
   "HG: added {file}\n"                   }{file_mods %
   "HG: changed {file}\n"                 }{file_dels %
   "HG: removed {file}\n"                 }{if(files, "",
   "HG: no files changed\n")
   }HG: --- 8< ---
   {splitlines(diff()) % 'HG: {line}\n'}