[Python-Dev] CRLF line endings
Hi, A commit hook prevented pushing changes to the cdecimal repository: pushing to ssh://h...@hg.python.org/features/cdecimal searching for changes 8 changesets found remote: adding changesets remote: adding manifests remote: adding file changes remote: added 8 changesets with 117 changes to 117 files remote: error: pretxnchangegroup.eol hook failed: Modules/cdecimal/tests/dnloop.patch in 80914c366edf should not have CRLF line endings remote: transaction abort! remote: rollback completed remote: abort: Modules/cdecimal/tests/dnloop.patch in 80914c366edf should not have CRLF line endings However, dnloop.patch is correct and must have CRLF line endings. How can I disable the commit hook? Stefan Krah ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
[Python-Dev] CRLF line endings
To facilitate review of the PEP 405 reference implementation, I want to update my sandbox repository on hg.python.org with the relevant changes, so I can create a patch for Rietveld. I've added some files with CRLF line endings: Lib/venv/scripts/nt/Activate.ps1 Lib/venv/scripts/nt/Dectivate.ps1 Lib/venv/scripts/nt/activate.bat Although these are text files, the CRLF line endings are needed because otherwise, the files won't be presented correctly on Windows, e.g. in Notepad. I'd like to update the .hgeol file to add these entries, as otherwise the commit hook rejects them. Can anyone please let me know if they object? Otherwise I'll go ahead and add them to .hgeol in the next hour or so. Regards, Vinay Sajip ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, Mar 25, 2011 at 7:36 PM, Stefan Krah wrote: > Hi, > > A commit hook prevented pushing changes to the cdecimal repository: > > pushing to ssh://h...@hg.python.org/features/cdecimal > searching for changes > 8 changesets found > remote: adding changesets > remote: adding manifests > remote: adding file changes > remote: added 8 changesets with 117 changes to 117 files > remote: error: pretxnchangegroup.eol hook failed: > Modules/cdecimal/tests/dnloop.patch in 80914c366edf should not have CRLF line > endings > remote: transaction abort! > remote: rollback completed > remote: abort: Modules/cdecimal/tests/dnloop.patch in 80914c366edf should not > have CRLF line endings > > > However, dnloop.patch is correct and must have CRLF line endings. How > can I disable the commit hook? Don't disable the commit hook, update .hgeol to flag that file as requiring CRLF line endings. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
Nick Coghlan wrote: > > However, dnloop.patch is correct and must have CRLF line endings. How > > can I disable the commit hook? > > Don't disable the commit hook, update .hgeol to flag that file as > requiring CRLF line endings. Thanks, that works well. Stefan Krah ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, 25 Mar 2011 21:12:19 +1000, Nick Coghlan wrote: > Don't disable the commit hook, update .hgeol to flag that file as > requiring CRLF line endings. Note however that we discovered that the server side hook looks at the .hgeol file in the *server's checkout*. I don't know if Georg or Antoine have fixed this or not (it's a standard Mercurial plugin, so probably not). So, I think that once you check in the .hgeol, you have to get a server admin to update the repo checkout on the server. Maybe we should set up a cron job. But, yeah, updating .hgeol is the correct solution, otherwise you'll just run in to the trouble when you try to merge the branch into default. -- R. David Murray http://www.bitdance.com ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, Mar 25, 2011 at 11:12 PM, R. David Murray wrote: > On Fri, 25 Mar 2011 21:12:19 +1000, Nick Coghlan wrote: >> Don't disable the commit hook, update .hgeol to flag that file as >> requiring CRLF line endings. > > Note however that we discovered that the server side hook looks at the > .hgeol file in the *server's checkout*. I don't know if Georg or Antoine > have fixed this or not (it's a standard Mercurial plugin, so probably > not). Not that I noticed - to get my sandbox updated after you moved all the email test files, I just had to one do push to get the .hgeol file updated, then the second push with all the subsequent changes went through without any trouble. The one thing you can't do is push an updated .hgeol *and* files that depend on the updated ruleset in one operation - the server will process the whole transaction using the *old* version of the .hgeol file and it will fail as a result. But "hg log .hgeol" will tell you which version last changed it, then a "hg push -r " will get the server's version updated. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, 25 Mar 2011 09:12:53 -0400 "R. David Murray" wrote: > On Fri, 25 Mar 2011 21:12:19 +1000, Nick Coghlan wrote: > > Don't disable the commit hook, update .hgeol to flag that file as > > requiring CRLF line endings. > > Note however that we discovered that the server side hook looks at the > .hgeol file in the *server's checkout*. I don't know if Georg or Antoine > have fixed this or not (it's a standard Mercurial plugin, so probably > not). We have "fixed" it by nulling the server's checkout (updating to it to changeset 00, that is). Unless someone logs in and manually does "hg up" in that directory, it shouldn't happen again. (but, yes, it's probably a bug or misfeature in hgeol) Regards Antoine. ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Thu, May 3, 2012 at 10:50 PM, Vinay Sajip wrote: > Although these are text files, the CRLF line endings are needed because > otherwise, the files won't be presented correctly on Windows, e.g. in Notepad. Not all Windows editors choke on \n line endings; when I'm on Windows and run into one, I open it in Wordpad (or, if I have one, a dedicated programming editor like SciTE or the Open Watcom editor). AFAIK only Notepad (of standard Windows utilities) has trouble. Not sure if that makes a difference or not. Chris Angelico ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
Chris Angelico gmail.com> writes: > Not all Windows editors choke on \n line endings; when I'm on Windows > and run into one, I open it in Wordpad (or, if I have one, a dedicated > programming editor like SciTE or the Open Watcom editor). AFAIK only > Notepad (of standard Windows utilities) has trouble. > > Not sure if that makes a difference or not. It's only really an issue for new / inexperienced users, I agree. Since these files are installed only on Windows systems, there's no reason for them not to have the native line endings. Regards, Vinay Sajip ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, May 4, 2012 at 1:28 AM, Vinay Sajip wrote: > It's only really an issue for new / inexperienced users, I agree. Since these > files are installed only on Windows systems, there's no reason for them not to > have the native line endings. Then sure, doesn't make a lot of difference that it's only Notepad. Somebody needs to rewrite that ancient editor and give Windows a better default... ChrisA ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
Zitat von Chris Angelico : On Thu, May 3, 2012 at 10:50 PM, Vinay Sajip wrote: Although these are text files, the CRLF line endings are needed because otherwise, the files won't be presented correctly on Windows, e.g. in Notepad. Not all Windows editors choke on \n line endings; when I'm on Windows and run into one, I open it in Wordpad (or, if I have one, a dedicated programming editor like SciTE or the Open Watcom editor). AFAIK only Notepad (of standard Windows utilities) has trouble. Not sure if that makes a difference or not. I think that .bat files strictly *have* to have CRLF line endings. Not sure about PowerShell, though. In any case, having CRLF for these files sounds good to me. Regards, Martin ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On 5/3/2012 2:00 PM, mar...@v.loewis.de wrote: I think that .bat files strictly *have* to have CRLF line endings. Nope. Both .bat and .cmd work fine with LF only in Win7 (and IIRC, in XP as well, but I just tested Win7) ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
Re: [Python-Dev] CRLF line endings
On Fri, May 4, 2012 at 7:00 AM, wrote: > In any case, having CRLF for these files sounds good to me. Right. While Windows has been getting much better at coping with LF only line endings over the years, being able to explicitly flag files for CRLF endings is the entire reason we held out for the EOL extension before making the switch to Mercurial. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
