Merge branch 'master' into patch-gittyup-qt6

.github/workflows/build.yml

@@ -46,9 +46,7 @@ jobs:
       run: |
         pacman --noconfirm -Suy
         pacman --noconfirm -S flatpak flatpak-builder xorg-server-xvfb
-        flatpak install --assumeyes org.kde.Sdk//5.15-21.08
-        flatpak install --assumeyes org.freedesktop.Sdk.Extension.golang//21.08
-        flatpak install --assumeyes org.kde.Platform//5.15-21.08
+        flatpak install --assumeyes org.freedesktop.Sdk.Extension.golang//23.08
 
     - name: Show environment variables
       run: >
@@ -82,48 +80,50 @@ jobs:
     - name: Replace git tag by the commit id on which it runs
       if: github.ref_type != 'tag'
       run: >
-        sed -i 's@tag: .*@commit: "${{ (github.event.pull_request && github.event.pull_request.head.sha) || github.sha }}"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@tag: .*@commit: "${{ (github.event.pull_request && github.event.pull_request.head.sha) || github.sha }}"@' com.github.Murmele.Gittyup.yml
 
     - name: Use correct git tag
       if: github.ref_type == 'tag'
       run: >
-        sed -i 's@tag: .*$@tag: "${{ github.ref_name }}"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@tag: .*$@tag: "${{ github.ref_name }}"@' com.github.Murmele.Gittyup.yml
 
     - name: Replace source url
       run: >
-        sed -i "s@url: .*Gittyup.git@url: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY@" com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i "s@url: .*Gittyup.git@url: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY@" com.github.Murmele.Gittyup.yml
 
     - name: Add dev build marker to cmake options
       if: github.ref_type != 'tag'
       run: >
-        sed -i 's@config-opts: \["\(.*\)"\]@config-opts: ["\1", "-DDEV_BUILD=${{ github.ref_name }}"]@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@config-opts: \["\(.*\)"\]@config-opts: ["\1", "-DDEV_BUILD=${{ github.ref_name }}"]@' com.github.Murmele.Gittyup.yml
 
     - name: Replace desktop file name suffix
       if: github.ref_type != 'tag'
       run: >
-        sed -i 's@desktop-file-name-suffix: ""@desktop-file-name-suffix: " (Development)"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@desktop-file-name-suffix: ""@desktop-file-name-suffix: " (Development)"@' com.github.Murmele.Gittyup.yml
 
     - name: Enable automatic update
       if: github.ref_type != 'tag'
       run: >
-        sed -i 's@-DENABLE_UPDATE_OVER_GUI=OFF@-DENABLE_UPDATE_OVER_GUI=ON@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@-DENABLE_UPDATE_OVER_GUI=OFF@-DENABLE_UPDATE_OVER_GUI=ON@' com.github.Murmele.Gittyup.yml
 
     - name: Show Flatpak manifest
-      run: cat com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+      run: cat com.github.Murmele.Gittyup.yml
 
     - name: Build package
-      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: Gittyup.flatpak
-        manifest-path: com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        manifest-path: com.github.Murmele.Gittyup.yml
         cache: false
+        upload-artifact: true
+        verbose: true
         branch: ${{ steps.flatpak_release_branch.outputs.value }}
 
     - name: Publish build artifacts
       uses: actions/upload-artifact@v2
       with:
