Pavel Laptev
701bcc2719
tokens update ( #4512 )
2024-07-27 23:26:37 +02:00
Pavel Laptev
c70d837e02
update dark more illustration token ( #4511 )
2024-07-27 22:48:50 +02:00
Sebastian Thiel
5cdbadce4f
refactor CLI to make it easier to add new commands.
...
Also, remove the pager as there seems to be no need for it just yet,
one day it can probably be added when configured neatly.
2024-07-27 21:04:42 +02:00
Kiril Videlov
52e6588dcc
Merge pull request #4510 from gitbutlerapp/rename-trunk-to-target
...
rename Trunk to Target in the UI
2024-07-27 19:39:25 +02:00
Kiril Videlov
a7579915f7
rename Trunk to Target in the UI
...
As it is more descriptive what it is. Added a tooltip for a good measure
2024-07-27 19:26:45 +02:00
Sebastian Thiel
093795bd0b
first simple test for list_branches and basic read-only test framework
2024-07-27 19:14:15 +02:00
Kiril Videlov
f064e31d3a
Merge pull request #4508 from gitbutlerapp/no-more-multiple-local-branches-for-the-same-vbranch
...
remove the vec of local branch entries from branch data
2024-07-27 17:24:58 +02:00
Kiril Videlov
bb826edf94
remove the vec of local branch entries from branch data
...
It is no longer the case that the same logical branch would have multiple trees
2024-07-27 17:13:43 +02:00
Kiril Videlov
baf754aa07
Merge pull request #4507 from Byron/stable-on-unix
...
avoid nightly compiler on unix
2024-07-27 15:43:35 +02:00
Sebastian Thiel
ad3e15dae4
Avoid using nightly by default.
...
Instead, use it only where needed, which at this time is Windows
for some nightly-only access to file-descriptors.
2024-07-27 14:35:26 +02:00
Nico Domino
1ced81fd06
fix: cleanup repo organisation ( #4503 )
2024-07-27 13:29:32 +02:00
Kiril Videlov
3117bda00e
Merge pull request #4504 from gitbutlerapp/add-todo
...
Add todo comment for branch listing
2024-07-27 12:26:31 +02:00
Kiril Videlov
874710e221
Add todo comment for branch listing
2024-07-27 12:17:00 +02:00
Kiril Videlov
62be925178
Merge pull request #4502 from gitbutlerapp/improve-branch-listing-api
...
improve branch listing api
2024-07-27 11:56:12 +02:00
Kiril Videlov
19cf35698a
fix lint
2024-07-27 11:32:55 +02:00
Kiril Videlov
ef6a4c71ce
update the definition of own_branch
2024-07-27 11:24:55 +02:00
Kiril Videlov
099a2159d1
do less work when only own branches are returned
2024-07-27 10:33:10 +02:00
Mattias Granlund
3629c45997
Add file count to metrics collection
2024-07-27 10:28:40 +02:00
Mattias Granlund
7897e5703b
Prevent including background in text selection
2024-07-27 10:18:54 +02:00
Pavel Laptev
b29229f3b6
commits-section-buttons ( #4498 )
...
* Added push button
* `integrate commits` wip
* CSS for sticky buttons
* update interaction observer + revert line group changes
* fix border bottom if there are no remote commits
* fix interaction observer
* remove unused components
* Fix line drawing with the new push buttons
---------
Co-authored-by: Caleb Owens <caleb@gitbutler.com>
2024-07-27 00:47:02 +02:00
Kiril Videlov
dd3ec7ddcc
remote expensive parts of branch listing
2024-07-26 14:22:22 +02:00
Kiril Videlov
c7a8ef99c8
branch listing - allow filtering
...
fix matching
2024-07-26 15:00:08 +02:00
Pavel Laptev
7a3a9148cb
merge conflict resolve
2024-07-26 12:29:27 +02:00
Nico Domino
8ccdb8f578
fix: cleanup gitbutler/web package name ( #4496 )
2024-07-26 10:23:31 +00:00
Scott Chacon
7969e4bc93
has isnt a thing
2024-07-26 09:45:18 +02:00
Kiril Videlov
695e7d88c5
Merge pull request #4473 from gitbutlerapp/new-branch-list-api
...
New branch listing API
2024-07-25 21:39:40 +02:00
Kiril Videlov
c2fafb35ff
handle the case of maaaany branches
2024-07-25 21:28:52 +02:00
Kiril Videlov
7e482437a1
HEAD is not of interest when listing refs
2024-07-25 21:08:03 +02:00
Kiril Videlov
bccf17da89
fix camel casing in typescript
2024-07-25 21:05:35 +02:00
Kiril Videlov
7e660782ad
update docs
2024-07-25 21:03:28 +02:00
Kiril Videlov
116de17c0c
fix the identity detection for Virtual branches
2024-07-25 20:57:18 +02:00
Kiril Videlov
d7f19e5633
revert back to git2 for branch listing
2024-07-25 20:30:41 +02:00
Kiril Videlov
abde2a03b6
fix merge conflict oopsie
2024-07-25 20:27:03 +02:00
Kiril Videlov
b47530af3a
Merged origin/master into new branch list api
2024-07-25 19:29:26 +02:00
Kiril Videlov
69b7aa3d8a
refactor - move given_name_for_branch from the context to an extension on git2::Reference
2024-07-25 19:29:13 +02:00
Nico Domino
5f7a67f271
fix: update web env file ( #4495 )
2024-07-25 15:58:56 +00:00
Nico Domino
bce53ba383
feat: move @gitbutler/cloud into monorepo ( #4494 )
2024-07-25 15:53:28 +00:00
Kiril Videlov
3afabc2a30
merge conflict fix
2024-07-25 16:34:18 +02:00
GitButler
62f0712399
GitButler WIP Commit
2024-07-25 16:32:39 +02:00
Caleb Owens
008a411ebf
Merge pull request #4493 from gitbutlerapp/encode-branch-names
...
Encode branch names
2024-07-25 16:28:44 +02:00
Caleb Owens
3a90776657
Encode branch names
2024-07-25 16:26:58 +02:00
Caleb Owens
064fdc04e3
Merge pull request #4492 from gitbutlerapp/Dont-create-unrequired-wip-commits
...
Always overwrite local references
2024-07-25 16:25:18 +02:00
Kiril Videlov
970c193696
fix an incorrect assumption about gix reference remotes work
2024-07-25 15:49:44 +02:00
Caleb Owens
7a6c7472a4
Always overwrite local references
2024-07-25 15:49:22 +02:00
Caleb Owens
3f37df4d84
Merge pull request #4490 from gitbutlerapp/Dont-create-unrequired-wip-commits
...
Don't create unrequired wip commits
2024-07-25 15:45:02 +02:00
Kiril Videlov
6eea8d2993
trying to get branch remote name
2024-07-25 15:36:16 +02:00
Caleb Owens
7aaabccd90
Merge pull request #4491 from gitbutlerapp/Match-PR-by-given-name
...
Match pull requests on their given names rather than display names
2024-07-25 15:34:59 +02:00
Caleb Owens
5a4c202b25
Match pull requests on their given names rather than display names
...
While we would ideally like to have PRs match on owner+repo+branchname, using the given name is a step forwards as the display name doesn't always accuratly map to the branchname
2024-07-25 15:33:26 +02:00
Caleb Owens
9e2f065109
Merge pull request #4489 from gitbutlerapp/Apply-from-local-branches
...
Apply from local branches
2024-07-25 15:30:59 +02:00
Caleb Owens
2f54e51a33
Don't create unrequired wip commits
2024-07-25 15:25:51 +02:00
