git / github workflow in stash

khilnani

also, i should add that ssh might be better for private repos in general. you iust have to set up the keys and then it just works.

Hmmm.. For some reason i didnt try ssh when i use that everywhere else. I guess, i assumed it wouldnt work since Pythonista is an 'app'.

I did try your other suggestion and that didnt work. Seems like on ssh keys work with git@ urls and not https at all.

Might send a PR to https://github.com/jsbain/stash_git_tutorial/blob/master/stash_git_tutorial.md ... Noticed it mentions ssh in an upcoming update :)

Thanks for helping!!! @JonB

JonB

did ssh work for you?
Here is the section of an updated git tutorial (though i can't push it because I am in the midst of removing the gittle dependencies in stash git, so dont have a fully working git)

Setting up ssh keys

In some cases, you may need or want to use ssh instead of https. This is a somewhat more reliable way of pushing, though it can be a little slower. This might also work for private repos.

With guthub, the process is facilitated by the gh command in stash:

[git_tutorial]$ gh create_key stash

creates a key, and adds it to your github account. Note this command uses the stored github password, so you will have to create a key in your keychain, or better yet just use git push on an existing repo.

If you are using a non-github ssh, bitbucket, etc, you can create an ssh key

$ ssh-keygen -trsa -b2048
pbcopy ~/.ssh/id_rsa.pub

creates a key, and copies the public key to the clipboard. You can then paste this into whatever you use for setting up the keys on the server.

Next, we need to add a remote to an existing repo:

[git_tutorial]$ git remote originssh ssh://git@github.com/jsbain/stash_git_tutorial.git

Now you can fetch/push,etc from originssh

[git_tutorial] git push originssh

khilnani

@JonB ssh keys worked after setting up in pythonista and github. Thanks!

Am still working through a few scenarios:
1 - moving files. Noticed there is no git mv command.
2 - adding directories with sub directories. Seems like need to add complete relative path of the files in each directory (* works) while in the main dir with .git
3 - files deleted without git rm. eg. deleting from pythonista GUI. git status, git pull etc. all fail with a IO exception
4 - Files deleted remotely - after a git pull, any file deleted remotely is auto staged to be added instead of being removed locally

JonB

yes, removing files is probably not handled well... how does git handle rm without git rm?

i actually recommend against git pull in most cases, it will happily onliterate any local changes. i tend to use git fetch followed by git merge, which at least tries to do sane things (though is not exactly like the real git merge). iirc git reset can be helpful when files get deleted without git rm.

I am in the process of removing gittle dependencies, and will then be able to use the most recent dulwich. Some improvements have already been made to dulwich.porcelain, and this would let us make pull requests to dulwich...

khilnani

@JonB said:

yes, removing files is probably not handled well... how does git handle rm without git rm?

from what ive seen, it treats them as if git rm was called and auto stages the removes

i actually recommend against git pull in most cases, it will happily onliterate any local changes. i tend to use git fetch followed by git merge, which at least tries to do sane things (though is not exactly like the real git merge). iirc git reset can be helpful when files get deleted without git rm.

git fetch OR git fetch origin OR even fit fetch git@gihub... gives an error -

stash: <type 'exceptions.Exception'>: url must match a remote name, or must start with http:// or https://

i tried git reset after manually deleting a file. didnt seem to help. Still get

stash: <type 'exceptions.OSError'>: [Errno 2] No such file or directory: '/private/var/mobile/Containers/Shared/AppGroup/A90BB332.......ACD7F/Pythonista3/Documents/pythonista-scripts/test'

I am in the process of removing gittle dependencies, and will then be able to use the most recent dulwich. Some improvements have already been made to dulwich.porcelain, and this would let us make pull requests to dulwich...

cool !!!!

Thanks so much for helping out!!!

mikael

Tried gh create_key stash, which failed because it could not import jwt. Tried pip installing jwt, which partially failed installing dependency typing. Trying the original command again, which failed with syntax error in jwk.py (which makes sense if it depends on typing).

This with latest vanilla version of Pythonista 3 and an updated version of stash.

JonB

hmm, @mikael, can you post the traceback? I don't have jwt installed, must be a module collision somewhere

mikael

@JonB, not sure how to get a traceback. Here's what happens:

gh create_key stash
no github found in /private/var/mobile/Containers/Shared/AppGroup/447A26CB-FA57-4E8A-8C34-082F55AD274F/Pythonista3/Documents/site-packages/stash/lib
Installing pygithub master ...
Opening: https://github.com/pygithub/pygithub/archive/master.zip
Save as: /private/var/mobile/Containers/Data/Application/33F31BE9-F7A7-4092-8AFE-9E3C77723213/tmp//pygithub.zip 
   3168996
Done
stash: <type 'exceptions.ImportError'>: No module named jwt

JonB

stashconf py_traceback 1

then run the command

mikael

Thanks. As I started stash to do this, I got a tip with that exact same line for enabling tracebacks. Funny - or scary, depending on how you see the world.

Here's the trace:

Traceback (most recent call last):
  File "/private/var/mobile/Containers/Shared/AppGroup/447A26CB-FA57-4E8A-8C34-082F55AD274F/Pythonista3/Documents/site-packages/stash/system/shruntime.py", line 498, in exec_py_file
    exec code in namespace, namespace
  File "site-packages/stash/bin/gh.py", line 44, in <module>
    import github
  File "/private/var/mobile/Containers/Shared/AppGroup/447A26CB-FA57-4E8A-8C34-082F55AD274F/Pythonista3/Documents/site-packages/stash/lib/github/__init__.py", line 37, in <module>
    from MainClass import Github, GithubIntegration
  File "/private/var/mobile/Containers/Shared/AppGroup/447A26CB-FA57-4E8A-8C34-082F55AD274F/Pythonista3/Documents/site-packages/stash/lib/github/MainClass.py", line 34, in <module>
    import jwt
ImportError: No module named jwt

JonB

Hmm, okay, pygithub now depends on pyjwt. It used to be dependency free, so could just install it directly.

pip install pyjwt

should fix the issue, though i will have to update gh to maybe use pip to install pygithub (or install a specific version).

mikael

@JonB, thanks, installing pyjwt - not jwt - fixed the issue.

JonB

Does gh actually work for you? I note that jwt requires cryptography for certain algorithms, you can be forced to use pycrypto/ecsda instead. Just curious if anything we are using requires that.

mikael

@JonB, yes, it worked, to the extent that new key was added to the github account. Further testing later.

shtek

just tried git push.
first generate rsa key using ssh-keygen

,
then add the generated pub key to my site,
then push:

[pythonistascripts]$ git push
Attempting to push to: git@code.mysite.net:shtek/pythonistascripts.git, branch: refs/heads/master
stash: <type 'exceptions.TypeError'>: expected a string or other character buffer object

I don't know what this error means, but after I check the code site, I find that everything has been successfully pushed.

so this is an ignorable error?

zrzka

Yes, it is. Or just update StaSh to dev (selfupdate -f dev) where this is fixed already.

zrzka

Also be aware that ...

git status doesn't show untracked files (#265)
git push doesn't warn you that you have to sync your repo with remote and simply overwrites history (#268)

... I constantly forget to git add files, when I edit readme on GH and forget to pull before push, my GH changes are lost.

shtek

edit readme on GH and forget to pull before push, my GH changes are lost

tested on my git site, same problem.

never thought this could happen. maybe sometimes this is useful ...... I don't need to delete the repo and rebuild it to change history :)

zrzka

It's a bug. Never ever do this in repos where someone else has access as well.