Commit Graph

1310 Commits

Author SHA1 Message Date
Ikko Ashimine
8ea4bbb11c
Fix typo in README.md
enviroment -> environment
2021-11-30 20:34:31 +09:00
Dax T Games
9f065a63e8
Ps1 git discovery (#2438)
* Fix start errors in path with ()

* Fix start errors in path with ()

* Fix start errors in path with ()

* Fix start errors in path with ()

* remove quotes from debug_output messages

* remove quotes from debug_output messages

* remove quotes from debug_output messages

* discovery newer git version

* new git path config for powershell

* xxx

* add isGitShim

* fix no git found in path

* debug

* revert not ps1 changes

* cleanup

* final

* spacing

* fixes

* cleanup

* cleanup

* timer for Powershell

* fixes

* fixes for git path settings

* grab vendor/bin/alias.cmd from master

Co-authored-by: Dax T. Games <dtgaes@kinggeek.org>
Co-authored-by: dgames <dgames@dtg.local>
2021-11-16 14:22:17 +00:00
Dax T Games
b6316eb447
Merge pull request #2624 from cmderdev/revert-2618-master
Revert "Fix a problem with an ampersand character in path"
2021-11-11 07:35:34 -05:00
Dax T Games
59dfa9c46f
Revert "Fix a problem with an ampersand character in path" 2021-11-11 07:35:04 -05:00
Dax T Games
a4cb56b083
Merge pull request #2618 from xpam-net/master
Fix a problem with an ampersand character in path
2021-11-11 07:17:33 -05:00
Dax T Games
ad6979d25f
Merge pull request #2621 from chehrlic/clink_git_speedup
Speed up git status / conflict status by calling git only once.
2021-11-10 05:55:04 -05:00
Christian Ehrlicher
addcefdd47 Speed up git status / conflict status by calling git only once. 2021-11-08 17:43:46 +01:00
Dax T Games
f72c285d8b
Merge pull request #2609 from Lunchb0ne/env-fix-again
Fix no env in the prompt string
2021-11-07 14:41:53 -05:00
Andrey Luzhin
4c85e8b2f1
Fix a problem with an ampersand character in path
If the path variable contained values with an ampersand character (such as in the case of MySQL), the string splits by this character, and tries to execute what follows as a separate command. 
All occurrences of the set command containing %PATH% should be wrapped in quotation marks
2021-10-29 09:13:35 +02:00
Abhishek Aryan
9de284123c
Fix the env not showing
Turns out the `{env}` part was missing from the prompt constructor
2021-09-25 16:32:52 +03:00
Dax T Games
93715461e6
Merge pull request #2606 from daxgames/cmder_diag
Cmder diag - Save output to a file.
2021-09-17 12:35:24 -04:00
Dax T. Games
fc6cf025be save cmder_diag.* output to a file 2021-09-17 12:28:49 -04:00
Dax T. Games
f809af1eec save cmder_diag.* output to a file 2021-09-17 12:22:25 -04:00
Dax T Games
5b071d8d59
Merge pull request #2591 from koaleksa/fix-posh-git-1.0.0
Fix Posh-Git 1.0.0 import and console.
2021-09-10 12:28:33 -04:00
Aleksandar Kocic
6d1e2d6e8b Fix Posh-Git 1.0.0 import and console. 2021-08-31 08:40:46 +02:00
Dax T Games
2ef8c967d2
update conemu and clink (#2575)
* update conemu and clink

* update clink to 1.2.24

* update clink to 1.2.24

* update clink to 1.2.24

* Clink 1.2.26

Co-authored-by: dgames <dgames@dtg.local>
2021-08-19 16:47:47 +01:00
Benjamin Staneck
b8760e4d04
Merge pull request #2556 from chrisant996/clink-async-prompt 2021-07-18 09:58:41 +02:00
Rémi Benoit
ae7209f254 Update clink to 1.2.22 2021-07-18 09:57:12 +02:00
Rémi Benoit
9d4da63184 Update clink to 1.2.20 2021-07-18 09:57:12 +02:00
Dax T Games
62a6311b6d
Merge pull request #2549 from ian-craig/status-branchonly
Show branch name when cmder.status=false without expensive status ops
2021-07-17 14:10:21 -04:00
Abhishek Aryan
b40510f3a0
Merge branch 'master' into env-fix-again 2021-06-27 17:51:04 +03:00
Chris Antos
e7a6e64473 Rewrote how prompt_overrideGitStatusOptIn works.
It was less clear before, and it also accidentally took effect when
the `prompt.async` Clink setting was off.
2021-06-12 18:56:37 -07:00
Chris Antos
f6c2657b23 Allow scripts to disable part of the Cmder prompt.
The Cmder prompt normally includes version control info, which involves
running some potentially expensive commands.  The cmder-powerline-prompt
project (and maybe other projects) replaces the Cmder prompt and runs
the same potentially expensive commands -- so expensive commands get run
twice!

This change makes it possible for the user and/or other scripts to
disable the version control part of the built-in Cmder prompt.

https://github.com/chrisant996/cmder-powerline-prompt
2021-06-11 01:01:35 -07:00
Chris Antos
91aabe75af Add prompt config variable for async git prompt.
Setting `prompt_overrideGitStatusOptIn = true` will override the
`cmder.status` and `cmder.cmdstatus` git config settings and run the git
prompt status commands in the background.  But it only takes effect when
using Clink v1.2.10, since that's required in order to run prompt update
commands in the background.
2021-06-10 18:49:39 -07:00
Dax T Games
946f929eaf
Merge pull request #2559 from daxgames/docs
Docs
2021-06-10 20:25:52 -04:00
dgames
8a870c093a Merge branch 'master' into docs 2021-06-10 20:23:39 -04:00
dgames
bfe526604d revert 2021-06-10 20:21:43 -04:00
dgames
79e505acf8 Merge branch 'master' of https://github.com/cmderdev/cmder 2021-06-10 20:20:22 -04:00
dgames
9a2e22cb6d Merge branch 'master' of https://github.com/cmderdev/cmder into docs 2021-06-10 20:14:56 -04:00
dgames
b2add2b966 prompt config docs 2021-06-10 20:12:47 -04:00
Ian Craig
74202a8719
Merge pull request #1 from daxgames/status-branchonly-dax
Status branchonly dax
2021-06-05 14:26:34 -07:00
Chris Antos
5305ebd4a6 Use Clink async prompt filtering for git.
`git status` and `git diff` can be slow in large repos.  Clink v1.2.10
and higher support using Lua coroutines to do expensive parts of prompt
filtering in the background.  When the expensive parts complete, the
prompt gets refreshed.

This means even large repos can have fast prompts PLUS git status all
the time!

This change should be backward/forward compatible with both older and
newer versions of Clink (of course only newer versions will gain the
benefit).
2021-05-31 21:29:19 -07:00
Chris Antos
4e22ad93f4
Merge pull request #2 from daxgames/status-branchonly-dax
Status branchonly dax
2021-05-31 20:40:41 -07:00
Chris Antos
6730f864b1
Merge pull request #1 from ian-craig/status-branchonly
Status branchonly
2021-05-31 20:38:23 -07:00
dgames
56b04fc9ce fix unknown color and code dedup 2021-05-31 10:53:18 -04:00
dgames
55ff611095 fix default unknown color 2021-05-30 08:56:44 -04:00
dgames
aebe37bd28 fix default unknown color 2021-05-30 08:56:05 -04:00
dgames
413fb2f1ac remove xxx 2021-05-30 08:46:37 -04:00
dgames
73ad62eaa2 add xxx 2021-05-30 08:46:08 -04:00
dgames
4fab4cc6e4 make unknown color white for all shells 2021-05-30 08:41:40 -04:00
dgames
a41fad80d5 Merge branch 'status-branchonly' into status-branchonly-dax 2021-05-30 07:56:01 -04:00
dgames
c9acb13d0b Fix cmder no status prompt 2021-05-30 07:50:48 -04:00
dgames
03d0f913ea fixing branch only 2021-05-30 07:27:16 -04:00
Ian Craig
a5c98d4fe9 Add simple branch name gen for sh and ps1 2021-05-25 21:03:28 -07:00
Ian Craig
9df8f1a92a Revert to boolean, keep branch name when status=false 2021-05-25 17:53:41 -07:00
Ian Craig
c262934822 Add branchonly option to cmdstatus 2021-05-20 17:53:05 -07:00
Abhishek Aryan
f1665ddd7d
Fix no env in the prompt string
Yeah, I was surprised too..
2021-05-10 18:47:17 +03:00
Dax T Games
36f4ce0e3c
Merge pull request #2538 from daxgames/fix_configurable_prompt
Fix configurable prompt
2021-05-02 22:47:11 -04:00
Dax T. Games
59941f5dfa cleanup 2021-05-02 21:05:58 -04:00
Dax T. Games
6d79ed5eb2 Merge branch 'master' of https://github.com/cmderdev/cmder into fix_configurable_prompt 2021-05-02 21:04:23 -04:00