Mercurial > dotfiles
view unixSoft/bin/havepatch @ 377:117e3c11d953
zprofile: introduce zprofile use
El Capitan (OS X 10.11) introduces a system-level /etc/zprofile which
uses a path_helper thing to mangle $PATH. Unfortunately, the way
path_helper works, it forces /usr/local/bin and /usr/bin to the
*start* of the PATH variable, which means that any PATH mutations I
want have to run after /etc/zprofile calls path_helper. As such, move
my path insertions into .zprofile{,-machine} rather than
.zshenv{,-machine} so that I can still ensure my path entries are at
the start of PATH rather than the end. This works because:
> Commands are then read from $ZDOTDIR/.zshenv. If the shell is a
> login shell, commands are read from /etc/zprofile and then
> $ZDOTDIR/.zprofile. Then, if the shell is interactive, commands
> are read from /etc/zshrc and then $ZDOTDIR/.zshrc. Finally, if the
> shell is a login shell, /etc/zlogin and $ZDOTDIR/.zlogin are read.
This means that non-login shells no longer pick up my custom PATH
entries, but as I only use OS X as a desktop OS that seems like a
workable tradeoff for now.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sun, 31 Jan 2016 20:46:29 -0500 |
parents | ce87db9038f5 |
children | d81eb79e4f4c |
line wrap: on
line source
#!/usr/bin/env python """Detect if a patch is already applied in a Mercurial repository.""" import sys import subprocess import os import re from mercurial import util def main(argv): os.chdir(util.expandpath('~/Programming/hg/crew')) os.environ['EDITOR'] = 'true' pp = subprocess.Popen(['patchpipe'], stdin=sys.stdin, stdout=subprocess.PIPE) patchdata = pp.stdout.read() summary = (l for l in patchdata.splitlines() if not l.startswith('#')).next() # First pass: look for exact summary matches after tag 3.5 ret = subprocess.call(['hg', 'log', '-r', '(not ::3.5) and grep(%r)' % summary]) if ret != 0: # Failing that, look for obsmarkers that might be relevant. If # we could actually do something like 'hg log -r # successors($NODE)', that'd be preferable to even the # summary-matching from above. print 'no exact match in hg log, checking obsmarkers' nodematch = re.search('# Node ID ([0-9a-f]{40})', patchdata) if nodematch: os.system('hg debugobsolete | grep %s' % nodematch.group(1)) sys.exit(ret) if __name__ == '__main__': main(sys.argv)