Commit Graph

114 Commits

Author SHA1 Message Date
Nick O'Leary 7ef418ec52
Ensure sshkey file path is properly escaped on Windows 2018-02-27 13:05:10 +00:00
Nick O'Leary 2ed52820b6
Fix fs/fspath reference 2018-02-27 11:11:02 +00:00
Nick O'Leary e8fd7484b6
Normalize ssh key paths for Windows file names 2018-02-27 10:58:54 +00:00
Nick O'Leary ce5242cfe8
Ensure userDir is an absolute path when used with sshkeygen 2018-02-26 23:46:08 +00:00
Nick O'Leary 9a5139f452
Detect if there are no existing flows to migrate into a project 2018-02-20 14:30:37 -08:00
Nick O'Leary 6191a49ed3
Use flow-diff to resolve merge conflicts 2018-02-13 23:09:51 +00:00
Nick O'Leary aa1cf0b228
Avoid git fetch when refreshing local status 2018-02-08 23:30:07 +00:00
Nick O'Leary 06a6a4408f
Handle allow-unrelated-histories option on pull 2018-02-08 23:21:14 +00:00
Nick O'Leary d5619d2b9d
Fix up merge conflict handling 2018-02-08 22:22:58 +00:00
Nick O'Leary 555b7df986
Handle more git 2.1 differences 2018-02-07 13:47:09 +00:00
Nick O'Leary b3786700e6
Handle changing case of git error messages between versions 2018-02-07 13:10:04 +00:00
Nick O'Leary 4a5cb7f2f5
Ensure commit list has a refs object even if empty 2018-02-07 11:33:07 +00:00
Nick O'Leary 42a7e902e6
Handle host key verification as auth error 2018-02-07 11:32:50 +00:00
Nick O'Leary aebe080e85
Add support for GIT_SSH on older levels of git 2018-02-07 10:50:32 +00:00
Nick O'Leary 415c768ae4
Filter out %D from git log command for older git versions 2018-02-06 11:00:11 +00:00
Nick O'Leary b4c8bf21d5
Ensure projects are created as logged in user 2018-02-06 10:38:41 +00:00
Nick O'Leary 5fe5db603d
Better error handling/reporting in project creation 2018-02-05 15:59:11 +00:00
Nick O'Leary d1f7fd8bfd
Prevent http git urls from including username/pword 2018-02-02 22:43:29 +00:00
Nick O'Leary d21568497b
Avoid exception if git not installed 2018-02-02 13:46:22 +00:00
Nick O'Leary df4beef060
Check version of git client on startup 2018-02-02 11:37:18 +00:00
Nick O'Leary 67d7930aef
Remember to disable projects in editor when git not found 2018-02-01 20:35:18 +00:00
Nick O'Leary 1377439bb0
Fix pull/push when no tracked branch 2018-02-01 17:08:22 +00:00
Nick O'Leary 407123a280
Add git_pull_unrelated_history handling 2018-02-01 17:07:46 +00:00
Nick O'Leary 750dd590c8
Handle delete of last remote in project settings 2018-02-01 11:25:56 +00:00
Nick O'Leary d0d93d7070
Handle more repo clone error cases 2018-02-01 10:42:14 +00:00
Nick O'Leary b847e962aa
Handle project first-run without existing flow file 2018-01-31 21:31:45 +00:00
Nick O'Leary 8672fcd2bb
Fix authServer on Windows path
Fixes #1588
2018-01-29 21:47:20 +00:00
Nick O'Leary 0dd7bc7fb9
Better default README.md content and edit button 2018-01-25 13:30:27 +00:00
Nick O'Leary c43647ca86
Handle null profile flow file name 2018-01-25 11:14:16 +00:00
Nick O'Leary 6d02e70025
Ensure existing files are migrated to first project 2018-01-25 10:13:07 +00:00
Nick O'Leary 95589307cd
Better reporting of project-not-found 2018-01-24 21:54:18 +00:00
Nick O'Leary 7a89e3cf33
Check the global git config to ensure its setup 2018-01-24 21:05:48 +00:00
Nick O'Leary 64607df929
Ensure git username/email are set on project creation 2018-01-24 15:51:11 +00:00
Nick O'Leary cf34716a57
Tidy up project first-run experience 2018-01-23 11:26:05 +00:00
Nick O'Leary cf40497e6e
Flip logic for opt-in to projects 2018-01-22 23:14:38 +00:00
Nick O'Leary 7e27dd7678
Don't rely on ssh-keygen output to prevent known errors 2018-01-19 22:31:41 +00:00
Nick O'Leary c2508296a5
Add debug to sshkeygen 2018-01-19 22:10:29 +00:00
Nick O'Leary eac98a6d4d
Prevent ssh-keygen prompting for passphrase when blank 2018-01-19 13:12:22 +00:00
Nick O'Leary 7e2b2a9a02
Timeout sshkey-gen calls 2018-01-19 12:57:37 +00:00
Nick O'Leary 353de471eb
Add debug to sshkeygen for travis 2018-01-19 12:50:12 +00:00
Nick O'Leary d93a92c1c8
Rearrange ssh logic to bring it together 2018-01-18 23:13:55 +00:00
Nick O'Leary f7f795f58a
Fixup SSH key auth for project repos 2018-01-18 22:17:48 +00:00
Nick O'Leary f95b414d22
First pass of projects test coverage 2018-01-16 23:04:39 +00:00
Nick O'Leary b76010cb5a
Add sshkeygen test 2018-01-16 16:38:53 +00:00
Nick O'Leary 52475df783
Fix various tests due to projects rework 2018-01-16 16:18:18 +00:00
Nick O'Leary 25f4a018d9
Merge branch '0.18' into projects 2018-01-16 11:21:54 +00:00
Nick O'Leary 3306d30094
Get proper path to local keyfile when selected 2018-01-11 11:19:04 +00:00
Nick O'Leary 6516e0dfd2
Allow a user to pick existing sshkeys from ~/.ssh 2018-01-10 17:37:41 +00:00
Nick O'Leary 13356047dc
Better handling of empty projects and lifecycle 2018-01-09 15:06:05 +00:00
Nick O'Leary 1c2ea56f42
Allow a project to be specified on the command-line
Reuses the existing flowFile - if its value is found
to be the name of an existing project, that project
is set as the active one.

If it is not the name of an existing project, it is
ignored.
2018-01-08 16:10:54 +00:00