Commit Graph

65 Commits

Author SHA1 Message Date
Martin Geisler
da42b93613 eol: handle LockUnavailable error (issue2569)
If the repository is not locked when clearing the dirstate, then
running test-eol.t in a loop fails sooner or later with:

  ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed
  --- /home/mg/src/mercurial-crew/tests/test-eol.t
  +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err
  @@ -343,6 +343,7 @@
     % hg status (eol activated)
     M win.txt
     % hg commit
  +  nothing changed
     % hg status
     $ testmixed CRLF

However, if we cannot lock the repository, then we can also not make a
commit and so we can simply ignore a LockUnavailable error.
2011-02-25 12:32:15 +01:00
Martin Geisler
3bd524372d eol: clarify where the .hgeol file is located 2011-02-25 10:52:37 +01:00
Martin Geisler
679f27515a merge with stable 2010-12-13 11:53:17 +01:00
Erik Zielke
cd263d594c eol: improve help on whether EOLs are changed in working copy or repository
Improved help to make it more clear for users which changes are only
changes in the working copy and which changes that will go into the
repository (on the following commit). Futhermore a note on when the
rules will be applied to the working directory.
2010-11-22 14:36:57 +01:00
Martin Geisler
750fe9abd1 eol: mention the hook in the module docstring 2010-11-13 15:57:12 +01:00
Colin Caughie
83d5ec6c25 eol: exclude .hgtags file from eol translation (issue2493) 2010-11-13 15:02:02 +01:00
Martin Geisler
ad31db42bf merge with stable 2010-11-13 15:57:40 +01:00
Martin Geisler
2f43114d9f eol: fix win32text encode/decode filter names 2010-11-13 15:46:51 +01:00
Martin Geisler
d9339ae620 merge with stable 2010-11-13 15:12:09 +01:00
Colin Caughie
b10fcb9768 eol: added filter aliases for backwards compatibility with win32text
This makes it possible to switch most win32text configurations (i.e. those
that use cleverencode and cleverdecode) to hgeol simply by disabling one and
enabling the other. Any rules found in repo-specific .hgeol files will be
appended to the configuration in .hgrc.
2010-11-10 20:26:56 +00:00
Georg Brandl
13bd1daeb5 eol: add missing word in module docstring 2010-10-21 17:02:08 +02:00
Steve Borho
8230ece29c Merge with stable 2010-09-15 17:48:03 -05:00
Steve Borho
6c61bc3690 eol: setup the repo.ui in reposetup()
This fixes problems some have reported using the eol extension
together with TortoiseHg.  It ensures the ui associated with the
repository has the preupdate.eol hook configured.
2010-09-15 17:46:51 -05:00
Brodie Rao
203cf2fbd9 cleanup: remove unused imports 2010-08-27 13:32:38 -04:00
Martin Geisler
d9fb8f71e1 eol: extension for managing file EOLs 2010-05-31 21:37:01 +02:00