images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-15 08:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,797 Commits 9 Branches 38 Tags 6.7 MiB
9b466e3963
Commit Graph

796 Commits

Author SHA1 Message Date
DRSDavidSoft
271fe4c822 ⬆️ Update dependencies (git-for-windows v2.39.0.windows.1, clink v1.4.3, clink-completions v0.4.2) 2022-12-13 13:41:54 +00:00
Chris Antos
0fdcda98cf Fix https://github.com/cmderdev/cmder/issues/2789 
Holding ^C made git.exe hang while cmd.exe (Clink) updated the prompt.

The prompt script had three problems:

1.  It invoked `git config` every time a prompt was displayed, to
    figure out where to skip invoking `git status`.  But it even did
    that if the current directory wasn't part of a git repo.
2.  It invoked `git config` two times for every single prompt, to
    attempt to improve performance if the user disables `git status`
    coloring.  But two times for every single prompt is expensive, so
    it has the opposite effect in the general case, and noticeably
    degrades performance.
3.  It invoked `git config` using a blocking call, instead of using the
    async prompt support in Clink.  That significantly reduced the
    benefit of having used async prompt filtering for `git status`.

Now the `git config` invocations use async prompt filtering, which lets
the prompt display instantaneously.  It also now uses a timer to avoid
invoking `git config` repeatedly when new prompts show up in rapid
succession.

Also, the `cmderGitStatusOptIn` variable is no longer leaked into the
Lua global namespace.

These changes resolve the issue: holding ^C is very fast and no longer
causes git.exe to hang.
 2022-12-05 13:52:14 -08:00