-        path: com.github.Murmele.Gittyup/*
-        name: Gittyup Flatpak
+        path: Gittyup.flatpak
+        name: GittyupFlatpak
 
 
   build:
@@ -147,7 +147,7 @@ jobs:
             cmake_env: {}
 
           - name: macos
-            os: macos-latest
+            os: macos-12
             ninja_platform: mac
             qt_platform: mac
             openssl_arch: darwin64-x86_64-cc
@@ -206,9 +206,9 @@ jobs:
           modules: qtwebengine
 
       - name: Install Ninja
-        uses: seanmiddleditch/gha-setup-ninja@v3
+        uses: seanmiddleditch/gha-setup-ninja@v4
         with:
-          version: 1.9.0
+          version: 1.11.1
           platform: ${{ matrix.env.ninja_platform }}
           destination: ninja
 
@@ -366,17 +366,6 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: artifacts
-
-      - name: list artifacts folder
-        run: |
-          echo "Show artifacts folder:"
-          ls artifacts
-          echo "Show artifacts/Gittyup Flatpak folder:"
-          ls "artifacts/Gittyup Flatpak"
-          echo "Show artifacts/Gittyup-x86_64:"
-          ls "artifacts/Gittyup-x86_64"
-          echo "Show artifacts/Gittyup VERSION"
-          ls "artifacts/Gittyup-VERSION"
 
       # version is exported from cmake to file
       - name: Retrieve version
@@ -394,9 +383,8 @@ jobs:
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
-            **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
-            **/Gittyup-x86_64/*.flatpak
-            **/artifacts/GittyupAppImage/*
+            **/artifacts/GittyupFlatpak/*.flatpak
+            **/artifacts/GittyupAppImage/Gittyup*.AppImage
 
       - name: Update GitHub release (version tag)
         uses: marvinpinto/action-automatic-releases@latest
@@ -409,9 +397,8 @@ jobs:
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
-            **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
-            **/Gittyup-x86_64/*.flatpak
-            **/artifacts/GittyupAppImage/*
+            **/artifacts/GittyupFlatpak/*.flatpak
+            **/artifacts/GittyupAppImage/Gittyup*.AppImage
 
       # needed otherwise the docs folder is not available     
       - name: Checkout repository

.gitignore

@@ -10,4 +10,4 @@ build
 .idea/
 .venv
 compile_commands.json
-
+tags

CMakeLists.txt

