Commit Graph

654 Commits

Author SHA1 Message Date
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
Dax T Games
e0b8ebc669
Clink fork fixes (#2441)
* debug

* remove debug

* Switch to chrisant996 Clink 1.1.8

* Update to Clink 1.1 10

* CHANGELOG.md

Co-authored-by: dgames <dgames@dtg.local>
2020-12-21 21:30:30 +00:00
Vladimir Kotikov
00b22ea79a
Update clink-completions to 0.3.6 (#2440)
https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.6
2020-12-17 10:26:59 +00:00
Dax T Games
9088a5e2e6
Merge pull request #2430 from qfp64/faster-init
Improve init speed
2020-12-11 05:48:07 -05:00
Dax T Games
25bc575e8a
Merge pull request #2390 from daxgames/sysinfo
add systeminfo.exe output to cmder_diag.*
2020-12-11 05:42:22 -05:00
Kyle McInnes
11a78a8d64 Fix errors 2020-12-10 13:35:40 +00:00
Kyle McInnes
2a9a4d2860 Speed up calls to lib_console 2020-12-07 19:41:11 +00:00
Florian Schwalm
2205461943
Update git for windows to 2.29.1 (#2410) 2020-10-27 17:31:19 +00:00
Dax T. Games
467b4d4ad9 hide possible file write conflict 2020-09-13 08:27:10 -04:00
Dax T. Games
ea6e18c834 hide possible file write confilct 2020-09-13 08:02:46 -04:00
Dax T. Games
4378741aad add systeminfo.exe output 2020-09-12 06:10:41 -04:00
Dax T. Games
d1adf16fa8 'fixes' 2020-08-24 20:27:56 -04:00
Dax T. Games
cda883bc39 add setlocal 2020-08-23 08:47:20 -04:00
Dax T. Games
b1ef763922 add setlocal 2020-08-23 08:42:58 -04:00
Dax T Games
937874f03c
Revert "Revert "Update profile.ps1"" 2020-08-13 07:29:24 -04:00
Dax T Games
829a65f552
Revert "Update profile.ps1" 2020-08-13 07:08:20 -04:00
mcnubblet
3f6aa3b348 Update profile.ps1
Set utf-8 BOM in profile.ps1 to fix incorrect prompt display in PowerShell
2020-08-13 14:05:49 +10:00
Dax T Games
4cacd2fdc8
Merge pull request #2358 from FloSchwalm/update-to-git-2.28
Update git for windows to 2.28.0
2020-07-29 20:28:25 -04:00
Dax T Games
80f76ad956
Merge pull request #2357 from FloSchwalm/fix-git-version-comparison
Fix git version comparison
2020-07-29 20:27:23 -04:00
Dax T Games
906bb5d357
Merge pull request #2339 from daxgames/fix_global_vars_vscode_err
1.3.16-pre: 1.3.15 Fixes
2020-07-29 19:33:12 -04:00
Florian Schwalm
29d784b2b1 Update git for windows to 2.28.0 2020-07-29 22:58:30 +02:00
Florian Schwalm
fc90722faa Prepend %GIT_INSTALL_ROOT%\cmd to path instead of appending it
The default setting for path enhancing is appending,
so the provided unix tools don't overwrite windows tools we may want to keep.
For Git this is undesired behavior, though, as we just compared git versions
to decide which one we want to use. The git directory thus needs to be prepended
to the path to make sure a call to git uses the version we selected.
2020-07-29 22:48:01 +02:00
Florian Schwalm
167c49ee6d Rewrite old calls to :verbose_output to working %lib_console% verbose_output 2020-07-29 22:46:35 +02:00
Florian Schwalm
0ed10e5e89 Reorder if-else-clauses in :compare_git_versions so last else block can be reached
It is hard to spot without the brackets, but the last else block - that resets %test_dir% and
logs in verbose mode that an older user git version will be ignored - can't actually be reached.
The else block is considered to belong to the if clause "if exist "%test_dir:~0,-4%\cmd\git.exe""
that will only ever be executed if ERRORLEVEL is greather than or equal to 0, thus if the test fails,
the following else if clause "else if ERRORLEVEL 0" will always succeed and the last else block will be ignored.
Using the vendored git version may still have worked because %GIT_INSTALL_ROOT% isn't set either way,
but to enable the log message I reordered if-else-clauses and brackets in the way I think the
original author intended them to work.
2020-07-29 22:39:46 +02:00
Florian Schwalm
cd50db3a7f Use ERRORLEVEL instead of %errorlevel% to compare git versions
%errorlevel% was always 0, even if the vendored git version was more current than the installed one
Usually exiting a batch script with "exit /b exitCode" as used in :compare_versions
sets %errorlevel% to the specified exit code
However, this may not work if %errorlevel% was set before with "Set errorlevel="
I didn't find the location where this might have happened,
but I saw the consequence of %errorlevel% always being 0
Thus I decided to use ERRORLEVEL instead as this will always work regardless of environment variable

For more information check https://ss64.com/nt/errorlevel.html
2020-07-29 22:25:49 +02:00
Dax T. Games
37a223b449 fix lib_path 2020-07-25 05:11:34 -04:00
Dax T Games
334838c079
Update init.bat 2020-07-24 08:34:45 -04:00
Dax T. Games
0c3d89925e 'fix 2020-07-23 13:41:10 -04:00
Dax T. Games
020661af95 Merge branch 'fix_global_vars_vscode_err' of https://github.com/daxgames/cmder into fix_global_vars_vscode_err 2020-07-23 13:39:46 -04:00
Dax T. Games
79261d4d27 fix 2020-07-23 13:36:50 -04:00
Dax T Games
7326a3cfc5
Update init.bat 2020-07-23 13:34:13 -04:00
famoses
40c58417b2
quote time measures for timer.cmd
The startup time duration is calculated wrongly ( at least for me, on Windows 1909, with CmderMini 1.3.15.1010 ). I got something like "Elapsed Time: 80:36:1.00 (290161.00s total)" printed into the cmder consle window. I can be solved by quoting the time measures taken in `init.bat`. 

It seems that `time.cmd` fails in recognizing two arguments. In fact it did split the first time measure into two arguments and ignored the second time measure.
Example: 
from the two time measures
λ echo %CMDER_INIT_START% %CMDER_INIT_END%
12:53:44,34 12:53:54,04
The call to `time.cmd` created following output (i added echo commands to print variables start and end right after they got assigned the arguments)
start: 12:53:44
end:   34
2020-07-18 13:32:22 +02:00
Dax T. Games
97a41ddd99 fix cmder_configured GTR 1 2020-07-14 22:31:57 -04:00
Dax T. Games
954937cf97 cleanup 2020-07-05 15:22:09 -04:00
Dax T. Games
2c620d1d67 cleanup 2020-07-05 15:13:23 -04:00
Dax T. Games
5e7a7029d1 make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder 2020-07-04 14:23:16 -04:00
Dax T. Games
f1c1354c00 make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder 2020-07-04 13:43:18 -04:00
Dax T Games
0f12de345b
Update init.bat 2020-07-02 07:00:25 -04:00
Dax T. Games
c332ab1a34 Fix bug introduced in 1.3.15 2020-07-01 16:24:36 -04:00
Dax T Games
4403edb110
Update init.bat 2020-07-01 08:26:44 -04:00
Dax T. Games
00bc5439fd Merge branch 'fix_git' into fix_global_vars_vscode_err 2020-06-29 07:51:31 -04:00
Dax T. Games
da5f1bc4db fix git detect 2020-06-29 07:49:22 -04:00
Dax T. Games
250ae06e7a fix vscode terminal errors when setting cmder fast_init=1 outside cmder 2020-06-26 22:27:29 -04:00