|
|
|
Created:
14 years, 1 month ago by mattn Modified:
14 years, 1 month ago CC:
golang-dev Visibility:
Public. |
misc/windows: godocserver destroy cmd.exe
use 'exit /b 1'.
Patch Set 1 #Patch Set 2 : diff -r f03312eab4ce http://go.googlecode.com/hg/ #Patch Set 3 : diff -r f03312eab4ce http://go.googlecode.com/hg/ #Patch Set 4 : diff -r cc4e4e6675a3 http://go.googlecode.com/hg/ #Total messages: 12
|
mattn
Hello golang-dev@googlecode.com (cc: golang-dev@googlegroups.com), I'd like you to review this change to http://go.googlecode.com/hg/
|
14 years, 1 month ago (2011年12月13日 12:03:30 UTC) #1 |
Hello golang-dev@googlecode.com (cc: golang-dev@googlegroups.com), I'd like you to review this change to http://go.googlecode.com/hg/
LGTM Do you want a non-zero exit number, though? exit /b 1 I don't know what Windows error numbers are, conventionally. On Tue, Dec 13, 2011 at 4:03 AM, <mattn.jp@gmail.com> wrote: > Reviewers: golang-dev_googlecode.com, > > Message: > Hello golang-dev@googlecode.com (cc: golang-dev@googlegroups.com), > > I'd like you to review this change to > http://go.googlecode.com/hg/ > > > Description: > misc/windows: godocserver destroy cmd.exe > use 'exit /b'. > > Please review this at http://codereview.appspot.com/**5488059/<http://codereview.appspot.com/5488059/> > > Affected files: > M misc/windows/godocserver.bat > > > Index: misc/windows/godocserver.bat > ==============================**==============================**======= > --- a/misc/windows/godocserver.bat > +++ b/misc/windows/godocserver.bat > @@ -6,7 +6,7 @@ > echo Unable to find the godoc executable > echo This batch file must run from the root Go folder > pause > -exit > +exit /b > > :ok > start bin\godoc -http=localhost:6060 -goroot="%cwd%" > > >
LGTM /b is to exit the script but not the cmd shell
the patch doesn't apply cleanly (hg sync and mail)
really? I had 'hg sync' and see 'hg diff'. but it include just this line. I uploaded 'exit /b 1' changes. On 2011年12月13日 21:04:07, Joe Poirier wrote: > the patch doesn't apply cleanly (hg sync and mail)
On 2011年12月14日 01:30:02, mattn wrote: > really? I had 'hg sync' and see 'hg diff'. but it include just this line. > > I uploaded 'exit /b 1' changes. > > On 2011年12月13日 21:04:07, Joe Poirier wrote: > > the patch doesn't apply cleanly (hg sync and mail) Hmmm. I just upgraded my MBP to Lion, which may have messed with my folder/file permissions or something.
On Wed, Dec 14, 2011 at 11:05 AM, <jdpoirier@gmail.com> wrote: > Hmmm. I just upgraded my MBP to Lion, which may have messed with my > folder/file permissions or something. Not sure the reason but me too. % patch -p1 < issue5488059_4.diff patch --verbose -p1 < patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: misc/windows/godocserver.bat |=================================================================== |--- a/misc/windows/godocserver.bat |+++ b/misc/windows/godocserver.bat -------------------------- Patching file misc/windows/godocserver.bat using Plan A... Hunk #1 FAILED at 6. 1 out of 1 hunk FAILED -- saving rejects to file misc/windows/godocserver.bat.rej Hmm... Ignoring the trailing garbage. done % patch --version patch 2.5.8
Probably, the cause is that godocserver.bat is DOS format?
On 2011年12月14日 02:05:53, Joe Poirier wrote: > On 2011年12月14日 01:30:02, mattn wrote: > > really? I had 'hg sync' and see 'hg diff'. but it include just this line. > > > > I uploaded 'exit /b 1' changes. > > > > On 2011年12月13日 21:04:07, Joe Poirier wrote: > > > the patch doesn't apply cleanly (hg sync and mail) > > Hmmm. I just upgraded my MBP to Lion, which may have messed with my folder/file > permissions or something. Output from the raw patch $ patch --dry-run -p1 < issue5488059_4_5002.diff patching file misc/windows/godocserver.bat Hunk #1 FAILED at 6. 1 out of 1 hunk FAILED -- saving rejects to file misc/windows/godocserver.bat.rej
Sorry, didn't see the previous updated posts. Is it whitespace?
On Wednesday, December 14, 2011 12:09:34 PM UTC+9, Joe Poirier wrote: > > Output from the raw patch > > $ patch --dry-run -p1 < issue5488059_4_5002.diff > patching file misc/windows/godocserver.bat > Hunk #1 FAILED at 6. > 1 out of 1 hunk FAILED -- saving rejects to file > misc/windows/godocserver.bat.rej > > http://codereview.appspot.com/5488059/ > Yes, codereview.py make post data with using foo.splitlines(). So \r is dropped. And I tried to post \r\n to codereview.appspot.com, But \r seems to be dropped. It seems that need to add workaround for \r into src/pkg/patch.
I tried to post original diff. https://gist.github.com/1475303 Please see the patch. And posted binary data 'payload.bin'. You can get payload data that include \r. https://raw.github.com/gist/1475303/payload.bin But codereview server output as text like http://codereview.appspot.com/download/issue5483068_1003_2002.diff It seens need to change src/pkg/patch.