git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@gmail.com>
To: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: git@vger.kernel.org
Subject: Re: StGIT cannot import properly from stdin
Date: Thu, 22 Sep 2005 13:11:40 +0100	[thread overview]
Message-ID: <tnxhdcd2tfn.fsf@arm.com> (raw)
In-Reply-To: <433290A5.5070008@drzeus.cx> (Pierre Ossman's message of "Thu, 22 Sep 2005 13:08:21 +0200")

Pierre Ossman <drzeus-list@drzeus.cx> wrote:
>>It works for me with the latest snapshot. What might happen in your
>>case is a missing "---" line after the patch description. The import
>>command reads the sys.stdin file descriptor until the first "---"
>>line. After that, the git.apply() function will read the rest of the
>>lines and pass them to git-apply. You can put some prints in the
>>git.apply() function to check where it starts reading from.
>
> Hmm... it seems you're kind of right. It doesn't need the patch twice.
> But it needs EOF more than once. The for-loop in __parse_patch() doesn't
> start until the EOF is recieved. And the second for-loop in _input()
> requires a new EOF.

The line below in __parse_patch() ensures that the 'for' loop does not
consume all the input lines:

        if re.match('---\s*$', line) or re.match('diff -', line):
            break

Unfortunately, if the '---' line is missing, it consumes all the input
lines. Is this the case with your patch?

> If you would cache the input to a file (or memory) you would remove both
> of these problems.

True, but it requires more work than simply writing the patch to a
file and reading it twice.

-- 
Catalin

  reply	other threads:[~2005-09-22 12:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-21  7:12 StGIT cannot import properly from stdin Pierre Ossman
2005-09-21  8:03 ` Catalin Marinas
2005-09-22 11:08   ` Pierre Ossman
2005-09-22 12:11     ` Catalin Marinas [this message]
2005-09-22 14:05       ` Pierre Ossman
2005-09-22 14:34         ` Catalin Marinas
2005-09-22 15:06           ` Pierre Ossman
2005-09-22 15:42             ` Catalin Marinas
2005-09-22 15:48               ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tnxhdcd2tfn.fsf@arm.com \
    --to=catalin.marinas@gmail.com \
    --cc=drzeus-list@drzeus.cx \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).