Mercurial > dotfiles
changeset 468:bec91aeefddc
hg: switch from out-of-tree remotebranches to in-tree remotenames
I've finally got the functionality I need in core!
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 04 Oct 2018 22:32:53 -0400 (2018-10-05) |
parents | e1ce8897030d |
children | 838039231429 |
files | .hgrc |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgrc +++ b/.hgrc @@ -18,7 +18,7 @@ hgext.schemes= hgext.shelve= show= hgext.transplant= -hg_remotebranches= +remotenames= [alias] ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")' @@ -89,7 +89,7 @@ sl. = log -Gr 'smart and ::.' -Tsl sl_branch = '{ifeq(branch,"default","","{label(black_background, branch)} ")}' sl_node = '{label("log.changeset changeset.{phase}", shortest(node))}{if(ellipsis, "...")}' sl_user = '{label("grep.user", author|user)}' -sl_tags = '{label("tags.normal", if(tags," {tags}"))}' +sl_tags = '{label("tags.normal", if(tags," {tags}"))} {label("tags.normal", if(remotenames, " {remotenames}"))}' sl_book = '{label("sl.book", if(bookmarks," {bookmarks}"))}' sl_topic = '{label("sl.topic", if(topics," {topics}"))}' sl_desc = '{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}' @@ -105,7 +105,8 @@ changeset.secret = red desc.here = inverse [revsetalias] -canmutate = not (public() or upstream()) +upstream = ::remotenames() +canmutate = not (public() or upstream) - obsolete() smart = ((parents(canmutate) or canmutate or (head() - closed())) and (not obsolete() or orphan()^)) or . %include .private/hgrc