Mercurial > dotfiles
annotate unixSoft/hgrc-opendiff @ 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 | a5ec16bba8a9 |
children |
rev | line source |
---|---|
261
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 # This is broken into its own file on account of not being able to |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 # properly make opendiff-w bail when opendiff is unavailable. |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
3 [merge-tools] |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
4 filemerge.priority = 100 |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 filemerge.executable = opendiff-w |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
6 filemerge.args = $local $other -ancestor $base -merge $output |