mjarkk
70cd6700e7
Tried to fix circleci
2018-12-14 13:43:13 +01:00
mjarkk
d11f8989d9
Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password
2018-12-14 13:40:40 +01:00
mjarkk
0fca27d022
Tried to fix circleci
2018-12-14 13:40:29 +01:00
Mark Kopenga
255319e597
Merge branch 'master' into https-ask-for-username-password
2018-12-14 11:13:29 +01:00
mjarkk
5d038dfd33
Removed the wired error handling
2018-12-12 22:11:31 +01:00
mjarkk
0577d3b97f
Removed the username / password savety check
...
This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen
2018-12-12 21:08:53 +01:00
Jesse Duffield
a26c15dafa
some fixes for issues around the credentials panel
2018-12-12 22:34:20 +11:00
Jesse Duffield
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
Jesse Duffield
e0ff46fe53
more work on rebasing including visual indicators
2018-12-11 09:39:54 +11:00
Glenn Vriesman
7a7e885773
Added rebase support commands
2018-12-11 09:39:54 +11:00
Glenn Vriesman
670f0e37c7
Added rebase functions
2018-12-11 09:39:54 +11:00
Glenn Vriesman
822dc5dada
Moved push-pullables status to the end
2018-12-11 09:38:33 +11:00
mjarkk
f14effe5f5
Worked and fixed a view comments
2018-12-09 13:04:19 +01:00
Mark Kopenga
19a6a32625
Merge branch 'master' into https-ask-for-username-password
2018-12-08 16:41:39 +01:00
Jesse Duffield
ff856b7630
fetching branches without checking out
2018-12-08 11:51:47 +11:00
Jesse Duffield
99a8b1ae8b
making a start on unidirectional data binding to fix these UI bugs
2018-12-08 11:51:47 +11:00
Mark Kopenga
1b6d34e76a
Merge branch 'master' into https-ask-for-username-password
2018-12-06 08:31:12 +01:00
Jesse Duffield
3b51d7cd00
clean as well as reset (I'm hoping this is a good design decision)
2018-12-05 20:06:47 +11:00
Jesse Duffield
66512ca253
use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds
2018-12-05 19:49:07 +11:00
Jesse Duffield
c0f9795910
staging lines and hunks
2018-12-05 19:33:46 +11:00
Jesse Duffield
658e5a9faf
initial support for staging individual lines
2018-12-04 22:11:48 +11:00
mjarkk
2edd2b74ff
Removed a lot of useless code
2018-12-02 14:58:18 +01:00
BlakeMScurr
181f91d2ef
Add full stops to new comments.
2018-11-30 13:47:14 +13:00
BlakeMScurr
643cdd3461
Add simple comments to uncommented functions.
2018-11-30 11:04:08 +13:00
BlakeMScurr
5c70d2724b
Fix function comments with CodeLingo.
2018-11-28 15:31:22 +13:00
mjarkk
9da1382e09
Added credentials popup
2018-11-25 13:15:36 +01:00
Mark Kopenga
b0eaf507a5
Merge branch 'master' into https-ask-for-username-password
2018-11-14 13:40:17 +01:00
mjarkk
448d9caf1b
Fixed typo
2018-11-14 11:40:32 +01:00
Jesse Duffield
0eb1e4a86b
change how we build our list of branches to support detached heads
2018-11-14 21:19:12 +11:00
mjarkk
0c4c00c1bf
Removed useless channel read
2018-11-14 11:14:31 +01:00
Jesse Duffield
a5f483fae9
refactor obtaining current branch name
2018-11-14 19:08:42 +11:00
mjarkk
18a1070c2c
Trying to fix circleci
2018-11-10 18:24:37 +01:00
mjarkk
9fafd7ebc1
Fixed case that a commit message will break git push
2018-11-10 18:10:53 +01:00
mjarkk
80c6e0a8c4
Fixed pushing forever
2018-11-10 17:02:39 +01:00
mjarkk
834e42897d
Switched back to github.com/mgutz/str instaid of a copy of ToArgv
2018-11-10 08:57:02 +01:00
mjarkk
500267417b
Removed some duplicated code
2018-11-10 08:46:42 +01:00
mjarkk
18bcc0df4d
Fixed no error text on windows
...
when executing a command live on windows it detects errors but did just show a empty string
2018-11-10 08:43:02 +01:00
mjarkk
5ae0e75e5e
Switched to channels instaid of a mutex
2018-11-10 08:39:09 +01:00
mjarkk
1fd8cadd9e
Replaced regex with trim
2018-11-10 08:14:35 +01:00
mjarkk
9c8b241292
Removed some useless comments
2018-11-06 20:37:59 +01:00
mjarkk
7c4d360645
Better error for code 128
2018-11-06 20:25:11 +01:00
mjarkk
ad77ac639e
Working new lines in live pty output
2018-11-06 20:24:10 +01:00
mjarkk
cf1e9f79b1
hopefully fixed the test now
2018-11-03 09:36:38 +01:00
mjarkk
8469239d84
Fixed test
2018-11-03 09:12:45 +01:00
mjarkk
5470bb4121
Added username password detect to git pull
2018-11-02 09:54:54 +01:00
mjarkk
0e53a26d6f
Maybe fixed the test this time
2018-11-01 07:06:34 +01:00
mjarkk
3938138ebc
Hopefully fixed circleci
2018-10-31 19:25:52 +01:00
mjarkk
05f0e5120a
Fixed one text
2018-10-31 17:55:02 +01:00
mjarkk
5532289086
Fixed some tests
2018-10-31 17:36:20 +01:00
mjarkk
78b2bc4f60
Made a better way of test pushing
2018-10-31 16:23:58 +01:00
mjarkk
9585f49490
Made error handling better
2018-10-29 08:23:56 +01:00
mjarkk
372b333662
Added copy note at top of string-to-args.go
2018-10-27 17:08:25 +02:00
mjarkk
18f09a14e6
Removed package github.com/mgutz/str for better code coverage
2018-10-27 17:06:33 +02:00
mjarkk
ed564adb4a
Removed github.com/ionrock/procs for better code coverage
2018-10-27 16:57:34 +02:00
mjarkk
9163110640
Removed error check for regex
...
Regexp only returns an error when regex string is in-corret
2018-10-27 15:52:12 +02:00
mjarkk
6c1c110ce0
Made tests pass
...
Git constandly exits with error code 1 for some reason it might be because of the wrong username and password but i don't think error 1 is for wrong credentials
2018-10-27 15:32:12 +02:00
mjarkk
1df1053947
Fixed test
2018-10-27 15:01:16 +02:00
mjarkk
87d1b9a547
Fixed circleci build
2018-10-27 14:56:15 +02:00
mjarkk
959d6fa2ca
Made it possible to build for windows again
2018-10-27 14:37:31 +02:00
mjarkk
e47c597b3a
Made it possible to build again for windows
2018-10-27 14:35:07 +02:00
Mark Kopenga
1fedda6a75
Merge branch 'master' into https-ask-for-username-password
2018-10-23 13:52:50 +02:00
mjarkk
ac03665df3
Handled some errors
2018-10-20 19:44:56 +02:00
mjarkk
12425f0aa7
First good success
2018-10-20 17:37:55 +02:00
Kristijan Husak
990dc8c4ea
Add separate open command for links and check if branch exists on remote before opening pull request link.
2018-10-20 11:58:08 +02:00
mjarkk
4451cbc50b
handled golangcibot
2018-10-17 21:14:24 +02:00
mjarkk
01fa106de3
Added files to commit pannelsidjfjlisdjfilisldjfiljisldjilfjisdjilfjlsidMoved some code around
2018-10-17 21:12:33 +02:00
mjarkk
9fc4262887
small code addition
2018-10-17 20:41:22 +02:00
mjarkk
cecd5733a8
Basic file for getting the fix working
2018-10-17 20:38:13 +02:00
Kristijan Husak
c69fce2e9d
Remove unnecessary nil error in NewPullRequest.
2018-10-15 11:00:19 +02:00
Kristijan Husak
df0e3e52fe
Add option to create pull request form branches panel.
2018-10-13 22:54:51 +02:00
Kristijan Husak
4287f8ae90
Fix tests and add test scenarios for amend.
2018-10-08 22:19:42 +02:00
Kristijan Husak
190309e5c1
Check if there is any commit to amend and use 'A' instead of 'M' as shortcut.
2018-10-08 21:19:45 +02:00
Jesse Duffield
ac65586bd5
Merge branch 'master' into feature/commit-amend
2018-10-07 21:08:46 +11:00
Kristijan Husak
5f7ac97a39
Refresh side panels and use uppercase HEAD in all git commands that requires it.
2018-10-06 09:53:54 +02:00
Jesse Duffield
2be613679e
more test coverage
2018-10-05 09:11:19 +10:00
Kristijan Husak
b6b21bc98e
Merge branch 'master' of git://github.com/jesseduffield/lazygit into feature/commit-amend
2018-09-25 21:17:53 +02:00
Jesse Duffield
eb69d98f99
add test for CurrentBranchName
2018-09-25 20:31:19 +10:00
Jesse Duffield
fb9596a3ff
add test for getMergeBase
2018-09-25 20:25:04 +10:00
Jesse Duffield
0d33a746ba
Merge branch 'feature/informative-commit-colors' of https://github.com/jesseduffield/lazygit into feature/informative-commit-colors
2018-09-25 20:11:36 +10:00
Jesse Duffield
f3fc98a3d0
support git flow when colouring commits
2018-09-25 20:11:33 +10:00
Jesse Duffield
17d7bcdeaf
Merge branch 'master' into feature/informative-commit-colors
2018-09-25 20:10:12 +10:00
Jesse Duffield
7164f37266
Merge branch 'master' into feature/commit-amend
2018-09-25 19:05:24 +10:00
Jesse Duffield
e9245cd53b
Merge branch 'master' into add-tests-part-7
2018-09-25 19:03:29 +10:00
Jesse Duffield
70ee4faf15
add removeAll to git
2018-09-21 09:23:00 +10:00
Anthony HAMON
360b7c1def
commands/git : refactor test to Diff, refactor function
2018-09-20 09:11:47 +02:00
Anthony HAMON
bdeb78c9a0
commands/git : returns an error instead of panicing
2018-09-20 09:09:37 +02:00
Anthony HAMON
9481920101
commands/git : add test to GetLog
2018-09-20 09:09:37 +02:00
Jesse Duffield
a2b3cd0823
add removeAll to git
2018-09-20 09:48:56 +10:00
Jesse Duffield
8fac19c175
Merge branch 'master' into feature/informative-commit-colors
2018-09-20 09:41:29 +10:00
Jesse Duffield
64f0eeb42e
fix specs
2018-09-19 19:23:31 +10:00
Jesse Duffield
fcaf4e339c
fix specs
2018-09-19 19:16:55 +10:00
Jesse Duffield
99a6439641
Merge branch 'master' into hotfix/cursor-positioning
2018-09-19 18:42:25 +10:00
Jesse Duffield
e95b2e5f0b
update specs
2018-09-19 18:31:54 +10:00
Jesse Duffield
c789bba673
color merged and unmerged commits differently
2018-09-18 21:45:35 +10:00
Anthony HAMON
60cf549a32
commands/git : reverse the logic
2018-09-18 09:23:41 +02:00
Anthony HAMON
6f0b32f95e
commands/git : add GetCommits tests refactor
...
* switch GetCommitsToPush scope to private
* return a map instead of slice for look up
* remove useless includesString function
2018-09-17 21:19:17 +02:00
Jesse Duffield
bd04ecff69
Merge branch 'master' into hotfix/cursor-positioning
2018-09-17 21:03:29 +10:00
Jesse Duffield
c00c834b35
standardise rendering of lists in panels
2018-09-17 21:02:30 +10:00
Anthony HAMON
9713a15167
commands/git : add test to GetBranchGraph, refactor
2018-09-16 22:12:03 +02:00
Anthony HAMON
b641d6bd96
commands/git : add test to Checkout, refactor
2018-09-16 22:08:23 +02:00