Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							7221fb8a32 
							
						 
					 
					
						
						
							
							Fix "expected a combining operator" regression.  
						
						... 
						
						
						
						See #10  
						
					 
					
						2015-10-14 08:23:34 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							bbb6a4645b 
							
						 
					 
					
						
						
							
							Cleanup: a couple superfluous setting.  
						
						
						
					 
					
						2015-10-13 21:15:59 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							336f1f1ce8 
							
						 
					 
					
						
						
							
							Cleanup: use named args for all sorts of current_dir  
						
						
						
					 
					
						2015-10-13 20:40:44 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							160bc9683e 
							
						 
					 
					
						
						
							
							Add $theme_avoid_ambiguous_glyphs  
						
						... 
						
						
						
						Allow users to avoid ambiguous width glyphs to prevent issues with guessing the width of multibyte characters.
For now, this just avoids `…`. We'll add some more if we run into them.
Fixes  #10  
						
					 
					
						2015-10-13 20:34:35 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							e71317aa19 
							
						 
					 
					
						
						
							
							Use a compact path in the title.  
						
						... 
						
						
						
						See #11  
						
					 
					
						2015-10-13 14:20:29 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							13c35f3424 
							
						 
					 
					
						
						
							
							Allow disabling the title segments.  
						
						... 
						
						
						
						set -g theme_title_display_process yes
    set -g theme_title_display_path no
See #11  
						
					 
					
						2015-10-13 14:19:57 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							00f5578311 
							
						 
					 
					
						
						
							
							Allow overriding the right prompt date format.  
						
						... 
						
						
						
						set -g theme_date_format "+%a %H:%M"
… or something like that :)
See #11  
						
					 
					
						2015-10-13 14:18:48 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9dc24eec 
							
						 
					 
					
						
						
							
							Just a bit more Markdown cleanup  
						
						
						
					 
					
						2015-07-19 16:30:24 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							f7e5fd37ac 
							
						 
					 
					
						
						
							
							Revert "Tweak branch glyph alignment."  
						
						... 
						
						
						
						This reverts commit fc54dbc986 
						
					 
					
						2015-07-19 16:26:59 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							fc54dbc986 
							
						 
					 
					
						
						
							
							Tweak branch glyph alignment.  
						
						
						
					 
					
						2015-07-19 16:25:56 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							a195c0dea1 
							
						 
					 
					
						
						
							
							Clean up glyphs in README a bit, fix branch glyph.  
						
						
						
					 
					
						2015-07-19 16:24:10 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							da9bf50279 
							
						 
					 
					
						
						
							
							Add note about VIRTUAL_ENV_DISABLE_PROMPT  
						
						... 
						
						
						
						Fixes  #5  
					
						2015-07-19 16:13:15 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							2c915008cd 
							
						 
					 
					
						
						
							
							Merge pull request  #3  from tchajed/fix-ahead-behind  
						
						... 
						
						
						
						Fix ahead printing when both ahead and behind 
						
					 
					
						2015-06-26 10:41:09 -07:00 
						 
				 
			
				
					
						
							
							
								Tej Chajed 
							
						 
					 
					
						
						
						
						
							
						
						
							489a2eee3d 
							
						 
					 
					
						
						
							
							Fix ahead printing when both ahead and behind  
						
						... 
						
						
						
						Specifically, the awk parsing bails out early if we're ahead, even
