Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 17:08:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1240 commits 22 branches 69 tags 87 MiB
Commit graph

305 commits

Author SHA1 Message Date
Stephan Dilly
378b8655ab Merge branch 'master' 
Conflicts:
	Cargo.lock
	asyncgit/Cargo.toml
 2021-05-12 15:34:36 +02:00
Stephan Dilly
8767642f93 allow pull that creates conflicts now 2021-05-12 15:24:35 +02:00
Stephan Dilly
f35ce0cbf4
support doing merge commit (#701) 2021-05-12 11:20:39 +02:00
Stephan Dilly
a073e0ac02 preserve ref name in annotated commit 2021-05-12 09:13:28 +02:00
Stephan Dilly
b5327a65c1 rename 2021-05-12 09:01:08 +02:00
Stephan Dilly
f30ec49886
show merge head ids in merge state (#697) 2021-05-11 18:26:12 +02:00
Stephan Dilly
4f6aceb3ec
merging a branch (#696) 
* merging arbitrary branch
* cleanup intermediate in-merge state
 2021-05-09 22:53:12 +02:00
Stephan Dilly
b6ea2b77d1 put long filename into subfolder 2021-05-09 18:18:30 +02:00
Stephan Dilly
c0962d85b3 expect panic 2021-05-09 18:17:02 +02:00
Stephan Dilly
69f92d2ea2 add test for long foldername+long filename 2021-05-09 18:04:54 +02:00
Stephan Dilly
593a1d6d98 revert some stuff 2021-05-09 17:54:20 +02:00
Stephan Dilly
15054fed81 255 long filename is the limit on macos 2021-05-09 17:50:52 +02:00
Stephan Dilly
c8430ef4b3 more preice places for where to apply 2021-05-09 14:49:06 +02:00
Stephan Dilly
e93999af8e only run canonicalize on windows 2021-05-09 14:39:35 +02:00
Stephan Dilly
1142f6cbe8 Revert "try to get rid of touch" 
This reverts commit 1867ca1800.
 2021-05-09 14:34:09 +02:00
Stephan Dilly
1867ca1800 try to get rid of touch 2021-05-09 13:55:18 +02:00
Stephan Dilly
18cc49a59d Revert "use CWD in test" 
This reverts commit 94efafb33a.
 2021-05-08 19:14:54 +02:00
Stephan Dilly
94efafb33a use CWD in test 2021-05-08 19:10:26 +02:00
Stephan Dilly
3a0f483164 make test more like what gitui does 2021-05-08 18:39:38 +02:00
Stephan Dilly
7dd61a67a7 try test stage_all 2021-05-08 18:29:17 +02:00
Stephan Dilly
09b6371e65 now we can set longpaths on 2021-05-08 18:19:03 +02:00
Stephan Dilly
c780f96a1b try creating file using shell 2021-05-08 18:14:28 +02:00
Stephan Dilly
b0fc4a152f wtf cant i even create a file with a long file name 2021-05-08 18:01:18 +02:00
Stephan Dilly
cda76b017b set longpaths 2021-05-08 17:49:59 +02:00
Stephan Dilly
28ab5155e4 test to repo windows path issue 2021-05-08 17:44:23 +02:00
Stephan Dilly
96871e7f26 bump git2-rs to rev that includes max-path fix 2021-05-08 13:10:24 +02:00
Stephan Dilly
386a31067f cleanup 2021-05-07 12:00:13 +02:00
Stephan Dilly
147f65562c cleanup some TODO 2021-04-27 17:51:29 +02:00
Stephan Dilly
01678d2d4b prep release 2021-04-27 15:07:20 +02:00
Stephan Dilly
6c1d9e529b add timing 2021-04-25 14:50:44 +02:00
Wander Nauta
c42d369d60
Use git2::DiffLineType enum instead of char values (#668) 
closes #655
 2021-04-25 14:17:57 +02:00
Stephan Dilly
a3f7d189e5
Fix 663 msg scroll (#669) 
* fix line skipping and added unittest
 2021-04-25 14:09:53 +02:00
Christoph Rüßler
26fbc8650f Add async wrapper to blame 
- Rename `self.path` to `self.file_path`.
- Take into account that `draw_scrollbar` subtracts the area’s height
  before calculating the scrollbar’s position.
- Show in title if blame is pending.
 2021-04-25 13:35:34 +02:00
Stephan Dilly
82c52cec37 todo 2021-04-24 15:28:16 +02:00
Christoph Rüßler
3b1a004657 Call get_commits_info instead of get_commit_info 
This results in far fewer calls to `repo.find_commit` in almost all
cases.
 2021-04-24 15:21:12 +02:00
Stephan Dilly
95c41dbf45
limit log message to first line of commit msg (#662) 2021-04-24 14:55:26 +02:00
Stephan Dilly
97985bfe62 do not run blame on a binary file (earlier out) 2021-04-24 14:05:34 +02:00
Christoph Rüßler
e7b703b922 Improve blame view 
- Set default shortcut to `B` instead of `b` because the latter would
  shadow `[b]ranches`.
- Add scrollbar.
- Show resolved commit id in title instead of `HEAD`.
- Make commit id bold if it is the commit id the file is blamed at.
- Don’t run blame on a binary file.
- Add shortcut for inspecting a commit in blame view.
 2021-04-24 14:02:51 +02:00
Stephan Dilly
f081cbeb17 fix debug print when adding afile to ignore 2021-04-23 18:10:06 +02:00
Christoph Rüßler
b7eed4361e Add blame view 
This closes #484.
 2021-04-21 15:03:37 +02:00
Stephan Dilly
524add843d
more lints (#648) 2021-04-18 00:08:35 +02:00
Stephan Dilly
f0a367c3f5
more linting (#647) 2021-04-17 23:17:19 +02:00
Stephan Dilly
53b2c79877
even more clippy restrtictions (#646) 
* even more clippy restrtictions
 2021-04-17 18:55:59 +02:00
Stephan Dilly
ee5b9d9f4e
Fix exit on fetching a branch that has no upstream/remote (#638) 
* do not assume remote/upstream of a branch anymore
 2021-04-12 16:47:08 +02:00
Stephan Dilly
5eaafb0267 version bump 2021-04-11 22:52:59 +02:00
brunohgouveia
79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +02:00
Bruno Gouveia
1d90219df9 Fix CommitMessage combine wrongly concatenating subject to body 2021-04-08 20:49:11 +02:00
Stephan Dilly
b5f1e76455
Remote branches (#618) 
* allow checking out remote branch
* set tracking branch on checking out remote
* fix unittests by making branch list stable sorted by name
 2021-04-06 18:16:08 +02:00
Stephan Dilly
2596c8b1e3 fix panic on staging lines involving missing newline eof 2021-04-03 13:19:01 +02:00
Stephan Dilly
0e85896552 fix nightly 2021-03-29 13:08:20 +02:00