The Icon Bar: RISC OS Users Xmas screenshots 2022

Member
Posts: 48

Sorry for small typos in the text - 3rd paragraph should read 'On the *left* of the screenshot', and the 6th paragraph should read 'The different dumping formats, and explorer *were* added in the past few months'.

The PyromaniacGit implementation is now very functional, and I'll write more about it soon. Although it wasn't mentioned here, I use Linux on my work machine, and Pyromaniac works just as well on there as it does on macOS. So although macOS is my working environment generally, it's not that different on Linux.

Member
Posts: 48

The shell server at https://shell.riscos.online/ has now been updated with the latest version of RISC OS Pyromaniac which includes the functional PyromaniacGit module. This allows regular git operations to be performed, from within RISC OS. I'll write more about what you can do and how it works later, but it is there and it works.

Not all commands are supported, and within the commands, not all switches. However, most work just as you would expect.


*help git                                                                                                               
==> Help on keyword 'Git' (PyromaniacGit)                                                                               
Interface to the host 'git' command. This command must be supplied a command                                            
which many different parameters. More information on the options can be found                                           
through the help command:                                                                                               
                                                                                                                        
*Git help - lists the available commands.                                                                               
*Git help <command> - lists options for a command.                                                                      
                                                                                                                        
The operation of the git command is based on that of the host system. Whilst                                            
the interface has many limitations, it should be able to be used in a similar                                           
way to the standard version. Filenames should be able to be specified in RISC                                           
OS format and will be translated to the host format.                                                                    
                                                                                                                        
To function, many of the environment variables from the original system have                                            
been mapped to a form more like the manner that RISC OS functions. These                                                
variables and their translation are described in '*Help GitVariables'.                                                  
                                                                                                                        
