`4742ff7`

diff, fetch, pull, fzf dialog to prompt for upstream info so it doesn't break all the time

Authored by

espadonne 6 months ago

SHA: 4742ff7689c41ca3550c30b4bdd6185340597eb7
Parents: 1b06a83
Tree: cc09395

5 changed files

Status	File	+	-
M	`src/display_module.f90`	22	6
M	`src/fuss_main.f90`	39	1
M	`src/git_module.f90`	214	0
M	`src/tree_module.f90`	7	4
M	`src/types_module.f90`	3	0

src/display_module.f90modified

          root%is_staged = .false.
          root%is_unstaged = .false.
          root%is_untracked = .false.
++        root%has_incoming = .false.
          root%first_child => null()
          root%next_sibling => null()
          ! Build tree
          do i = 1, n_files
--            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked)
++            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked, files(i)%has_incoming)
          end do
          ! Sort tree
          character(len=50) :: mark_unstaged
          character(len=50) :: mark_untracked
          character(len=50) :: mark_staged
++        character(len=50) :: mark_incoming
          write(mark_unstaged, '(A,A,A,A,A)') ESC, '[31m', ' ✗', ESC, '[0m'
          write(mark_untracked, '(A,A,A,A,A)') ESC, '[90m', ' ✗', ESC, '[0m'
          write(mark_staged, '(A,A,A,A,A)') ESC, '[32m', ' ↑', ESC, '[0m'
++        write(mark_incoming, '(A,A,A,A,A)') ESC, '[34m', ' ↓', ESC, '[0m'
          ! Count children first
          n_children = 0
              if (node%is_untracked) then
                  line = trim(line) // trim(mark_untracked)
              end if
++            if (node%has_incoming) then
++                line = trim(line) // trim(mark_incoming)
++            end if
              print '(A)', trim(line)
          end if
          root%is_staged = .false.
          root%is_unstaged = .false.
          root%is_untracked = .false.
++        root%has_incoming = .false.
          root%first_child => null()
          root%next_sibling => null()
          do i = 1, n_files
--            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked)
++            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked, files(i)%has_incoming)
          end do
          call sort_tree(root)
          call print_interactive_node(root, '', .true., .true., items, selected, &
                                      item_idx, viewport_offset, viewport_end)
--        ! Print help
++        ! Print help (two rows for better readability)
          print '(A)', ''
--        print '(A)', achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
++        print '(A)', 'Legend: ' // achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
                       achar(27) // '[31m✗' // achar(27) // '[0m=modified ' // &
--                     achar(27) // '[90m✗' // achar(27) // '[0m=untracked'
++                     achar(27) // '[90m✗' // achar(27) // '[0m=untracked ' // &
--        print '(A)', 'j/k/↓/↑: navigate | a: stage | u: unstage | m: commit | p: push | s: status | q: quit'
++                     achar(27) // '[34m↓' // achar(27) // '[0m=incoming'
++        print '(A)', 'Keys: j/k/↑/↓:nav | a:stage | u:unstage | f:fetch | d:diff | l:pull | m:commit | p:push | s:status | q:quit'
          call free_tree(root)
      end subroutine draw_interactive_tree
          character(len=50) :: mark_unstaged
          character(len=50) :: mark_untracked
          character(len=50) :: mark_staged
++        character(len=50) :: mark_incoming
          write(mark_unstaged, '(A,A,A,A,A)') ESC, '[31m', ' ✗', ESC, '[0m'
          write(mark_untracked, '(A,A,A,A,A)') ESC, '[90m', ' ✗', ESC, '[0m'
          write(mark_staged, '(A,A,A,A,A)') ESC, '[32m', ' ↑', ESC, '[0m'
++        write(mark_incoming, '(A,A,A,A,A)') ESC, '[34m', ' ↓', ESC, '[0m'
          ! Count children first
          n_children = 0
                      if (node%is_untracked) then
                          line = trim(line) // trim(mark_untracked)
                      end if
++                    if (node%has_incoming) then
++                        line = trim(line) // trim(mark_incoming)
++                    end if
                      line = trim(line) // highlight_off
                  else
                      line = trim(line) // trim(node%name)
                      if (node%is_untracked) then
                          line = trim(line) // trim(mark_untracked)
                      end if
