| Message ID | pull.1668.git.git.1714802221671.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Bug fix: ensure P4 "err" is displayed when exception is raised. | expand |
Hello Fahad, "Fahad Alrashed via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Fahad Alrashed <fahad@keylock.net> > > Bug fix: During "git p4 clone" if p4 process returns Nit: I haven't seen us use a prefix for the commit message. Also we use a max line length of 72 characters (see .editorconfig). The commit message seems to be wrapped at a much lower threshold. > an error from the server, it will store it in variable perhaps `in the 'err' variable` or `in a variable 'err'`. > "err". The it will send a text command "die-now" to s/The/Then > git-fast-import. However, git-fast-import raises an > exception: "fatal: Unsupported command: die-now" > and err is never displayed. This patch ensures that > err is dispayed using "finally:" > > Signed-off-by: Fahad Alrashed <fahad@keylock.net> > --- > In git p4, git fast-import fails from die-now command and err (from > Perforce) is not shown > > When importing from Perforce using git p4 clone <depot location>, > cloning works fine until Perforce command p4 raises an error. This error > message is stored in err variable then git-fast-import is sent a die-now > command to kill it. An exception is raised fatal: Unsupported command: > die-now. > > This patch forces python to call die() with the err message returned > from Perforce. > > This commit fixes the root cause of a bug that took me hours to find. > I'm sure many faced the cryptic error and declared that git-p4 is not > working for them. > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1668%2Falrashedf%2Fmaster-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1668/alrashedf/master-v1 > Pull-Request: https://github.com/git/git/pull/1668 > > git-p4.py | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) > > diff --git a/git-p4.py b/git-p4.py > index 28ab12c72b6..f1ab31d5403 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -3253,17 +3253,19 @@ def streamP4FilesCb(self, marshalled): > if self.stream_have_file_info: > if "depotFile" in self.stream_file: > f = self.stream_file["depotFile"] > - # force a failure in fast-import, else an empty > - # commit will be made > - self.gitStream.write("\n") > - self.gitStream.write("die-now\n") > - self.gitStream.close() > - # ignore errors, but make sure it exits first > - self.importProcess.wait() > - if f: > - die("Error from p4 print for %s: %s" % (f, err)) > - else: > - die("Error from p4 print: %s" % err) > + try: > + # force a failure in fast-import, else an empty > + # commit will be made > + self.gitStream.write("\n") > + self.gitStream.write("die-now\n") > + self.gitStream.close() > + # ignore errors, but make sure it exits first > + self.importProcess.wait() > + finally: > + if f: > + die("Error from p4 print for %s: %s" % (f, err)) > + else: > + die("Error from p4 print: %s" % err) > This part looks good. > if 'depotFile' in marshalled and self.stream_have_file_info: > # start of a new file - output the old one first > > base-commit: 235986be822c9f8689be2e9a0b7804d0b1b6d821 > -- > gitgitgadget Thanks, Karthik
diff --git a/git-p4.py b/git-p4.py index 28ab12c72b6..f1ab31d5403 100755 --- a/git-p4.py +++ b/git-p4.py @@ -3253,17 +3253,19 @@ def streamP4FilesCb(self, marshalled): if self.stream_have_file_info: if "depotFile" in self.stream_file: f = self.stream_file["depotFile"] - # force a failure in fast-import, else an empty - # commit will be made - self.gitStream.write("\n") - self.gitStream.write("die-now\n") - self.gitStream.close() - # ignore errors, but make sure it exits first - self.importProcess.wait() - if f: - die("Error from p4 print for %s: %s" % (f, err)) - else: - die("Error from p4 print: %s" % err) + try: + # force a failure in fast-import, else an empty + # commit will be made + self.gitStream.write("\n") + self.gitStream.write("die-now\n") + self.gitStream.close() + # ignore errors, but make sure it exits first + self.importProcess.wait() + finally: + if f: + die("Error from p4 print for %s: %s" % (f, err)) + else: + die("Error from p4 print: %s" % err) if 'depotFile' in marshalled and self.stream_have_file_info: # start of a new file - output the old one first