Welcome!
This is the community forum for my apps Pythonista and Editorial.
For individual support questions, you can also send an email. If you have a very short question or just want to say hello — I'm @olemoritz on Twitter.
JavaScriptCore adding custom functions
-
what is the push command you used? it should be simply
git push
orgit push origin
. If you type anything after push which is not a name of a repo, it interprets it as a url. -
StaSh v0.4.3 [~/Documents]$ cd site-packages [site-packages]$ cd OpenGLES [OpenGLES]$ git remote origin https://github.com/Cethric/OpenGLES-Pythonista.git [OpenGLES]$ git push master Attempting to push to: master, branch: refs/heads/master Enter username: Cethric Enter password: password stash: <type 'exceptions.OSError'>: [Errno 1] Operation not permitted [OpenGLES]$ stashconf py_traceback 1 [OpenGLES]$ git push master Attempting to push to: master, branch: refs/heads/master Enter username: Cethric Enter password: password stash: <type 'exceptions.OSError'>: [Errno 1] Operation not permitted Traceback (most recent call last): File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/stash.py", line 1234, in exec_py_file execfile(file_path, namespace, namespace) File "../stash/bin/git.py", line 723, in <module> ns.func(args) File "../stash/bin/git.py", line 565, in git_push porcelain.push(repo.repo.path, result.url, branch_name, opener=opener) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/porcelain.py", line 533, in push r.object_store.generate_pack_contents, progress=errstream.write) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/client.py", line 450, in send_pack proto, unused_can_read = self._connect('receive-pack', path) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/client.py", line 648, in _connect stderr=self._stderr)) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/subprocess.py", line 711, in __init__ errread, errwrite) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/subprocess.py", line 1205, in _execute_child self.pid = os.fork() OSError: [Errno 1] Operation not permitted [OpenGLES]$
I also tryed
git push origin
however that failed with a broken pipe -
git push master
tries to push to a url named master!broken pipe is usually caused by the current branch not being a direct descendant of the remote repo. you need to do a fetch/merge first, then commit, and push again.
-
git fetch origin git merge origin/master git commit git push
should work. although i just had dulwich fail when i tried to fetch from ywangd/stash.git...
basically, if you ever make changes on github, including just editing Readme.md, your local repo is no longer a descendant of the remote. if you commit locally, github cant deal with that situation, it wants only fast forward changes. so you must merge locally first.
-
Unfortunately this is still an error
[OpenGLES]$ git fetch origin imported refs/remotes/origin/master 03b88f1b46485cab6e7a9f4e51bd442b34c4d3a1 [OpenGLES]$ git merge origin/master ['origin/master'] ______________________________ head is already up to date [OpenGLES]$ git push Attempting to push to: https://github.com/Cethric/OpenGLES-Pythonista.git, branch: refs/heads/master Enter username: Cethric Enter password: password stash: <class 'urllib2.URLError'>: <urlopen error [Errno 32] Broken pipe> Traceback (most recent call last): File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/stash.py", line 1234, in exec_py_file execfile(file_path, namespace, namespace) File "../stash/bin/git.py", line 723, in <module> ns.func(args) File "../stash/bin/git.py", line 565, in git_push porcelain.push(repo.repo.path, result.url, branch_name, opener=opener) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/porcelain.py", line 533, in push r.object_store.generate_pack_contents, progress=errstream.write) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/client.py", line 1022, in send_pack data=req_data.getvalue()) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/client.py", line 978, in _smart_request resp = self._http_request(url, headers, data) File "/private/var/mobile/Containers/Shared/AppGroup/877D6E00-D22C-4407-9A69-C27FA4B9356A/Documents/site-packages/stash/lib/dulwich/client.py", line 943, in _http_request resp = self.opener.open(req) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/urllib2.py", line 405, in open response = self._open(req, data) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/urllib2.py", line 423, in _open '_open', req) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/urllib2.py", line 383, in _call_chain result = func(*args) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/urllib2.py", line 1223, in https_open return self.do_open(httplib.HTTPSConnection, req) File "/var/mobile/Containers/Bundle/Application/FD006978-84C6-4483-A56E-1A3F28092E50/Pythonista.app/Frameworks/PythonistaKit.framework/pylib/urllib2.py", line 1185, in do_open raise URLError(err) URLError: <urlopen error [Errno 32] Broken pipe> [OpenGLES]$
-
hmm. can you show me the output of git branch, git branch -r, and
git log -l 25 -fmerge:{merge}\ncommit:{commit}\n------
What you can also try: create a new clone, in a different folder, copy in your changes from the other folder, commit and push. -
[OpenGLES]$ git branch * master 94c5a82 [ origin/master 03b88f1] [OpenGLES]$ git branch -r origin/master 03b88f1 [OpenGLES]$ git log -l 25 -fmerge:{merge}\ncommit:{commit}\n----- merge: commit:94c5a825317121c1e7e808826812104d0b1b4484 ----- merge: commit:03b88f1b46485cab6e7a9f4e51bd442b34c4d3a1 ----- merge: commit:ec742c54bb24114c69e8c4d70b84b611c6615e43 ----- merge: commit:f4c938ef075431a6a28cd9b23481839d454d11bd ----- merge: commit:fd6c368b46ed13b2c3f0b462b336c8ee2708131b ----- merge: commit:6898e37344b6f94886319ad8d46f88dc28bf653b ----- merge: commit:8e540065e27d06ac36ed22cfd4140a0101f3f032 ----- merge: commit:7cf032ed95253b800423a92ac012d77fe131c152 ----- [OpenGLES]$
That was a new folder, how ever I will try again
-
Unfortunately in my attempts to get git to work again I have lost a lot of my work, so while the newest data is there there are still some components with I will need to fix.
-
try
git branch recovery 94c5a82 git checkout recovery
if you just committed over top of your old work, it is still there
-
Unfortunately the loss occurred before I made any push to Github so my files are not there, I will be checking my iTunes backups later today to see if the files are there. Otherwise I will not be able to do any more work on this for at least another 2 weeks due to exams.
-
how did the loss occur? if you committed it locally, it may still be hidden in the repo, unless you deletd the entire folder. if you simply did a pull, or copied files over, or deleted all, you may be in luck. it might not show up in the log... let me refresh my memory on how to search for headless objects.
-
The loss occured when transfering the files from the old directry to the new one, how ever I did not check to make sure that the files had actually been move before deleting the old files (I have also emptied the .Trashes folder so I can not recover from there either)
-
@Cethric Did you delete the old folder (including the hidden Git folder)? If the .git folder is there, you should be able to:
from dulwich import porcelain import os os.chdir(theoldfolder) o=porcelain.Repo('.').object_store commit=o['94c5a825317121c1e7e808826812104d0b1b4484'] tree=o[commit.tree] print tree._entries
You can plug the sha strings in the tree for the file you are looking for into the object store o, which returns a Blob object. You can then use
as_raw_string()
and write the result to a file. -
Unfortunatly i have deleted the directory including the .git folder. The issue is there was no commit with the contents of the files I lost
-
I have been able to replace the files however nothing renders now
-
Due to my post somehow being marked as spam it is now here
-
which euclid library are you using? what is the pip name, or github repo?
-
This is the repo listed in the header part of the file. http://code.google.com/p/pyeuclid
-
Anyone have an idea why it isn't working?
-
I took a look, although didnt get too far.
My one observation is that it seems like you are swinging for the fences.... you have shaders, view/perspective manipulation, physics, models loading from xml, render loops, etc.... have you tried taking a step back and drawing a single stationary triangle with the default shader?
It seems like there are many things that can go wrong for folks, like floats vs ints, working in normalized vs screen coords, getting the coordinate systems wrong (for instance ios screen coords are upper left, but gl is bottom left). I have to say what you have started here looks pretty cool.