though there may be later behind commits, resulting in a status of just
"+" when "±" would be correct. 
						
					 
					
						2015-06-26 11:01:02 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9467fbff 
							
						 
					 
					
						
						
							
							We do it again, but this time with the right override value  
						
						
						
					 
					
						2015-06-24 15:02:40 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							54aad12a34 
							
						 
					 
					
						
						
							
							Update README with new theme options.  
						
						
						
					 
					
						2015-06-24 14:57:07 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							cd15f6551c 
							
						 
					 
					
						
						
							
							Refactor "git ahead" logic:  
						
						... 
						
						
						
						* Revert removal of the less-verbose style
 * Extract logic into a helper function
 * Add a flag for enabling verbose style
 * Remove a pile of unnecessary local variables
 * Code style fixes 
						
					 
					
						2015-06-24 14:51:44 -07:00 
						 
				 
			
				
					
						
							
							
								Johannes Schneider 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e0d3abcaed 
							
						 
					 
					
						
						
							
							removed echo  
						
						
						
					 
					
						2015-06-17 15:30:57 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Schneider 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0d1f7868cd 
							
						 
					 
					
						
						
							
							improved ahead/behind showing  
						
						
						
					 
					
						2015-06-17 12:54:02 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							b48def9c2e 
							
						 
					 
					
						
						
							
							Update README with badges and installation instructions.  
						
						
						
					 
					
						2015-05-31 15:15:43 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							a18c9ab0fa 
							
						 
					 
					
						
						
							
							[bobthefish] allow git untracked files override  
						
						... 
						
						
						
						Showing untracked files can be (very) slow on large NFS mounts. Allow the user to disable the '...' output when there are untracked files, either globally via fish config:
    set -g theme_display_git_untracked no
 or locally via git repo config:
    git config bash.showUntrackedFiles false
Fixes  #434  
						
					 
					
						2015-04-24 10:59:50 -07:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							d45898d4f0 
							
						 
					 
					
						
						
							
							Fix extraneous output from type on some fishes.  
						
						
						
					 
					
						2015-04-23 10:31:52 -07:00 
						 
				 
			
				
					
						
							
							
								Liang Bo Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ce8ec8f220 
							
						 
					 
					
						
						
							
							Fix python version detection in theme bobthefish  
						
						... 
						
						
						
						Relax the python version matching, so `python` that symlinks to
either major versions (e.g. 2, 3) or minor versions (e.g. 2.7, 3.4)
can be properly detected.
Note that currently both pypy and pypy3 have same display glyph. 
						
					 
					
						2015-02-22 18:17:33 +08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							a08626d43f 
							
						 
					 
					
						
						
							
							Fix for bobthefish ruby version segment  
						
						... 
						
						
						
						… when there's no version to show.
Fixes  #370  
						
					 
					
						2015-02-10 14:02:06 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							1144f1771e 
							
						 
					 
					
						
						
							
							[bobthefish] Add config options to readme.  
						
						
						
					 
					
						2014-11-28 19:41:55 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							e766f6c003 
							
						 
					 
					
						
						
							
							[bobthefish] Default hg segment to off  
						
						... 
						
						
						
						… due to performance concerns.
