Re: [PATCH] git-p4: Handle p4 submit failure

2015-10-30 Thread Etienne Girard
Hello, > Note: this time, you do not need to resend the patch; just > please let me know if you want me to do the equivalent of > the above while applying to make your murex address and name > appear as the author in "git log" and "git shortlog" output. I'd like

[PATCH] git-p4: Handle p4 submit failure

2015-10-28 Thread Etienne Girard
Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne --- git-p4.py | 71 +-- 1 file changed, 37 insertions(+), 34 deletions(-) The p4

Re: ancestor and descendant ~ clarification needed

2015-10-22 Thread Etienne Girard
Hello, I think you're right, branch A is a descendant of master. We could change the misleading sentence to "However, if the current branch is a descendant of the other - if its head is a descendant of the other's head - [...]", to link back to the definition of descendant for commits.

Re: [PATCH] git-p4: import the ctypes module

2015-10-21 Thread Etienne Girard
claim, and thanks for the quick fix. 2015-10-21 10:23 GMT+02:00 Etienne Girard <etienne.g.gir...@gmail.com>: > Hello, > > I couldn't work further on this yesterday (but I read > Documentation/SubmittingPatches, which is a good start I guess). The > diff proposed by Dennis work

Re: [PATCH] git-p4: import the ctypes module

2015-10-21 Thread Etienne Girard
Hello, I couldn't work further on this yesterday (but I read Documentation/SubmittingPatches, which is a good start I guess). The diff proposed by Dennis works on my machine, I'll try to figure out why the original script worked with 2.7.10. Thanks 2015-10-21 1:00 GMT+02:00 Luke Diamand

Git-p4 fails with NameError with python 2.7.2

2015-10-20 Thread Etienne Girard
Hello, Git-p4 fail when I try to rebase with the error: "NameError: global name 'ctypes' is not defined". The error occurs when I use python 2.7.2 that is installed by default on my company's computers (it goes without saying that everything works fine with python 2.7.10). I'm a beginner in