++                    if (node%has_incoming) then
++                        line = trim(line) // trim(mark_incoming)
++                    end if
                  end if
                  print '(A)', trim(line)

src/fuss_main.f90modified

              call get_dirty_files(files, n_files)
          end if
++        ! Mark files with incoming changes
++        call mark_incoming_changes(files, n_files)
++
          ! Display the tree
          if (n_files > 0) then
              print '(A)', '.'
              call get_dirty_files(files, n_files)
          end if
++        ! Mark files with incoming changes
++        call mark_incoming_changes(files, n_files)
++
          if (n_files == 0) then
              print '(A)', 'No files to display'
              return
                      else
                          call get_dirty_files(files, n_files)
                      end if
++                    call mark_incoming_changes(files, n_files)
                      call build_item_list(files, n_files, items, n_items)
                      if (selected > n_items .and. n_items > 0) selected = n_items
                      if (n_items == 0) running = .false.
                      else
                          call get_dirty_files(files, n_files)
                      end if
++                    call mark_incoming_changes(files, n_files)
                      call build_item_list(files, n_files, items, n_items)
                      if (selected > n_items .and. n_items > 0) selected = n_items
                  end if
                  else
                      call get_dirty_files(files, n_files)
                  end if
++                call mark_incoming_changes(files, n_files)
                  call build_item_list(files, n_files, items, n_items)
                  if (selected > n_items .and. n_items > 0) selected = n_items
              case ('s')  ! Show git status (lowercase)
                  else
                      call get_dirty_files(files, n_files)
                  end if
++                call mark_incoming_changes(files, n_files)
++                call build_item_list(files, n_files, items, n_items)
++                if (selected > n_items .and. n_items > 0) selected = n_items
++            case ('f')  ! Git fetch
++                call git_fetch()
++                ! Refresh files after fetch
++                if (show_all) then
++                    call get_all_files(files, n_files)
++                else
++                    call get_dirty_files(files, n_files)
++                end if
++                call mark_incoming_changes(files, n_files)
++                call build_item_list(files, n_files, items, n_items)
++                if (selected > n_items .and. n_items > 0) selected = n_items
++            case ('d')  ! Git diff with less
++                if (items(selected)%is_file) then
++                    call git_diff_file(items(selected)%path, items(selected)%has_incoming)
++                end if
++            case ('l')  ! Git pull
++                call git_pull()
++                ! Refresh files after pull
++                if (show_all) then
++                    call get_all_files(files, n_files)
++                else
++                    call get_dirty_files(files, n_files)
++                end if
++                call mark_incoming_changes(files, n_files)
                  call build_item_list(files, n_files, items, n_items)
                  if (selected > n_items .and. n_items > 0) selected = n_items
              case ('q', 'Q')  ! Quit
          root%is_staged = .false.
          root%is_unstaged = .false.
          root%is_untracked = .false.
++        root%has_incoming = .false.
          root%first_child => null()
          root%next_sibling => null()
          do i = 1, n_files
--            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked)
++            call add_to_tree(root, files(i)%path, files(i)%is_staged, files(i)%is_unstaged, files(i)%is_untracked, files(i)%has_incoming)
          end do
          call sort_tree(root)
              items(n_items)%is_staged = node%is_staged
              items(n_items)%is_unstaged = node%is_unstaged
              items(n_items)%is_untracked = node%is_untracked
++            items(n_items)%has_incoming = node%has_incoming
          else
              full_path = ''
          end if

src/git_module.f90modified

                  temp_files(n_files)%is_untracked = (git_status == '??')
                  temp_files(n_files)%is_staged = (git_status(1:1) /= ' ' .and. git_status(1:1) /= '?')
                  temp_files(n_files)%is_unstaged = (git_status(2:2) /= ' ' .and. .not. temp_files(n_files)%is_untracked)
++                temp_files(n_files)%has_incoming = .false.
              end if
          end do
                  temp_files(n_files)%is_staged = .false.
                  temp_files(n_files)%is_unstaged = .false.
                  temp_files(n_files)%is_untracked = .false.