Dax T. Games
42df6cd05b fix git bash GIT_INSTALL_ROOT 2022-11-19 02:32:02 +00:00
DRSDavidSoft
0adbc47c7e ⬆️ Update dependencies (clink v1.4.0) 2022-11-07 13:54:22 +00:00
David Refoua
ba97011bbc changes to letter casing in variable 2022-11-06 23:19:01 +03:30
David Refoua
048692b5b5 describe color codes in order 2022-11-06 11:50:22 +03:30
David Refoua
7c74931af8 revert a letter case 2022-11-06 11:47:23 +03:30
David Refoua
e3d9f81e25 add prompt for vanilla cmd.exe when clink not present 2022-11-06 11:37:58 +03:30
David Refoua
7c309c6a7b add link to documentation in comment 2022-11-06 11:36:03 +03:30
David Refoua
0c1ab3fbb1 powershell: fixes for first time launch 2022-11-06 11:34:27 +03:30
David Refoua
fc44def0ad make powershell scripts consistent 2022-11-06 11:32:22 +03:30
David Refoua
4e1918dcf7 formatting 2022-11-04 12:58:24 +03:30
David Refoua
dcc06a9d70 add excd (#1051) 2022-11-02 19:15:58 +03:30
github-actions[bot]
3214a6d5ea
⬆️ Update dependencies (clink v1.3.51) (#2776) 
Co-authored-by: DRSDavidSoft <DRSDavidSoft@users.noreply.github.com>
 2022-11-01 10:31:34 +00:00
DRSDavidSoft
c8d48b7f3e ⬆️ Update dependencies (clink v1.3.50) 2022-10-26 13:56:46 +00:00
David Refoua
a2a996147e adjust root path 2022-10-25 18:42:30 +03:30
David Refoua
c0fc10009a use colons for batch labels 2022-10-25 00:13:21 +03:30
David Refoua
cc5e4a0e60 fix a misspelling 2022-10-24 21:20:52 +03:30
David Refoua
6e0e1729d8 use a variable to keep DRY 2022-10-24 21:01:55 +03:30
David Refoua
0b7e47cdc2 add new alias for file listing 2022-10-24 20:38:09 +03:30
David Refoua
96ca7cea4a enhance cmder prompt 2022-10-24 19:58:46 +03:30
DRSDavidSoft
e320ba8aae ⬆️ Update dependencies (clink v1.3.49) 2022-10-23 15:06:50 +00:00
DRSDavidSoft
c606e5c8ee Update vendored dependencies (git-for-windows v2.38.1.windows.1, clink v1.3.48) 2022-10-20 13:58:38 +00:00
David Refoua
98d28846b3
Git-bash use conemu-msys2-64 connector (#2765) 2022-10-19 22:41:19 +03:30
David Refoua
27f28e6ed7 fix double escaped percent 2022-10-19 10:21:56 +03:30
David Refoua
8b6d1d8a6f alternative where filter instead of relying on find.exe 2022-10-19 00:33:10 +03:30
eval Nya
211fbd6428
Sync Git-bash start argument from ConEmu to use conemu-msys2-64 connector 
use conemu-msys2-64 connector would help to solve some display problems under Git Bash like character/cursor drifting, `tmux` display wrong, and so on. As the default profile is hardcoded and ConEmu upstream has solved it by using msys-connector, please add it.
 2022-10-19 02:32:17 +08:00
David Refoua
a0f234b9d0 check for clink existence 2022-10-18 16:22:05 +03:30
David Refoua
5cdb98abb7 add escape code color 2022-10-18 16:20:30 +03:30
David Refoua
9399cbdcd7 detect if clink initialization failed 2022-10-18 16:11:54 +03:30
David Refoua
971483b2b7 use consistent indentation in init.bat 2022-10-18 15:20:35 +03:30
DRSDavidSoft
85051f0cb2 Update vendored dependencies (git-for-windows v2.38.0.windows.1, clink v1.3.47, conemu-maximus5 v22.08.07) 2022-10-17 20:24:26 +00:00
David Refoua
5b46f4fec7
use default bg color instead of black for default configuration 2022-10-16 01:20:06 +03:30
David Refoua
b0f034a960
use correct background colors (SGR49) instead of black (SGR40) - fixes #2560 
the default value of SGR 49 works best with both ConEmu and Windows Terminal, and both values don't take an effect on Cmder.
(ref: https://github.com/cmderdev/cmder/wiki/Seamless-Windows-Terminal-Integration)
 2022-10-16 01:10:20 +03:30
David Refoua
70632a2bb8
add pwsh alias to quickly launch powershell with cmder profile 2022-10-16 00:57:47 +03:30
David Refoua
9d76f99dcf
closes #2756 2022-10-16 00:44:58 +03:30
David Refoua
8d4afb0570
fix problem with #2756 2022-10-16 00:02:38 +03:30
David Refoua
7856b3ab57 minor space corrections 2022-10-15 12:58:22 +03:30
David Refoua
abbab3f8b4 trim trailing spaces 2022-10-15 12:46:13 +03:30
David Refoua
9aa26c46d0
remove additional spaces 2022-10-15 12:38:25 +03:30
David Refoua
7f682653e4
consistency with powershell conventions; 
* use "PS" instead of no-width "$([char]0x200B)" character in prompt (credit @skycommand)

* fixes additional space after the lambada and before the path

* display "PS" before path to distinguish between PowerShell and CMD
 2022-10-15 12:32:52 +03:30
David Refoua
c9ba643851
remove invalid symlink 2022-10-15 00:29:55 +03:30
David Refoua
05c92f4cb0
Rename cmder_shell. to cmder_shell.cmd 2022-09-10 01:10:17 +04:30
David Refoua
15d66d394a
add cmder_shell.cmd 2022-09-10 00:00:24 +04:30
Dax T. Games
e2d817a497 Add set to fix error 2022-09-09 09:11:45 -04:00
David Refoua
d1b1012741
minimal comspec detection (fixes #2744) 2022-09-09 17:24:25 +04:30
Dax T Games
5c409dabc8
Merge pull request #2739 from DRSDavidSoft/patch-4 
Update Clink, Clink Completions and ConEmu dependencies
 2022-09-08 22:32:21 -04:00
Dax T Games
05db3658ad
Merge pull request #2738 from DRSDavidSoft/patch-3 
Related to #2654: Move space from "{git}{hg}{svn}" to individual parts
 2022-09-08 22:31:55 -04:00
Dax T Games
ef0de62d82
Merge pull request #2742 from daxgames/better_bat 
Better bat
 2022-09-04 09:25:03 -04:00
Dax T. Games
59bbdaddc7 Cleanup 2022-09-04 09:16:39 -04:00
Dax T. Games
7a9ad78e66 Fix #2740 2022-09-01 13:00:43 +00:00
David Refoua
ec371bafff
Update Clink, Clink Completions and ConEmu dependencies 2022-08-30 22:10:12 +04:30
David Refoua
a617397aea
move space from "{git}{hg}{svn}" to individual parts 2022-08-30 21:59:09 +04:30
Dax T. Games
dceccffb72 Merge branch 'master' into CH 2022-07-15 10:06:59 -04:00
Dax T. Games
0a4d3bcb77 update Clink and Git 2022-07-15 10:04:30 -04:00
Michael Roy
70b5822fd5
Enable asynchronous clink prompt update for svn status 
If enabled in the cmder prompt config, use clink asynchronous update of the prompt for svn status (similar to git)
 2022-05-25 15:34:22 +02:00
Michael Roy
f184714457
Add new cmder config value 
Add new setting value prompt_overrideSvnStatusOptIn to cmder_prompt_config.lua.default to control of asynchronous svn status update should be used with clink
 2022-05-25 15:28:29 +02:00
goodusername123
62bfbb4501
Update Git for Windows to 2.36.0 2022-04-25 16:49:28 -05:00
goodusername123
8bf40227e8
Update Clink to 1.3.16 2022-04-25 16:47:34 -05:00
Dax T. Games
427937918e update Clink to 1.3.15 2022-04-16 13:41:01 -04:00
Dax T. Games
fe29497878 update Clink to 1.3.14 2022-04-16 13:36:24 -04:00
Dax T. Games
ef51ed2be2 Merge branch 'fix_find_git' of https://github.com/daxgames/cmder into fix_find_git 2022-04-16 11:35:41 -04:00
Dax T. Games
6d313853f3 only look at \cmd\git.exe for found git 2022-04-16 11:35:19 -04:00
Dax T Games
f46e8b81d8
Merge branch 'master' into fix_find_git 2022-04-16 11:18:38 -04:00
Dax T. Games
ce02fb4a0e fix find latest git 2022-04-16 10:51:26 -04:00
Dax T Games
e345f187d8
Remove set term=cygwin in init.bat (#2688) 2022-04-16 15:01:17 +01:00
dgames
6189f4f0e6 fix prompt branch for git worktree 2022-03-17 07:57:48 -04:00
Dax T Games
0616ff0a82
Merge pull request #2660 from vsajip/fix-2659 
Fix #2659: Use get_hg_branch() to get Mercurial branch information.
 2022-02-03 17:48:26 -05:00
Edouard Coissy
4098265a36 Fix #2654: blank space added between {cwd} and version_control variable 2022-02-02 14:13:51 +01:00
Vinay Sajip
eab4454ac5 Fix #2659: Use get_hg_branch() to get Mercurial branch information. 2022-01-29 14:48:58 +00:00
dgames
7cc1c77225 do not display message when alterring git path 2022-01-15 16:02:14 -05:00
dgames
f0c4e85ac8 yellow to white 2022-01-15 15:14:24 -05:00
dgames
357e51acd1 spelling fixes 2022-01-15 11:00:58 -05:00
dgames
f39aade500 Update to Git 2.34.0and Clink 1.2.46 2021-11-21 13:50:54 -05:00
dgames
004535e0bc remove -all 2021-11-21 13:40:53 -05:00
dgames
6ae2f97f52 add quotes 2021-11-21 13:32:57 -05:00
dgames
0326f2e3a8 Merge branch 'master' of https://github.com/cmderdev/cmder into conemu-up 2021-11-21 13:24:56 -05: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
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
dgames
0637d6b3e9 Merge branch 'master' into conemu-up 2021-11-07 17:54:54 -05:00
dgames
f24266014f update clink and git 2021-11-07 13:03:44 -05:00
dgames
c27cedc9b3 quote PATH settings 2021-11-07 10:54:33 -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
dgames
c75c02c9ce update Clink and Conemu versions 2021-10-20 21:10:38 -04: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
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
dgames
b885b4e235 Clink 1.2.26 2021-08-13 21:36:58 -04:00
dgames
f717f5031b update clink to 1.2.24 2021-08-07 03:30:40 -04:00
dgames
710cc3ecc3 update clink to 1.2.24 2021-08-07 03:27:13 -04:00
dgames
0fc6b6571e update clink to 1.2.24 2021-08-07 03:25:34 -04:00
dgames
48f50568b0 update conemu and clink 2021-07-23 23:09:24 -04: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
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
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
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
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
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
Dax T. Games
11fb1b3a50 do not rely on config\cmder_prompt_config.lua 2021-05-02 20:56:02 -04:00
Dax T. Games
810a3da955 upgrade to clink 1.2.5 2021-05-02 20:54:52 -04:00
Abhishek Aryan
e8df3ef247
Refactor the env substution logic 
And some prompt cleanup
 2021-05-02 21:53:22 +03:00
Dax T Games
8d6ce3e4ac
Merge pull request #2523 from daxgames/prompt_config 
Prompt config
 2021-04-15 08:27:05 -04:00
Dax T. Games
9793ca1ed9 update git for windows 2021-04-15 08:17:07 -04:00
Dax T. Games
d9b2c729f9 replace :: with rem 2021-04-15 07:54:39 -04:00
Dax T. Games
e0cb86d738 parametrized status colors 2021-04-11 18:42:43 -04:00
Dax T. Games
0ef76ee2d3 add configurable prompt 2021-04-11 18:28:43 -04:00
Dax T Games
8a2ace9fc2
Merge pull request #2522 from vladimir-kotikov/patch-6 
Bump clink-completions version
 2021-04-09 07:40:25 -04:00
Vladimir Kotikov
ad755dc7f9
Bump clink-completions version 2021-04-09 10:46:27 +03:00
Dax T. Games
6027ac31c4 set global cmderGitStatusOptIn var for use in clink-completions 2021-04-07 22:30:53 -04:00
Dax T Games
c34eb73555
Merge pull request #2452 from daxgames/1.3.18 
1.3.18
 2021-03-26 05:45:35 -04:00
dgames
0fd2d9c8a8 CHANGELOG.md 2021-03-25 19:14:18 -04:00
dgames
0a7f1623f7 fix path length check with fast_init set 2021-02-28 23:09:49 -05:00
dgames
d02be816e2 fix failure in lib_path if path is too long 2021-02-28 21:54:06 -05:00
dgames
8452f33407 changelog.md 2021-02-25 14:38:05 -05:00
Dax T Games
a66b8b3035
Merge pull request #2458 from FTOH/patch-1 
Fix: Incomplete operation when closing bash.exe
 2021-02-09 09:07:15 -05:00
兮陌
cc1d459ea9
Fix some commands like ls' are not available 2021-02-08 23:23:30 +08:00
FTOH
633d673bd7 Fix escaping double quotes 2021-01-17 22:13:01 +07:00
Stephen Solis
10d63daf90
Fix enhance_path call if no usr\bin in %GIT_INSTALL_ROOT% 2021-01-16 23:34:22 +01:00
dgames
6c15598010 update to Clink 1.1.20 2021-01-12 09:01:39 -05:00
Anton Makarenko
3608b5bc81
Added quotes as in previous commits 2021-01-11 15:03:52 +07:00
Anton Makarenko
2d75a635de
Fix: Incomplete operation when closing bash.exe 2021-01-11 14:22:54 +07:00
dgames
9cf3ba222e remove clink defaults 2021-01-09 09:43:37 -05:00
dgames
01d300f779 cleanup 2020-12-24 18:43:23 -05:00
dgames
ba1027f6d5 cleanup 2020-12-24 18:34:27 -05:00
dgames
b5d172cd32 cleanup 2020-12-24 18:33:10 -05:00
dgames
f362ba8dba spacing 2020-12-24 17:55:56 -05:00
dgames
783cf68d10 CLink migration and clenaup 2020-12-24 17:48:00 -05:00
dgames
c4fb7e6034 Merge branch 'master' of https://github.com/cmderdev/cmder into 1.3.17_fixes 2020-12-24 12:15:08 -05:00
dgames
da0af1d96b 1.3.17 Fixes for clink settings and history 2020-12-24 12:14:46 -05:00
dgames
24cad3ed5c fix 'alias ..=cd ..' removing 2 char aliases 2020-12-23 07:30:47 -05:00