@@ -6,7 +6,7 @@ set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_EXECUTABLE_NAME "gittyup")
 set(GITTYUP_IDENTIFIER "com.github.Murmele.Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
-set(GITTYUP_VERSION_MINOR 3)
+set(GITTYUP_VERSION_MINOR 4)
 set(GITTYUP_VERSION_PATCH 0)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"

README.md

@@ -92,7 +92,7 @@ How to Build
 **Initialize Submodules**
 
     git submodule init
-    git submodule update
+    git submodule update --depth 1
 
 **Build OpenSSL**
 
@@ -194,7 +194,7 @@ branch. Create pull requests against the `master` branch. Follow the
 [seven guidelines](https://chris.beams.io/posts/git-commit/) to writing a
 great commit message.
 
-Prior to committing a change, please use `cl-format.sh` to ensure your code
+Prior to committing a change, please use `cl-fmt.sh` to ensure your code
 adheres to the formatting conventions for this project. You can also use the
 `setup-env.sh` script to install a pre-commit hook which will automatically
 run `clang-format` against all modified files.

com.github.Murmele.Gittyup.yml

@@ -0,0 +1,75 @@
+app-id: com.github.Murmele.Gittyup
+runtime: org.kde.Platform
+runtime-version: 5.15-23.08
+sdk: org.kde.Sdk
+command: gittyup
+desktop-file-name-suffix: "" # used to create development version
+finish-args:
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --device=dri
+  - --share=network
+  - --share=ipc
+  - --filesystem=home
+  - --filesystem=/tmp # Needed to store temporary files, which should be opened by external (non sandboxed) applications like kdiff3. Did not find another way to share a temporary file to the host (only creating a tmp folder in the home folder, I don't like)
+  # we use the keyring to store credentials
+  - --filesystem=xdg-run/keyring
+  # for git repos that require ssh keys
+  - --socket=ssh-auth
+  - --talk-name=org.freedesktop.secrets
+  - --talk-name=org.freedesktop.Notifications
+  - --talk-name=org.freedesktop.Flatpak
+rename-icon: gittyup # Image will renamed to match the app-id konvention
+rename-desktop-file: gittyup.desktop
+rename-appdata-file: gittyup.appdata.xml
+
+build-options:
+  append-path: /usr/lib/sdk/golang/bin
+
+modules:
+  - name: git-lfs
+    buildsystem: simple
+    build-commands:
+      - PREFIX=${FLATPAK_DEST} ./install.sh
+    sources:
+      - type: archive
+        strip-components: 1
+        url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
+        sha256: 6f28eb19faa7a968882dca190d92adc82493378b933958d67ceaeb9ebe4d731e
+        only-arches: [x86_64]
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/git-lfs/git-lfs/releases/latest
+          url-query: .assets[] | select(.name=="git-lfs-linux-amd64-" + $version +
+            ".tar.gz") | .browser_download_url
+          version-query: .tag_name
+      - type: archive
+        strip-components: 1
+        url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-arm64-v3.5.1.tar.gz
+        sha256: 4f8700aacaa0fd26ae5300fb0996aed14d1fd0ce1a63eb690629c132ff5163a9
+        only-arches: [aarch64]
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/git-lfs/git-lfs/releases/latest
+          url-query: .assets[] | select(.name=="git-lfs-linux-arm64-" + $version +
+            ".tar.gz") | .browser_download_url
+          version-query: .tag_name
+
+  - name: git
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 $(which git) ${FLATPAK_DEST}/bin/
+      - install -Dm755 $(which git-cvsserver) ${FLATPAK_DEST}/bin/
+      - install -Dm755 $(which git-receive-pack) ${FLATPAK_DEST}/bin/
+      - install -Dm755 $(which git-shell) ${FLATPAK_DEST}/bin/
+      - install -Dm755 $(which git-upload-archive) ${FLATPAK_DEST}/bin/
+      - install -Dm755 $(which git-upload-pack) ${FLATPAK_DEST}/bin/
+
+  - name: Gittyup
+    buildsystem: cmake-ninja
+    config-opts: [-DCMAKE_BUILD_TYPE=Release, -DFLATPAK=ON, -DGENERATE_APPDATA=ON, -DENABLE_UPDATE_OVER_GUI=OFF, -DUSE_SYSTEM_OPENSSL:BOOL=ON]
+    builddir: true
+    sources:
+      - type: git
+        url: https://github.com/Murmele/Gittyup.git
+        tag: gittyup_v1.3.0

conf/editor.lua

@@ -14,6 +14,9 @@ return {
     family = family,
     size = size
   },
+  view = {
+    showWhitespace = false
+  },
   indent = {
     tabs = true,
     width = 4,

docs/changelog.md

@@ -1,17 +1,43 @@
-### vX.X.X - 2023-04-20 (DEV)
+### vX.X.X - 2024-06-13 (DEV)
 
-Description
+Bug Fix and Feature release
+
+#### Added
+
+* Add commit filter to show only the first parent in the commit list view
+
+----
+
+### v1.4.0 - 2024-04-24
+
+Bug Fix and Feature release
 
 #### Added
 
 * UI(Commit List): Added a right-click menu entry to rename branches.
 * UI(Main Menu): Added a menu-entry to rename the current branch.
+* UI(Diff View): Added line wrapping option in Tools - Options - Diff
+* Option to open Gittyup maximized at startup
+* Hotkeys for Navigating CommitList
+* Referring repos with their git-dir instead of their work-tree.
+* Use columns for file name, directory, and state when files are shown as a list in TreeViews.
+* Possibility to change language from the settings
+* Linux: Publishing Appimage bundle
+* Hide Untracked Files option to DoubleTreeWidget
+* Add display options to the commit list
 
 #### Changed
 
 * UI(Commit List): Collapse multiple branch and tag right-click menu entries
                    into submenus. This affects the checkout and delete operations.
 * Fix(Build System): Force usage of clang-format v13 to ensure consistent formatting.
+* Fix: Commit highlighting
+* Compact commit list: move commit message closer to commit graph
+* Updating translations
+* Close the branch drop-down list after the user checks out a branch.
+* Fix: Delete timeline causes crash on windows
+* Fix: Rebase: Use original commit message as default message
+* Fix: Stage all button
 
 ----
 

docs/index.md

@@ -79,6 +79,11 @@ See blame of the current version with an integrated timeline to see who changed
 
 ![Blame View](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/BlameView.png)
 
+### Dynamic Line Wrapping
+Courtesy of Scintilla.
+
+![Line Wrapping](/rsrc/screenshots/line-wrap-demo-2.gif)
+
 ### Single line staging 
 by eighter clicking on the checkboxes next to each line or by selecting the relevant code and pressing "S". For unstaging you can uncheck the checkboxes or press "U". To revert changes, select the text and press "R".