++                temp_files(n_files)%has_incoming = .false.
                  do i = 1, n_dirty
                      if (trim(dirty_files(i)%path) == trim(line)) then
                          is_dirty_file = .true.
                          temp_files(n_files)%is_staged = dirty_files(i)%is_staged
                          temp_files(n_files)%is_unstaged = dirty_files(i)%is_unstaged
                          temp_files(n_files)%is_untracked = dirty_files(i)%is_untracked
++                        temp_files(n_files)%has_incoming = dirty_files(i)%has_incoming
                          exit
                      end if
                  end do
                  files(n_files)%is_untracked = (git_status == '??')
                  files(n_files)%is_staged = (git_status(1:1) /= ' ' .and. git_status(1:1) /= '?')
                  files(n_files)%is_unstaged = (git_status(2:2) /= ' ' .and. .not. files(n_files)%is_untracked)
++                files(n_files)%has_incoming = .false.
              end if
          end do
          end if
      end subroutine get_repo_info
++    subroutine prompt_upstream_selection(success)
++        logical, intent(out) :: success
++        integer :: status_code
++        character(len=512) :: selected_branch
++
++        success = .false.
++
++        print '(A)', ''
++        print '(A)', 'No upstream branch configured for this branch.'
++        print '(A)', 'Select a remote branch to track:'
++        print '(A)', ''
++
++        ! Restore terminal for fzf
++        call execute_command_line('stty sane < /dev/tty', exitstat=status_code)
++
++        ! Use fzf to select remote branch
++        call execute_command_line('git branch -r | grep -v HEAD | sed "s/^  //" | ' // &
++                                  'fzf --height=10 --prompt="Select upstream: " > /tmp/fuss_upstream.txt', &
++                                  exitstat=status_code)
++
++        if (status_code /= 0) then
++            print '(A)', 'No upstream selected.'
++            call execute_command_line('sleep 1', exitstat=status_code)
++            ! Re-enable cbreak mode
++            call execute_command_line('stty cbreak -echo < /dev/tty', exitstat=status_code)
++            return
++        end if
++
++        ! Read selected branch
++        open(unit=99, file='/tmp/fuss_upstream.txt', status='old', action='read', iostat=status_code)
++        if (status_code == 0) then
++            read(99, '(A)', iostat=status_code) selected_branch
++            close(99, status='delete')
++
++            if (status_code == 0 .and. len_trim(selected_branch) > 0) then
++                ! Set upstream
++                call execute_command_line('git branch --set-upstream-to=' // trim(selected_branch), &
++                                          exitstat=status_code)
++
++                if (status_code == 0) then
++                    print '(A)', achar(27) // '[32m✓ Upstream set to: ' // trim(selected_branch) // achar(27) // '[0m'
++                    success = .true.
++                else
++                    print '(A)', achar(27) // '[31m✗ Failed to set upstream' // achar(27) // '[0m'
++                end if
++                call execute_command_line('sleep 1', exitstat=status_code)
++            end if
++        end if
++
++        ! Re-enable cbreak mode
++        call execute_command_line('stty cbreak -echo < /dev/tty', exitstat=status_code)
++    end subroutine prompt_upstream_selection
++
++    subroutine mark_incoming_changes(files, n_files)
++        type(file_entry), intent(inout) :: files(:)
++        integer, intent(in) :: n_files
++        integer :: iostat, unit_num, status_code, i
++        character(len=1024) :: line
++        character(len=512) :: incoming_path
++        logical :: upstream_set
++
++        ! Check if there's an upstream branch configured
++        call execute_command_line('git rev-parse --abbrev-ref @{upstream} > /dev/null 2>&1', exitstat=status_code)
++        if (status_code /= 0) then
++            ! No upstream configured - prompt user to select one
++            call prompt_upstream_selection(upstream_set)
++            if (.not. upstream_set) return
++        end if
++
++        ! Get list of files that differ between HEAD and upstream
++        call execute_command_line('git diff --name-only HEAD...@{upstream} > /tmp/fuss_incoming.txt 2>/dev/null', &
++                                  exitstat=status_code)
++
++        if (status_code /= 0) then
++            ! If diff fails, no incoming changes
++            return
++        end if
++
++        open(newunit=unit_num, file='/tmp/fuss_incoming.txt', status='old', action='read', iostat=iostat)
++        if (iostat /= 0) return
++
++        do
++            read(unit_num, '(A)', iostat=iostat) line
++            if (iostat /= 0) exit
++
++            if (len_trim(line) > 0) then
++                incoming_path = trim(line)
++                ! Mark this file as having incoming changes
++                do i = 1, n_files
++                    if (trim(files(i)%path) == trim(incoming_path)) then
++                        files(i)%has_incoming = .true.
++                        exit
++                    end if
++                end do
++            end if
++        end do
++
++        close(unit_num, status='delete')
++    end subroutine mark_incoming_changes
++
++    subroutine git_fetch()
++        integer :: status
++        logical :: upstream_set
++
++        ! Check if there's an upstream branch configured
++        call execute_command_line('git rev-parse --abbrev-ref @{upstream} > /dev/null 2>&1', exitstat=status)
++        if (status /= 0) then
++            ! No upstream configured - prompt user to select one
++            call prompt_upstream_selection(upstream_set)
++            if (.not. upstream_set) return
++        end if
++
++        ! Run git fetch
++        print '(A)', 'Fetching from remote...'
++        call execute_command_line('git fetch', exitstat=status)
++
++        if (status == 0) then
++            print '(A)', achar(27) // '[32m✓ Fetch completed!' // achar(27) // '[0m'
++        else
++            print '(A)', achar(27) // '[31m✗ Fetch failed!' // achar(27) // '[0m'
++        end if
++
++        ! Brief pause to show message
++        call execute_command_line('sleep 1', exitstat=status)
++    end subroutine git_fetch
++
++    subroutine git_pull()
++        integer :: status
++        logical :: upstream_set
++
++        ! Check if there's an upstream branch configured
++        call execute_command_line('git rev-parse --abbrev-ref @{upstream} > /dev/null 2>&1', exitstat=status)
++        if (status /= 0) then
++            ! No upstream configured - prompt user to select one
++            call prompt_upstream_selection(upstream_set)
++            if (.not. upstream_set) return
++        end if
++
++        ! Run git pull
++        print '(A)', 'Pulling from remote...'
++        call execute_command_line('git pull', exitstat=status)
++
++        if (status == 0) then
++            print '(A)', achar(27) // '[32m✓ Pull completed!' // achar(27) // '[0m'
++        else
++            print '(A)', achar(27) // '[31m✗ Pull failed!' // achar(27) // '[0m'
++        end if
++
++        ! Brief pause to show message
++        call execute_command_line('sleep 1', exitstat=status)
++    end subroutine git_pull
++
++    subroutine git_diff_file(filepath, has_incoming)
++        character(len=*), intent(in) :: filepath
++        logical, intent(in) :: has_incoming
++        character(len=2048) :: command
++        integer :: status
++        logical :: upstream_set
++        logical :: has_local_changes
++
++        ! Restore terminal temporarily for less
++        call execute_command_line('stty sane < /dev/tty', exitstat=status)
++
++        ! Check if file has local changes (unstaged or staged)
++        call execute_command_line('git status --porcelain -- "' // trim(filepath) // '" | grep -q "^.M\|^M"', &
++                                  exitstat=status)
++        has_local_changes = (status == 0)
++
++        if (has_local_changes .and. has_incoming) then
++            ! Show both local changes and incoming changes
++            print '(A)', achar(27) // '[1;33mShowing LOCAL changes (working tree vs HEAD):' // achar(27) // '[0m'
++            print '(A)', ''
++            write(command, '(A,A,A)') '(git diff HEAD -- "', trim(filepath), '" && echo "" && echo "' // &
++                                      achar(27) // '[1;33m=== INCOMING changes (upstream vs HEAD) ===' // achar(27) // &
++                                      '[0m" && echo "" && git diff HEAD...@{upstream} -- "', trim(filepath), &
++                                      '") | less -R'
++            call execute_command_line(trim(command), exitstat=status)
++        else if (has_local_changes) then
++            ! Show local changes only (working tree vs HEAD)
++            print '(A)', achar(27) // '[1;33mShowing LOCAL changes (working tree vs HEAD):' // achar(27) // '[0m'
++            print '(A)', ''
++            write(command, '(A,A,A)') 'git diff HEAD -- "', trim(filepath), '" | less -R'
++            call execute_command_line(trim(command), exitstat=status)
++        else if (has_incoming) then
++            ! Show incoming changes only (upstream vs HEAD)
++            ! Check if there's an upstream branch configured
++            call execute_command_line('git rev-parse --abbrev-ref @{upstream} > /dev/null 2>&1', exitstat=status)
++            if (status /= 0) then
++                ! No upstream configured - prompt user to select one
++                call prompt_upstream_selection(upstream_set)
++                if (.not. upstream_set) then
++                    call execute_command_line('stty cbreak -echo < /dev/tty', exitstat=status)
++                    return
++                end if
++            end if
++
++            print '(A)', achar(27) // '[1;33mShowing INCOMING changes (upstream vs HEAD):' // achar(27) // '[0m'
++            print '(A)', ''
++            write(command, '(A,A,A)') 'git diff HEAD...@{upstream} -- "', trim(filepath), '" | less -R'
++            call execute_command_line(trim(command), exitstat=status)
++        else
++            ! No changes to show
++            print '(A)', achar(27) // '[33mNo changes to show for: ' // trim(filepath) // achar(27) // '[0m'
++            call execute_command_line('sleep 1', exitstat=status)
++        end if
++
++        ! Re-enable cbreak mode
++        call execute_command_line('stty cbreak -echo < /dev/tty', exitstat=status)
++    end subroutine git_diff_file
++
  end module git_module

