images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-09-20 21:04:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
811 Commits 9 Branches 38 Tags 6.6 MiB
7294092618
Commit Graph

307 Commits

Author SHA1 Message Date
Benjamin Staneck
512787f391 ⬆️ Update ConEmu to 170622 (preview) 
Changelog: https://conemu.github.io/blog/2017/06/22/Build-170622.html
 2017-06-27 00:56:53 +02:00
Benjamin Staneck
262d92265e ⬆️ Update Git to v2.13.2.windows.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.2.windows.1
 2017-06-27 00:55:58 +02:00
Benjamin Staneck
aea1a977bf ⬆️ Update Git to v2.13.1(2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.2
 2017-06-23 18:18:21 +02:00
刘祺
a7237370e3 Compatible with Visual Studio Code (PowerShell) 2017-06-23 18:39:36 +08:00
刘祺
25005930ba Compatible with Visual Studio Code 2017-06-23 17:48:03 +08:00
Benjamin Staneck
89c014bb05 ⬆️ Update Git to v2.13.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.1
 2017-06-13 15:11:43 +02:00
Benjamin Staneck
c19237085d ⬆️ Update ConEmu to 170605 (preview) 
Changelog: https://conemu.github.io/blog/2017/06/05/Build-170605.html
 2017-06-13 15:10:55 +02:00
Benjamin Staneck
9c4e77b498 ⬆️ Update ConEmu to 170517 (preview) 
Changelog: https://conemu.github.io/blog/2017/05/17/Build-170517.html
 2017-05-19 23:20:31 +02:00
Benjamin Staneck
c2cf56cc48 ⬆️ Update Git to v2.13.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.0.windows.1
 2017-05-10 22:03:36 +02:00
Benjamin Staneck
399999d7f7 Merge pull request #1299 from alexandr-san4ez/master 
Changed the way directory is defined .git
 2017-04-07 02:42:18 +02:00
Benjamin Staneck
8eea2baaa5 Merge pull request #1331 from dancread/svn-prompt 
Adding svn support to prompt
 2017-04-07 02:40:35 +02:00
Benjamin Staneck
4d3950174f ⬆️ Update ConEmu to 170402 (preview) 
Changelog: https://conemu.github.io/blog/2017/04/02/Build-170402.html
 2017-04-07 02:38:16 +02:00
Benjamin Staneck
24a110ddb7 ⬆️ Update Git to v2.12.2(2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.2
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
1dd0e600ac ⬆️ Update ConEmu to 170326 (preview) 
Changelog: https://conemu.github.io/blog/2017/03/26/Build-170326.html
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
e49b978b9a ⬆️ Update Git to v2.12.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.1
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
9182c89a14 ⬆️ Update ConEmu to 170316 (preview) 
Changelog: https://conemu.github.io/blog/2017/03/16/Build-170316.html
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
00622254a7 ⬆️ Update Git to v2.12.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.1.windows.1
 2017-04-07 02:36:32 +02:00
dr024625
9977c0563d Adding svn support 2017-04-03 21:07:41 -05:00
Alexandr
018cc9ceda Changed the way directory is defined .git 
clink.find_dirs - do not specify the directory if there is Cyrillic in the way.
clink.is_dir - more logical and faster.
 2017-03-09 19:22:13 +03:00
Jack
ad0f8fe049 Merge pull request #1280 from bdukes/patch-1 
Allow profile.d/*.ps1 files to export [scriptblock]$prompt override all of cmders prompt
 2017-03-08 22:06:50 +00:00
Brian Dukes
7f4a4d34d6
Allow user-profile.ps1 and profile.d/*.ps1 files to override prompt 
This defines the default prompt variables ($PrePrompt, $PostPrompt,
$CmderPrompt, and $Prompt) before running the custom scripts (user-profile.ps1
and profile.d/*.ps1), and then saves those prompt values after running the
custom scripts.  This gives the custom scripts and opportunity to override the
prompt code blocks.

This now opens the possibility for profile.d/*.ps1 scripts to affect the
prompt, and also allows both user-profile.ps1 and profile.d/*.ps1 scripts to
overwrite the $Prompt script block and overwrite the prompt behavior entirely.
 2017-03-08 14:14:35 -06:00
Benjamin Staneck
963a5a8be6 ⬆️ Update Git to v2.12.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.0.windows.1
 2017-03-01 04:01:24 +01:00
Benjamin Staneck
81d83d4c6d ⬆️ Update Git to v2.11.0.3 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.11.0.windows.3
 2017-01-16 08:53:56 +01:00
Benjamin Staneck
61849dc7fd ⬆️ Update ConEmu to 161206 (stable) 
Changelog: https://conemu.github.io/blog/2016/12/06/Build-161206.html
 2016-12-08 22:53:08 +01:00
Benjamin Staneck
7447e00aec ⬆️ Update Git to v2.11.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.11.0.windows.1
 2016-12-01 21:06:29 +01:00
Benjamin Staneck
84202729fb Merge pull request #1169 from cmderdev/development 
Development
 2016-11-19 23:41:54 +01:00
Benjamin Staneck
70b0666f11 ⬆️ Update Git to v2.10.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.2.windows.1
 2016-11-19 23:40:05 +01:00
Benjamin Staneck
14f3361429 ⬆️ Update ConEmu to 161022 (stable) 
Changelog: https://conemu.github.io/blog/2016/10/22/Build-161022.html
 2016-11-19 23:39:07 +01:00
Florian Anderiasch
ba99f5b66a Fix typo in init.bat 2016-11-10 18:04:37 +01:00
Vladimir Kotikov
a0e0adae8b Bump clink-completions to 0.3.2 2016-11-07 00:56:13 +01:00
Benjamin Staneck
46d5936806 ⬆️ Update Git to v2.10.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.2.windows.1
 2016-11-04 00:27:46 +01:00
Benjamin Staneck
e6d4609bf4 ⬆️ Update ConEmu to 161022 (stable) 
Changelog: https://conemu.github.io/blog/2016/10/22/Build-161022.html
 2016-10-23 22:24:07 +02:00
Benjamin Staneck
0de26571aa ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-23 22:23:58 +02:00
Martin Kemp
5597aa6038 Merge pull request #952 from Jackbennett/custom-prompt 
Custom prompt hooks protected from later overwriting
 2016-10-19 14:08:09 +01:00
刘祺
eb73f6f772 fix error when path has a space 2016-10-11 14:41:47 +08:00
Jackbennett
db909451c9 Version Check the Posh-Git module to allow module autoloading 
Posh-Git before this release does not export `Write-VcsStatus` thus
powershell's autoloading cannot find the reqired module for the function.

note that `get-module -listAvailable` can return an array of multiple
versions.
 2016-10-10 12:01:55 +01:00
Jackbennett
b349b19869 Describe why PS functions are called by namespace 
As the prompt function is called all the time, specifically namespace the
cmldets it uses to avoid them being hijacked in the user session.
 2016-10-10 10:30:01 +01:00
Benjamin Staneck
44e0a040bd ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-05 02:16:22 +02:00
Alexandr
c8adf424e2 Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 22:59:09 +02:00
Alexandr
27c571636d Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 18:48:23 +03:00
Benjamin Staneck
d144cd0fc2 ⬆️ Update ConEmu to 160914 (stable) 
Changelog: https://conemu.github.io/blog/2016/09/14/Build-160914.html
 2016-09-17 22:49:23 +02:00
Benjamin Staneck
bb312ad74b try --no-lock-index for Git 2016-09-17 22:48:02 +02:00
Benjamin Staneck
df7beff2ef ⬆️ Update ConEmu to 160828 (stable) 
Changelog: https://conemu.github.io/blog/2016/08/28/Build-160828.html
 2016-09-03 10:52:17 +02:00
Benjamin Staneck
b7bfe72303 ⬆️ Update Git to v2.10.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.0.windows.1
 2016-09-03 10:50:34 +02:00
Benjamin Staneck
490fae770c ⬆️ Update Git to v2.9.3 (2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.9.3.windows.2
 2016-08-25 21:51:17 +02:00
Benjamin Staneck
355df7a48a Merge pull request #1078 from orionlee/fix_bash_login_when_cmder_root_has_spaces 
Fix bash login when $CMDER_ROOT has spaces
 2016-08-21 20:23:20 +02:00
orionlee
5354b5f80f Further fix bash login when ${CMDER_ROOT} has spaces. 
Inspecting the script uncovers similar problems elsewhere
not encountered in my initial testing. They are fixed accordingly.
 2016-08-20 16:01:46 -07:00
orionlee
d095d6afd6 Fix bash login when ${CMDER_ROOT} has spaces. 
E.g., if ${CMDER_ROOT} is /c/Users/Foo Bar/cmder,
the following errors will occur:
  bash: pushd: /c/Users/Foo: No such file or directory
  bash: [: /c/Users/Foo: binary operator expected
  bash: /c/Users/Foo: No such file or directory
 2016-08-20 15:56:49 -07:00
Benjamin Staneck
832c1991e4 Merge pull request #1070 from janschulz/unicode_path_prompt 
Parse the original prompt for cwd and env names
 2016-08-15 16:40:35 +02:00
Benjamin Staneck
19672aafff ⬆️ Update Git to v2.9.2 
Release notes: https://github.com/git-for-windows/git/tree/v2.9.3.windows.1
 2016-08-14 04:59:27 +02:00
Jan Schulz
6b10771312 Parse the original prompt for cwd and env names 
clink.get_cwd() is returning a string which is differently encoded than what
clink.prompt.value expects. This results in garbled path names if the path
condains non-ASCII chars. The (arguable hacky) solution is to parse the old
prompt for the current directory (which breaks if the user sets a PROMPT env var
which is incompatible to the regex used here...).

Also parse out a environment name set by systems like virtualenv or conda: this
could be done more specifically by targeting each such system and using the
usually set environment variable but this would mean that we would have to do
that for each and every such system out there and that is probably not a sane
idea...
 2016-08-09 13:45:36 +02:00
Benjamin Staneck
13fd41eb82 change how we ask hg for the status 
closes #1035
Thanks @raleighr3
 2016-07-30 00:36:32 +02:00
Benjamin Staneck
f2641e4cd2 ⬆️ Update Git to v2.9.2 2016-07-17 01:09:06 +02:00
Benjamin Staneck
4e90303511 ⬆️ Update ConEmu to 160710 (stable) 
Changelog: https://conemu.github.io/blog/2016/07/10/Build-160710.html
 2016-07-14 09:19:01 +02:00
Benjamin Staneck
393d7d19c5 ⬆️ Update clink to 0.4.8 2016-07-14 07:53:13 +02:00
Benjamin Staneck
924ab12aeb we don't need a second function for that. 2016-06-30 02:53:00 +02:00
Łukasz Papierz
9c0ad9fd81 Fix git branch name colouring 
Colouring fixed when there are some changes in a branch
 2016-06-28 14:13:35 +02:00
Jan Schulz
a542f4e20c cmd: change the prompt in lua 
This keeps the PROMPT variable as is and changes the prompt to the cmder style
in the clink code.

This has two advantages:

* opening a cmd in a cmder session will now show the old prompt code instead of
  a ugly raw prompt without the replacements. This led to ugly output when a
  batch file echoed their content (e.g `conda build recipe/`).

* when a command rewrites the prompt (e.g. an activate in a virtualenv), these
  command sometimes simply overwrites the PROMPT so that the cmder enhancements
  were not anymore in place. Now we simply don't care and overwrite it with our
  stuff in the clink part. This might mean that a user has to install a lua
  script so that e.g. conda environments are visible on the prompt.
 2016-06-21 13:33:49 +02:00
Benjamin Staneck
999b5af29a ⬆️ Update ConEmu to 160612 (stable) 
Changelog: https://conemu.github.io/blog/2016/06/12/Build-160612.html
 2016-06-14 18:21:40 +02:00
Benjamin Staneck
87210ae7ca ⬆️ Git to 2.9.0 
Changelog: https://github.com/git-for-windows/git/tree/v2.9.0.windows.1
 2016-06-14 17:34:19 +02:00
Vladimir Kotikov
6a080a1284 Bump clink-completions to 0.3.1 2016-06-11 01:07:47 +03:00
Benjamin Staneck
d014d785b0 ⬆️ Update to Git to 2.8.4 2016-06-09 00:18:56 +02:00
Jan Schulz
c19412045c Fix git branch name never shown as dirty 
The problem was that io.popen() returns a file and not the return code of the
called program.

The new code was inspired by
http://stackoverflow.com/a/14031974/1380673
 2016-06-02 12:45:07 +02:00
Jackbennett
010049a849 Set window title to current folder unless there's git information. 
Unfortunately doesn't apply to conEmu's tab name.
 2016-05-27 09:47:34 +01:00
Jackbennett
7a0a1adc02 Use checkGit to hold the git state. Import posh-git at the last minute. 
Import-Git now finds if the module isn't installed at all and alerts the
user. But only when in a git folder.
 2016-05-23 14:53:34 +01:00
Jackbennett
76b2ed510d If you start doing remote work you can fire off your own start-sshAgent command. 2016-05-23 14:51:55 +01:00
Benjamin Staneck
7ca9d8e9d6 Update ConEmu to 160515 2016-05-17 23:20:16 +02:00
Jackbennett
31c8c620c7 Custom prompt hooks protected from later overwriting 
Add a pre and post function hook around the Cmder prompt.
Specify the cmder prompt as a function that could be replaced by a user.
Write a friendly message when the user profile template is created.
Create the user profile with cmder prompt hooks ready to use.

It was concerning to run any function with a specific name every prompt
with no guarantee it remains what it was initally created as.

Core functions have been explicitly called from their
namespace like Microsoft.PowerShell.Utility\Write-Host to try and prevent
clobbering.

User supplied functions are passed in as script blocks, created as the
session runs the profile script. By creating them as constants these
function names cannot be declared again for the duration of the process.

Since the prompt function already exists by this time, set the readOnly
flag so to re-declare the prompt requires the use of -force.

It is hoped these changes limit what could be the risk of any script
redefining functions that are called automatically without user intent or
input.
 2016-05-12 13:59:33 +01:00
Benjamin Staneck
61e795c02d Merge pull request #945 from daxgames/fix_aliases_update 
Added :verbose-output subroutine, made aliases update more functional
 2016-05-08 15:56:58 +02:00
Vladimir Kotikov
a286e52a44 Update completions to 0.3.0 2016-05-08 02:42:48 +03:00
Dax T. Games
c49c27fb88 allow setting verbose-output variable outside init.bat 2016-05-07 18:10:44 -05:00
Dax T. Games
e212ee36a2 Added :verbose-output subroutine, made aliases update more functional 2016-05-07 14:32:33 -05:00
Dax T. Games
537c658eb4 fixed git not working in cmder cmd session and added some comments 2016-05-07 10:56:08 -05:00
Benjamin Staneck
4e9882eea4 Update Git to 2.8.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.8.2.windows.1
 2016-05-06 18:10:00 +02:00
Jan Schulz
055a974257 More variable quoting in init.bat 
There were problems when a path contained a parenthesis like `C:\temp\test (test)\`

As a precaution, quote all variables when they are used in echo or set.
 2016-05-06 15:12:07 +02:00
Jan Schulz
1bf5503bea Add quotes around all variables 
This should prevent errors like
https://github.com/cmderdev/cmder/issues/935
https://github.com/cmderdev/cmder/issues/937

I've no idea why this happens, but it shouldn't hurt anyway...
 2016-05-05 22:40:33 +02:00
Jan Schulz
6c6268e968 Remove @ in new code, echo off is enough 2016-04-08 16:55:49 +02:00
Jan Schulz
1e7f15100f PS: also add cmd and bin version of git to the path 
This ensures that the "normal" path entry (cmd) is first and bash is still reachable via the bin path.
 2016-04-08 16:53:38 +02:00
Jan Schulz
fbccc6b790 init.bat: remove GIT\bin from path 
The only reason was bash but bash.exe is also in <GIT>\usr\bin.
 2016-04-08 16:53:38 +02:00
Jan Schulz
2ccc06e639 init.bat: integrate the unix commands at the end of PATH 
Some unix commands shadow windows commands and therefor the unix commands should
be at the end of the PATH
 2016-04-08 16:53:38 +02:00
Jan Schulz
182629d59a init.bat: check for git in path 
The idea is:
* if the users points as to a specific git, use that
* test if a git is in path and if yes, use that
* last, use our vendored git

We don't make any attempt to guess a different location, if a user wants their
own git install, they have to choose "add git to path".

Also check that we have a recent enough version of git (e.g. test for
<GIT>\cmd\git.exe)
 2016-04-08 16:51:53 +02:00
Dax T. Games
24b1bb93c0 upgraded git to 2.8.1 2016-04-05 14:27:12 -05:00
Benjamin Staneck
5a1f81655f ⬆️ ConEmu@160328 
Changelog: https://conemu.github.io/en/Whats_New.html
 2016-03-30 03:02:31 +02:00
Benjamin Staneck
07ed31c0a1 ⬆️ Git@2.8.0.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.8.0.windows.1
 2016-03-30 03:00:59 +02:00
Dax T. Games
86dd077b9d fixed - not running user-aliases.cmd if aliases variable is overridden in profile.d 2016-03-21 14:35:48 -05:00
Dax T. Games
b86f3fbaff synced with upstream/development 2016-03-20 08:30:20 -05:00
Benjamin Staneck
3ca847fc42 ⬆️ Git@2.7.4.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.4.windows.1
 2016-03-18 18:20:06 +01:00
Benjamin Staneck
0de643be42 ⬆️ Git@2.7.2.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.3.windows.1
 2016-03-17 03:33:09 +01:00
Martin Kemp
05c113efee Fix PSReadline clearing directory prompt. 
If user has PSReadline and is using it be sure to clear 1 less line to prevent the directory prompt from being cleared.

Fixes #879
 2016-03-10 10:50:37 +00:00
Dax T. Games
01667a5bf0 Process profile.d scripts before adding user aliases 2016-03-07 08:12:50 -06:00
Dax T. Games
3085fca9e0 synced with upstream/development 2016-03-06 17:27:27 -06:00
Benjamin Staneck
06c6e5fdb6 Merge pull request #873 from daxgames/echo_off 
Prefer use of first line @echo off vs. @ per line to turn off echo pe…
 2016-03-07 00:07:25 +01:00
Dax T. Games
0f4292aa08 Prefer use of first line @echo off vs. @ per line to turn off echo per line. - Cleaner file, no side efects 2016-03-06 15:40:06 -06:00
Dax T. Games
722f8b7745 silenced bash profile.d when profile.d is empty 2016-03-06 15:05:40 -06:00
Dax T. Games
8dbbb902d9 fixed vendor\profile.ps1 profile.d - added post popd 2016-03-02 18:04:25 -06:00
Dax T. Games
d6eec2f3a5 silence profile.d if profile.d is empty 2016-03-02 17:37:28 -06:00
Dax T. Games
32c1d4028a added fully qualified path to cmd profile.d section 2016-03-02 15:17:43 -06:00
Dax T. Games
997bd5c24e Enhanced alias.bat to allow file storage path 2016-03-01 21:08:08 -06:00
Dax T. Games
8a5c58e626 fixed cmd profile.d support 2016-03-01 20:35:55 -06:00
Martin Kemp
8fa151d1db Merge pull request #740 from daxgames/cmder_exinit 
Cmder exinit
 2016-02-29 08:11:34 +00:00