Mercurial > dotfiles
view dot_hgrc @ 1072:240d435b7443
feat: remove "current" keyword from stack state when the change is orphaned
author | Zeger Van de Vannet <zeger@vandevan.net> |
---|---|
date | Mon, 10 Feb 2025 17:55:14 +0100 |
parents | b2854e8f8d5d |
children | 714124edd757 |
line wrap: on
line source
%include ~/.config/mercurial/local.hgrc [ui] # We recommend enabling tweakdefaults to get slight improvements to # the UI over time. Make sure to set HGPLAIN in the environment when # writing scripts! tweakdefaults = yes # Dump merge conflict markers in files in 3-way format merge = internal:merge3 # Global ignore file ignore = ~/.hgignore # Show copies in status statuscopies = yes # Disable rollback rollback = no # Use curses interface for rebase, histedit interface = curses # Use helix as editor editor = hx [merge-tools] meld.disabled = yes vimdiff.disabled = yes [extensions] histedit = rebase = topic = evolve = absorb = largefiles = # Store http(s) passwords in a keyring # Configure schemes via: # [auth] # schemename.prefix = https://example.com # schemename.username = jdoe mercurial_keyring = [commands] # Require to pass an explicit revision when pushing push.require-revs = yes # Show paths relative to cwd status.relative = yes # Determines what level of checking 'hg resolve --mark' will perform resolve.mark-check = abort # "noconflict" will allow any update which would not trigger a merge update.check = noconflict [paths] # Always push current revision unless specified default:pushrev = . [experimental] topic-mode = random evolution = all auto-publish = warn [phases] publish = false [alias] st = status -mard stat = status -mard blame = annotate -cufld fs = diff -c . --stat [diff] git = yes nodates = no showfunc = 1 word-diff = 1 [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(topic, "HG: topic: '{topic}'\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 ------------------------ HG: Do not touch the line above. HG: Everything below will be removed. {diff()} changeset.commit.normal.normal = {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(topic, "HG: topic: '{topic}'\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 ------------------------ HG: Do not touch the line above. HG: Everything below will be removed. {diff()} [templatealias] commitinfo = '{date|shortdate} {pad(label("grep.user", author|person), 25, left=True, truncate=True)} {desc|strip|firstline}' stack_state = '{ifcontains("current", state, ifeq(state, "current", state, sub("current ", "", state)), state)}' [templates] oneline_stack = '{pad("{label("stack.index", "s{stack_index}")}{label("stack.state.{state}", symbol)}", 5, left=True)} {label("stack.state.{state}", pad(stack_state, 8))} {label("stack.state.{state}", node|short)} {commitinfo}\n' oneline = '{ifcontains(graphnode, "x*", graphnode, ' ')} {label("changeset.{phase}", node|short)} {pad(label("log.branch", fqbn), 30, truncate=True)} {pad(commitinfo, termwidth - 50, truncate=True)}\n' [color] mode=auto log.branch=cyan log.bookmark=green log.topic=yellow log.tag=green log.activebookmark = green bold underline changeset.public=green changeset.secret=blue bold changeset.draft=red desc.here=green_background black stack.state = red [alias] stack = stack --color=always --template=oneline_stack node = parent --template '{node}' ls = log --template=oneline --limit=50 --pager=auto status = status -mard st = status -mard stat = status -mard incoming = incoming --template=oneline in = incoming --template=oneline outgoing = outgoing --template=oneline out = outgoing --template=oneline mark = resolve --mark [rhg] on-unsupported = fallback fallback-executable = /usr/bin/hg allowed-extensions = rebase, absorb, evolve, topic