src/tree_module.f90modified

  contains
--    recursive subroutine add_to_tree(node, path, is_staged, is_unstaged, is_untracked)
++    recursive subroutine add_to_tree(node, path, is_staged, is_unstaged, is_untracked, has_incoming)
          type(tree_node), pointer, intent(in) :: node
          character(len=*), intent(in) :: path
--        logical, intent(in) :: is_staged, is_unstaged, is_untracked
++        logical, intent(in) :: is_staged, is_unstaged, is_untracked, has_incoming
          integer :: slash_pos, iostat
          character(len=512) :: first_part, rest
                      child%is_staged = child%is_staged .or. is_staged
                      child%is_unstaged = child%is_unstaged .or. is_unstaged
                      child%is_untracked = child%is_untracked .or. is_untracked
++                    child%has_incoming = child%has_incoming .or. has_incoming
                      return
                  end if
                  if (.not. associated(child%next_sibling)) exit
              new_child%is_staged = is_staged
              new_child%is_unstaged = is_unstaged
              new_child%is_untracked = is_untracked
++            new_child%has_incoming = has_incoming
              new_child%first_child => null()
              new_child%next_sibling => null()
              child => node%first_child
              do while (associated(child))
                  if (trim(child%name) == trim(first_part)) then
--                    call add_to_tree(child, rest, is_staged, is_unstaged, is_untracked)
++                    call add_to_tree(child, rest, is_staged, is_unstaged, is_untracked, has_incoming)
                      return
                  end if
                  if (.not. associated(child%next_sibling)) exit
              new_child%is_staged = .false.
              new_child%is_unstaged = .false.
              new_child%is_untracked = .false.
++            new_child%has_incoming = .false.
              new_child%first_child => null()
              new_child%next_sibling => null()
                  child%next_sibling => new_child
              end if
--            call add_to_tree(new_child, rest, is_staged, is_unstaged, is_untracked)
++            call add_to_tree(new_child, rest, is_staged, is_unstaged, is_untracked, has_incoming)
          end if
      end subroutine add_to_tree

src/types_module.f90modified

          logical :: is_staged
          logical :: is_unstaged
          logical :: is_untracked
++        logical :: has_incoming
          type(tree_node), pointer :: first_child => null()
          type(tree_node), pointer :: next_sibling => null()
      end type tree_node
          logical :: is_staged
          logical :: is_unstaged
          logical :: is_untracked
++        logical :: has_incoming
      end type file_entry
      type :: selectable_item
          logical :: is_staged
          logical :: is_unstaged
          logical :: is_untracked
++        logical :: has_incoming
          logical :: is_file
      end type selectable_item