For more information on the meaning of the options for commands, please refer                                           
to the standard documentation (https://git-scm.com/docs).                                                               
                                                                                                                        
Commands:                                                                                                               
    add               Add file contents to the index                                                                    
    annotate          Annotate file lines with commit information                                                       
    blame             Show what revision and author last modified each line of a file                                   
    branch            List, create, or delete branches                                                                  
    checkout          Switch branches or restore working tree files                                                     
    cherry-pick       Apply the changes introduced by some existing commits                                             
    clean             Remove untracked files from the working tree                                                      
    clone             Clone a repository into a new directory                                                           
    commit            Record changes to the repository                                                                  
    describe          Give an object a human readable name based on an available ref                                    
    diff              Show changes between commits, commit and working tree, etc                                        
    fetch             Fetch from another repository or a local branch                                                   
    help              Display help for a given command                                                                  
    init              Create an empty Git repository or reinitialize an existing one                                    
    log               Show commit logs                                                                                  
    merge             Join two or more development histories together                                                   
    mv                Move or rename a file or directory                                                                
    pull              Fetch from and integrate with another repository or a local branch                                
    push              Push to a remote repository                                                                       
    rebase            Reapply commits on top of another base tip                                                        
    reflog            Manage reflog information                                                                         
    remote            Manage set of tracked repositories                                                                
    reset             Reset current HEAD to the specified state                                                         
    rev-parse         Pick out and massage parameters                                                                   
    rm                Remove files from the working tree and from the index                                             
    show              Show various types of objects                                                                     
    stash             Stash the changes in a dirty working directory away                                               
    status            Show the working tree status                                                                      
    switch            Switch branches                                                                                   
    tag               Create, list, and delete tags on objects                                                          
    version           Report the version of git on the host and RISC OS system                                          
                                                                                                                        
Syntax: *Git <command> [<options>]

For example, the commit command only supports some of the operations:


*git help commit                                                                                                        
Syntax: Git commit <options>                                                                                            
                                                                                                                        
Record changes to the repository                                                                                        
                                                                                                                        
positional arguments:                                                                                                   
  FILES                                                                                                                 
                                                                                                                        
optional arguments:                                                                                                     
  --help, -h                                                                                                            
  --all, -a                                                                                                             
  --short                                                                                                               
  --branch, -b                                                                                                          
  --long                                                                                                                
  --ahead-behind                                                                                                        
  --no-ahead-behind                                                                                                     
  --renames                                                                                                             
  --no-renames                                                                                                          
  --signoff, -s                                                                                                         
  --allow-empty                                                                                                         
  --allow-empty-message                                                                                                 
  --amend                                                                                                               
  --include, -i                                                                                                         
  --only, -o                                                                                                            
  --verbose, -v                                                                                                         
  --dry-run                                                                                                             
  --quiet, -q                                                                                                           
  --status                                                                                                              
  --no-status                                                                                                           
  --date DATE                                                                                                           
  --file FILE, -F FILE                                                                                                  
  --message MESSAGE, -m MESSAGE

Filenames should be specified in RISC OS form. Branch and tag names should be specified in the local alphabet and will be converted to UTF-8. If you want to play, create a directory on the server with your name - as it's a shared server - and work inside it, eg:


*cdir gerph                                                                                                             
*dir gerph                                                                                                              
*git init                                                                                                               
Initialized empty Git repository in /home/riscos/fs/gerph/.git/                                                         
*edit MyFile
(write some text - exit with shift-ctrl-x)
*git status
On branch master                                                                                                        
                                                                                                                        
No commits yet                                                                                                          
                                                                                                                        
Untracked files:                                                                                                        
  (use "git add <file>..." to include in what will be committed)                                                        
                                                                                                                        
        MyFile                                                                                                          
                                                                                                                        
nothing added to commit but untracked files present (use "git add" to track)                                            
*git add MyFile
*git commit
(write a description - exit with shift-ctrl-x)
[master (root-commit) 0c83967] My new description.                                                                          
 1 file changed, 2 insertions(+)                                                                                        
 create mode 100644 MyFile

Member
Posts: 118

Wow. Is this a native Git solution for RISC OS? Or does is it a wrapper of some sort that utilizes the host's Git program?

Either way, it's very clever and impressive.

Member
Posts: 48

Wow. Is this a native Git solution for RISC OS? Or does is it a wrapper of some sort that utilizes the host's Git program?

Either way, it's very clever and impressive.

This is a wrapper to the host git. I'm in the process of writing up some documentation and then I'll do a 'play along' description of how it works. It's largely intended for use with the shell as a demonstration and within CI to make it easy to perform operations that would otherwise need to be done on the host side. But it's also intended to make it easy for people to see how git works within a RISC OS environment.

As for how it works... yes, it calls down to the host git, processes the output and presents it to the user as RISC OS output.

I created a couple of diagrams after it was working to show how it fits together:

Sequence chart for PyromaniacGit commands

* User types commands.
* They're transformed into things that can be used by the host system's git tool.
* The git command is executed.
* Output is parsed for ANSI codes.
* ColourTrans operations are performed
* Output is transformed from UTF-8 to current alphabet.
* Output is written to VDU.

All the while checking for escape.

There's a slightly more complicated process when the user wants to provide authentication details by inputing their user name and password to the host git tool, but I suspect that most people won't care about that level of detail about how it's made to work smoothly.

Member
Posts: 48

I'm in the process of adding call outs to the host UI for requesting user name and password details (again, this is probably way more than anyone else would care for, but I love being able to provide an integration with the host environment).

Under RISC OS Pyromaniac, different ways of doing things are provided through 'implementations'. The default implementation usually does nothing, or does something simple, but these can then be extended by providing a new implementation which does more fancy things. In the case of the 'askpass' code I'm working on, I intend that to be a window that prompts for the details when you run in the UI.

I've just managed to get the initial 'readline' implementation working. This takes the code that was inline which called OS_ReadLine and instead moves it to be inside an implementation. And it's working!

This is how it looks when it's working - it's not that exciting, though:


charles@laputa ~/projects/RO/pyromaniac (master)> pyrodev --gos
Supervisor

*git fetch
Username for 'https://gitlab.gerph.org': gerph
Password for 'https://gerph@gitlab.gerph.org': ******
remote: HTTP Basic: Access denied
fatal: Authentication failed for 'https://gitlab.gerph.org/riscos/pyromaniac.git/'

The username and password prompts are provided by the Python implementation which calls standard RISC OS interfaces to perform the operations. The implementation of the request looks like this:


password = False
if reqtype == 'string':
    password = False
elif reqtype == 'password':
    password = True
else:
    raise ValueError("Request type '{}' not supported".format(reqtype))

# If the prompt didn't end in a space, let's tidy it up so that it looks nicer.
if not reqprompt.endswith(' '):
    reqprompt += ' '

# We've been given unicode, but actually we're just passing back to RISC OS,
# so we need to convert back.
reqprompt = self.encode(reqprompt)

self.ro.kernel.write(reqprompt)
response = self.ro.kernel.api.os_readline(None, password=password)

# The response needs to be returned as unicode, even though it'll be decoded
# immediately. But handle Escape separately.
if response is not None:
    response = self.decode(response)

return response

Which probably isn't that exciting to people, but I think it's kinda cute.

Of course, after doing this I need to commit the code that changed, so I can start doing that under RISC OS as well:


*git checkout -b request-input-implementation
Switched to a new branch 'request-input-implementation'
*git add riscos.requestinput/py
*git add riscos.requestinputimp
*git status --untracked=no
On branch request-input-implementation
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   riscos/requestinput.py
        new file:   riscos/requestinputimp/__init__.py
        new file:   riscos/requestinputimp/readline.py

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   riscos/kernel.py
        modified:   riscos/pymods/pyromaniacgit/githelper.py
        modified:   riscos/texteditor.py

Untracked files not listed (use -u option to show untracked files)

What you can see here is that I created a new branch and switched to it, then added the new files that I've created. Because I'm inside RISC OS the filenames are added with git add using their RISC OS filenames. The second add is of a directory, so all the files within that directory are added.

Finally, I list the status of the repository (but ignore the untracked files - there's lots of test and experimental files in my working directory), and this shows up the limitations of this git tool. The filenames appear as host format, rather than RISC OS format. For now that's fine as this isn't meant to be perfect, but obviously any real port would be showing you filenames in RISC OS format. In the future I might add post-processing to allow that to work.

I've also made changes to the text editor because whilst I was doing this I noticed some slightly unsafe configuration.

Anyhow, that's a little of how it works, and of using it in anger.

	RISC OS Users Xmas screenshots 2022 - Gerph
	gerph (18:22 20/12/2022) gerph (23:54 20/12/2022) nytrex (18:10 23/12/2022) gerph (14:07 26/12/2022) gerph (14:26 26/12/2022)

Charles Justin Ferguson	Message #125376, posted by gerph at 18:22, 20/12/2022
Member Posts: 48	Sorry for small typos in the text - 3rd paragraph should read 'On the left of the screenshot', and the 6th paragraph should read 'The different dumping formats, and explorer were added in the past few months'. The PyromaniacGit implementation is now very functional, and I'll write more about it soon. Although it wasn't mentioned here, I use Linux on my work machine, and Pyromaniac works just as well on there as it does on macOS. So although macOS is my working environment generally, it's not that different on Linux.
	[ Log in to reply ]

Charles Justin Ferguson	Message #125377, posted by gerph at 23:54, 20/12/2022, in reply to message #125376
Member Posts: 48	The shell server at https://shell.riscos.online/ has now been updated with the latest version of RISC OS Pyromaniac which includes the functional PyromaniacGit module. This allows regular git operations to be performed, from within RISC OS. I'll write more about what you can do and how it works later, but it is there and it works. Not all commands are supported, and within the commands, not all switches. However, most work just as you would expect. help git ==> Help on keyword 'Git' (PyromaniacGit) Interface to the host 'git' command. This command must be supplied a command which many different parameters. More information on the options can be found through the help command: Git help - lists the available commands. Git help <command> - lists options for a command. The operation of the git command is based on that of the host system. Whilst the interface has many limitations, it should be able to be used in a similar way to the standard version. Filenames should be able to be specified in RISC OS format and will be translated to the host format. To function, many of the environment variables from the original system have been mapped to a form more like the manner that RISC OS functions. These variables and their translation are described in 'Help GitVariables'. For more information on the meaning of the options for commands, please refer to the standard documentation (https://git-scm.com/docs). Commands: add Add file contents to the index annotate Annotate file lines with commit information blame Show what revision and author last modified each line of a file branch List, create, or delete branches checkout Switch branches or restore working tree files cherry-pick Apply the changes introduced by some existing commits clean Remove untracked files from the working tree clone Clone a repository into a new directory commit Record changes to the repository describe Give an object a human readable name based on an available ref diff Show changes between commits, commit and working tree, etc fetch Fetch from another repository or a local branch help Display help for a given command init Create an empty Git repository or reinitialize an existing one log Show commit logs merge Join two or more development histories together mv Move or rename a file or directory pull Fetch from and integrate with another repository or a local branch push Push to a remote repository rebase Reapply commits on top of another base tip reflog Manage reflog information remote Manage set of tracked repositories reset Reset current HEAD to the specified state rev-parse Pick out and massage parameters rm Remove files from the working tree and from the index show Show various types of objects stash Stash the changes in a dirty working directory away status Show the working tree status switch Switch branches tag Create, list, and delete tags on objects version Report the version of git on the host and RISC OS system Syntax: Git <command> [<options>] For example, the `commit` command only supports some of the operations: git help commit Syntax: Git commit <options> Record changes to the repository positional arguments: FILES optional arguments: --help, -h --all, -a --short --branch, -b --long --ahead-behind --no-ahead-behind --renames --no-renames --signoff, -s --allow-empty --allow-empty-message --amend --include, -i --only, -o --verbose, -v --dry-run --quiet, -q --status --no-status --date DATE --file FILE, -F FILE --message MESSAGE, -m MESSAGE Filenames should be specified in RISC OS form. Branch and tag names should be specified in the local alphabet and will be converted to UTF-8. If you want to play, create a directory on the server with your name - as it's a shared server - and work inside it, eg: cdir gerph dir gerph git init Initialized empty Git repository in /home/riscos/fs/gerph/.git/ edit MyFile (write some text - exit with shift-ctrl-x) git status On branch master No commits yet Untracked files: (use "git add <file>..." to include in what will be committed) MyFile nothing added to commit but untracked files present (use "git add" to track) git add MyFile *git commit (write a description - exit with shift-ctrl-x) [master (root-commit) 0c83967] My new description. 1 file changed, 2 insertions(+) create mode 100644 MyFile
	[ Log in to reply ]

Alan Robertson	Message #125379, posted by nytrex at 18:10, 23/12/2022, in reply to message #125377
Member Posts: 118	Wow. Is this a native Git solution for RISC OS? Or does is it a wrapper of some sort that utilizes the host's Git program? Either way, it's very clever and impressive.
	[ Log in to reply ]

Charles Justin Ferguson	Message #125381, posted by gerph at 14:07, 26/12/2022, in reply to message #125379
Member Posts: 48	Wow. Is this a native Git solution for RISC OS? Or does is it a wrapper of some sort that utilizes the host's Git program? Either way, it's very clever and impressive. This is a wrapper to the host git. I'm in the process of writing up some documentation and then I'll do a 'play along' description of how it works. It's largely intended for use with the shell as a demonstration and within CI to make it easy to perform operations that would otherwise need to be done on the host side. But it's also intended to make it easy for people to see how git works within a RISC OS environment. As for how it works... yes, it calls down to the host git, processes the output and presents it to the user as RISC OS output. I created a couple of diagrams after it was working to show how it fits together: * User types commands. * They're transformed into things that can be used by the host system's git tool. * The git command is executed. * Output is parsed for ANSI codes. * ColourTrans operations are performed * Output is transformed from UTF-8 to current alphabet. * Output is written to VDU. All the while checking for escape. There's a slightly more complicated process when the user wants to provide authentication details by inputing their user name and password to the host git tool, but I suspect that most people won't care about that level of detail about how it's made to work smoothly.
	[ Log in to reply ]

Charles Justin Ferguson	Message #125382, posted by gerph at 14:26, 26/12/2022, in reply to message #125381
Member Posts: 48	I'm in the process of adding call outs to the host UI for requesting user name and password details (again, this is probably way more than anyone else would care for, but I love being able to provide an integration with the host environment). Under RISC OS Pyromaniac, different ways of doing things are provided through 'implementations'. The default implementation usually does nothing, or does something simple, but these can then be extended by providing a new implementation which does more fancy things. In the case of the 'askpass' code I'm working on, I intend that to be a window that prompts for the details when you run in the UI. I've just managed to get the initial 'readline' implementation working. This takes the code that was inline which called OS_ReadLine and instead moves it to be inside an implementation. And it's working! This is how it looks when it's working - it's not that exciting, though: charles@laputa ~/projects/RO/pyromaniac (master)> pyrodev --gos Supervisor git fetch Username for 'https://gitlab.gerph.org': gerph Password for 'https://gerph@gitlab.gerph.org': ***** remote: HTTP Basic: Access denied fatal: Authentication failed for 'https://gitlab.gerph.org/riscos/pyromaniac.git/' The username and password prompts are provided by the Python implementation which calls standard RISC OS interfaces to perform the operations. The implementation of the request looks like this: password = False if reqtype == 'string': password = False elif reqtype == 'password': password = True else: raise ValueError("Request type '{}' not supported".format(reqtype)) # If the prompt didn't end in a space, let's tidy it up so that it looks nicer. if not reqprompt.endswith(' '): reqprompt += ' ' # We've been given unicode, but actually we're just passing back to RISC OS, # so we need to convert back. reqprompt = self.encode(reqprompt) self.ro.kernel.write(reqprompt) response = self.ro.kernel.api.os_readline(None, password=password) # The response needs to be returned as unicode, even though it'll be decoded # immediately. But handle Escape separately. if response is not None: response = self.decode(response) return response Which probably isn't that exciting to people, but I think it's kinda cute. Of course, after doing this I need to commit the code that changed, so I can start doing that under RISC OS as well: git checkout -b request-input-implementation Switched to a new branch 'request-input-implementation' git add riscos.requestinput/py git add riscos.requestinputimp git status --untracked=no On branch request-input-implementation Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: riscos/requestinput.py new file: riscos/requestinputimp/__init__.py new file: riscos/requestinputimp/readline.py Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: riscos/kernel.py modified: riscos/pymods/pyromaniacgit/githelper.py modified: riscos/texteditor.py Untracked files not listed (use -u option to show untracked files) What you can see here is that I created a new branch and switched to it, then added the new files that I've created. Because I'm inside RISC OS the filenames are added with `git add` using their RISC OS filenames. The second add is of a directory, so all the files within that directory are added. Finally, I list the status of the repository (but ignore the untracked files - there's lots of test and experimental files in my working directory), and this shows up the limitations of this git tool. The filenames appear as host format, rather than RISC OS format. For now that's fine as this isn't meant to be perfect, but obviously any real port would be showing you filenames in RISC OS format. In the future I might add post-processing to allow that to work. I've also made changes to the text editor because whilst I was doing this I noticed some slightly unsafe configuration. Anyhow, that's a little of how it works, and of using it in anger.
	[ Log in to reply ]

Forums

User accounts

Forum stats

Search the forums

Recent discussions

Related articles

Latest postings

Site Search

RISC OS Users Xmas screenshots 2022 - Gerph