See #258 
See #262  
						
					 
					
						2014-11-28 19:41:55 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2532b752 
							
						 
					 
					
						
						
							
							[bobthefish] One more hg speedup.  
						
						... 
						
						
						
						Send along the directory where we already found the .hg to throw hg a bone. 
						
					 
					
						2014-11-28 19:41:55 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							e17a6871b4 
							
						 
					 
					
						
						
							
							[bobthefish] One more cleanup.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							c8853f6f61 
							
						 
					 
					
						
						
							
							[bobthefish] Default display configs to yes  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Roman Inflianskas 
							
						 
					 
					
						
						
						
						
							
						
						
							81f2cce0fb 
							
						 
					 
					
						
						
							
							bobthefish: allow user disable segments  
						
						... 
						
						
						
						Conflicts:
	themes/bobthefish/fish_prompt.fish 
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							f108e89f1a 
							
						 
					 
					
						
						
							
							[bobthefish] Use @rominf's recursive hg to find hg root.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Roman Inflianskas 
							
						 
					 
					
						
						
						
						
							
						
						
							94f04d7260 
							
						 
					 
					
						
						
							
							bobthefish: hg: faster checking for hg repo (fix)  
						
						... 
						
						
						
						Conflicts:
	themes/bobthefish/fish_prompt.fish 
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							1c38607b13 
							
						 
					 
					
						
						
							
							[bobthefish] Use brackets instead of test.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							08f8217cbe 
							
						 
					 
					
						
						
							
							[bobthefish] always use command hg  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							264b7cea78 
							
						 
					 
					
						
						
							
							[bobthefish] Use consistent sed delimiters.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							1818ce9922 
							
						 
					 
					
						
						
							
							[bobthefish] Standardize stderr redirects.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							3bdbfe8ee9 
							
						 
					 
					
						
						
							
							[bobthefish] much cleaner git "ahead" flag.  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							5ab89f663c 
							
						 
					 
					
						
						
							
							[bobthefish] Add support for rbenv and RVM  
						
						
						
					 
					
						2014-11-28 19:41:54 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							52e7b2bae7 
							
						 
					 
					
						
						
							
							[bobthefish] Simplify bold segments.  
						
						... 
						
						
						
						Add support for --bold (and --underline) to the __bobthefish_start_segment function. 
						
					 
					
						2014-11-28 19:41:53 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							abed16f3aa 
							
						 
					 
					
						
						
							
							[bobthefish] Better (faster, stronger) SCM segments  
						
						... 
						
						
						
						* Show the closest parent repo if $PWD is in both an hg and git repo.
 * Only find the repo root once per SCM, not two or three times :) 
						
					 
					
						2014-11-28 19:41:53 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							623d162f2b 
							
						 
					 
					
						
						
							
							[bobthefish] More virtualenv tweaks  
						
						... 
						
						
						
						* Inline a one-line method that's called one place
 * Make sure __bobthecow_virtualenv_python_version doesn't fail if python isn't a symlink.
 * Add a visual segment indicator after python version glyph. 
						
					 
					
						2014-11-28 19:41:53 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac71fb43f 
							
						 
					 
					
						
						
							
							[bobthefish] Update virtualenv segment colors…  
						
						... 
						
						
						
						remove some additional unnecessary complication. 
						
					 
					
						2014-11-28 19:41:53 +11:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							ea5640886b 
							
						 
					 
					
						
						
							
							No need to save $RETVAL, $status works just fine  
						
						
						
					 
					
						2014-11-20 14:02:02 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							986f0e1ea1 
							
						 
					 
					
						
						
							
							[bobthefish] Mention hg in README :)  
						
						
						
					 
					
						2014-11-20 14:02:02 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							e5a6915b4e 
							
						 
					 
					
						
						
							
							[bobthefish] More consistent project dir func names  
						
						
						
					 
					
						2014-11-20 14:02:02 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							7eaf74fa83 
							
						 
					 
					
						
						
							
							[bobthefish] DRY: we don't need two pwd-relative-to-project funcs  
						
						
						
					 
					
						2014-11-20 14:02:02 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							28609a1f76 
							
						 
					 
					
						
						
							
							[bobthefish] Switch git/hg priority in prompt  
						
						... 
						
						
						
						Add TODO to do this right :P 
						
					 
					
						2014-11-20 14:02:01 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							c1531ecfea 
							
						 
					 
					
						
						
							
							[bobthefish] Add ☿ (mercury) glyph to hg prompt  
						
						... 
						
						
						
						This makes it easier (possible?) to distinguish between hg and git repos at a glance. 
						
					 
					
						2014-11-20 14:01:21 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							5867fde992 
							
						 
					 
					
						
						
							
							[bobthefish] Don't break when hg/git not found  
						
						
						
					 
					
						2014-11-20 14:01:21 -08:00 
						 
				 
			
				
					
						
							
							
								Justin Hileman 
							
						 
					 
					
						
						
						
						
							
						
						
							510fffbd49 
							
						 
					 
					
						
						
							
							[bobthefish] Use hg root instead of hg stat for in_hg  
						
						
						
					 
					
						2014-11-20 14:01:21 -08:00