Commit Graph

358 Commits

Author SHA1 Message Date
dm9pZCAq
31f677187b
add trace-libgit feature (#905) 2021-10-13 15:32:17 +02:00
Stephan Dilly
d1dcdab288 version bumps 2021-10-11 11:25:50 +02:00
Stephan Dilly
c6abbaf4d4
fix hirarchical branch names (#931) 2021-10-06 10:50:57 +02:00
R0nd
48f9331b0d
Use git_message_prettify (#924) 2021-09-30 23:20:43 +02:00
Stephan Dilly
e4c7867564
allow rebase with conflicts (#897) 2021-09-29 18:55:47 +02:00
Stephan Dilly
9f8fc6b907 cleanup 2021-09-29 17:38:26 +02:00
Stephan Dilly
23516f1a41 docs 2021-09-29 17:35:47 +02:00
Stephan Dilly
f8bad7d541 cleanup 2021-09-29 17:07:59 +02:00
dependabot[bot]
8030ac8867 Bump pretty_assertions from 0.7.2 to 1.0.0
Bumps [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) from 0.7.2 to 1.0.0.
- [Release notes](https://github.com/colin-kiegel/rust-pretty-assertions/releases)
- [Changelog](https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/colin-kiegel/rust-pretty-assertions/compare/v0.7.2...v1.0.0)

---
updated-dependencies:
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-29 07:46:42 +02:00
Stephan Dilly
d2bdec43a1 cleanup 2021-09-26 10:40:55 +02:00
Stephan Dilly
fa051e9226 nightly clippy fixes 2021-09-17 09:14:28 +00:00
Stephan Dilly
a12180e2e2 version bumps 2021-09-09 10:14:16 +02:00
Stephan Dilly
f27227af41
Conflict free rebase (#896)
* unittest for rebasing with conflicts
* hide branchlist after rebase
2021-09-07 00:04:54 +02:00
Stephan Dilly
cfea72d709 rebase returns generated commit + unittest 2021-09-06 21:20:45 +02:00
Stephan Dilly
6be4da873b version bumps 2021-09-05 10:46:27 +02:00
Stephan Dilly
40e03ba7de allow async jobs to set intermediate progress 2021-09-02 18:29:03 +02:00
Stephan Dilly
0454e2a1cd asyncjob supports sending arbitrary notifications
this is used to send progress reports during work on the job
2021-09-02 13:14:36 +02:00
Stephan Dilly
b9e4631ff4 allow async job to return dynamic notification 2021-09-02 11:36:46 +02:00
Stephan Dilly
e5688e3b8b make async test even more resilient 2021-09-02 10:38:37 +02:00
Stephan Dilly
8905fd22ea make test more stable 2021-09-01 23:02:08 +02:00
Stephan Dilly
777d362dfc less unneeded sleep 2021-08-31 18:12:09 +02:00
Stephan Dilly
9c7ac0f84d some more immutable string optimizations
and precompute diff line trimming (newlines)
2021-08-27 09:40:45 +02:00
Stephan Dilly
8353dfdd36 use less memory per hunk (immutable string) 2021-08-27 09:31:31 +02:00
Stephan Dilly
a8654329ec allow rebase of a branch (#816) 2021-08-26 20:31:37 +02:00
Stephan Dilly
eef1a79375 prepare release 2021-08-21 16:23:06 +02:00
Stephan Dilly
81924fb9f8 show subject line of commits compared 2021-08-21 16:11:33 +02:00
Stephan Dilly
5672cfd033
compare two commits (#860) 2021-08-21 15:49:39 +02:00
jedel1043
13a0f4e9e2
Display mark for remote branches with tracking branches (#861) 2021-08-20 13:03:02 +02:00
Stephan Dilly
7cc19f673a
support options for the way we calculate the status (#849) 2021-08-19 02:19:36 +02:00
Stephan Dilly
dad8e8d43d cargo fmt: use hardtabs
since it does not support hard-whitespaces its the only way to make whitespaces consisitent and checked
2021-08-17 14:24:25 +02:00
Stephan Dilly
0b48e6f4ff
fix tags being fetched every scroll in revlog (#851) 2021-08-17 13:35:59 +02:00
zcorniere
56502ad3fd
ability to delete remote branch (#838)
* added ability to delete remote branch (closes #622)
2021-08-15 17:44:55 +02:00
Stephan Dilly
62ea1dea04 fix progress 0/0 panic 2021-08-15 17:42:25 +02:00
Stephan Dilly
d42b00389c
check branch name validity while typing (#842)
closes #559
2021-08-15 15:14:35 +02:00
Stephan Dilly
e16dfcaee7
hook into libgit2 tracing (#822) 2021-08-15 14:24:20 +02:00
Stephan Dilly
71e3d9a9b8 get_commit_diff on commit with unknown parent (#836) 2021-08-11 13:25:38 +02:00
Stephan Dilly
29f71f50d4 do not allow to ignore gitignore (fixes #825) 2021-08-03 23:47:41 +02:00
Stephan Dilly
19f2fd03cf
app has its own async notifications now (#813)
* app has its own async notifications now
2021-07-11 13:24:19 +02:00
Stephan Dilly
aacc7a3211 version bumps 2021-07-10 14:49:18 +02:00
Stephan Dilly
23944dc608
error if force push was rejected (#810)
* error if force push was rejected
2021-07-10 14:11:01 +02:00
Stephan Dilly
3a1bcb74a2 try fix ci 2021-07-05 11:18:22 +02:00
Stephan Dilly
c2e6f9ff7e filetree paniced on non utf8 files/paths 2021-07-05 00:26:32 +02:00
Christoph Rüßler
bce652ecca Add filter to AsyncLog
This is a small change that makes it possible to reuse the logic in
`AsyncLog` for the file history view. `AsyncLog` passes the filter to
`FileLogWalker` unchanged.
2021-06-26 13:07:03 +02:00
Christoph Rüßler
f132722272 Add filter to LogWalker
This is the first step towards adding a file history view. The filter
itself is not related to files specifically, though. It could also be
used for different purposes.
2021-06-14 00:18:10 +02:00
Stephan Dilly
850a930053 some cleanup and changelog 2021-06-12 22:41:10 +02:00
Christoph Rüßler
0fa3e0f5a8 Show symbol if tag is not yet pushed
This partly addresses #742.
2021-06-12 22:35:57 +02:00
Stephan Dilly
8032c35902 refactor better name 2021-06-07 23:04:07 +02:00
Emil Jaszczuk
b2b5a0faa0
Add undo_last_commit command (#769)
closes #758
2021-06-07 16:46:45 +02:00
Stephan Dilly
12b90715f9
fix openssl vendoring with new resolver (#775)
* run otool in ci
* pin openssl-sys with 'vendored' feature
2021-06-07 14:58:49 +02:00
Stephan Dilly
4c5fe630fc version bumps 2021-06-06 10:15:28 +02:00