Skip to content

Commit

Permalink
Rerun ./mach bootstrap
Browse files Browse the repository at this point in the history
Note that mach installed hg 4.7.1 to /usr/local via pip too.
  • Loading branch information
strugee committed Sep 7, 2018
1 parent dae4779 commit d95aca4
Showing 1 changed file with 16 additions and 10 deletions.
26 changes: 16 additions & 10 deletions .hgrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
username = AJ Jordan <[email protected]>
interface = curses
editor = emacsclient -nw --alternate-editor nano
tweakdefaults = true
[diff]
git = 1
showfunc = 1
unified = 8
[extensions]
progress =
color =
rebase =
histedit =
strip =
Expand All @@ -18,26 +18,32 @@ bzpost = ~/.mozbuild/version-control-tools/hgext/bzpost
firefoxtree = ~/.mozbuild/version-control-tools/hgext/firefoxtree
bundleclone = ~/.mozbuild/version-control-tools/hgext/bundleclone
push-to-try = ~/.mozbuild/version-control-tools/hgext/push-to-try
pager =
blackbox =
fsmonitor =
hgext.bookmarks =
hgext.bookmarks =
hggit =
evolve = /home/user/.mozbuild/evolve/hgext3rd/evolve
[bugzilla]
username = [email protected]
[pager]
pager = LESS=FRSXQ less
attend-help = true
attend-incoming = true
attend-outgoing = true
attend-status = true
attend-wip = true
[hostsecurity]
bitbucket.org:fingerprints = sha256:4e:65:3e:76:0f:81:59:85:5b:50:06:0c:c2:4d:3c:56:53:8b:83:3e:9b:fa:55:26:98:9a:ca:e2:25:03:92:47
bugzilla.mozilla.org:fingerprints = sha256:10:95:a8:c1:e1:c3:18:fa:e4:95:40:99:11:07:6d:e3:79:ab:e5:b0:29:50:ff:40:e8:e8:63:c4:fd:f3:9f:cb
[alias]
wip = log --graph --rev=wip --template=wip
[revsetalias]
wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed() and not (fxheads() - date(-90))
wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or orphan()^) and not closed() and not (fxheads() - date(-90))
[templates]
wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)}{label("changeset.{phase}", ":")}{label("changeset.{phase}", short(node))} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))}{label("log.tag", if(fxheads," {fxheads}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset("."), "desc.here"),desc|firstline)}'
wip = '{label("wip.branch", if(branches,"{branches} "))}{label(ifeq(graphnode,"x","wip.obsolete","wip.{phase}"),"{rev}:{node|short}")}{label("wip.user", " {author|user}")}{label("wip.tags", if(tags," {tags}"))}{label("wip.tags", if(fxheads," {fxheads}"))}{if(bookmarks," ")}{label("wip.bookmarks", if(bookmarks,bookmarks))}{label(ifcontains(rev, revset("parents()"), "wip.here"), " {desc|firstline}")}'
[color]
wip.bookmarks = yellow underline
wip.branch = yellow
wip.draft = green
wip.here = red
wip.obsolete = none
wip.public = blue
wip.tags = yellow
wip.user = magenta
[experimental]
graphshorten = true

0 comments on commit d95aca4

Please sign in to comment.