[PATCH 4 of 4] Windows configuration file should be lowercase
Pascal Quantin
pascal.quantin at gmail.com
Sun Jan 25 16:33:59 CST 2009
# HG changeset patch
# User Pascal Quantin <pascal.quantin at gmail.com>
# Date 1232922760 -3600
# Node ID e277bb07919b6f55d37012ebcdac5ad7450d543d
# Parent 6ddabad7f9b0f9578c239a3cd73852917f7cd76e
Windows configuration file should be lowercase
According to documentation the windows configuration file is named 'Mercurial.ini'. But the file stored in hg repository is named 'mercurial.ini' and python files also search for a lowercase filename. Both documentation and Inno Setup installer must be updated accordingly.
diff --git a/contrib/win32/mercurial.ini b/contrib/win32/mercurial.ini
--- a/contrib/win32/mercurial.ini
+++ b/contrib/win32/mercurial.ini
@@ -1,7 +1,7 @@
; System-wide Mercurial config file. To override these settings on a
; per-user basis, please edit the following file instead, where
; USERNAME is your Windows user name:
-; C:\Documents and Settings\USERNAME\Mercurial.ini
+; C:\Documents and Settings\USERNAME\mercurial.ini
[ui]
editor = notepad
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -33,7 +33,7 @@
Source: contrib\hgk; DestDir: {app}/contrib; DestName: hgk.tcl
Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
Source: contrib\mergetools.hgrc; DestDir: {tmp};
-Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
+Source: contrib\win32\mercurial.ini; DestDir: {app}; Check: CheckFile; AfterInstall: ConcatenateFiles;
Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -39,22 +39,22 @@
commands executed by any user in any directory. Options in these
files override per-installation options.
-(Windows) <install-dir>\Mercurial.ini::
+(Windows) <install-dir>\mercurial.ini::
or else::
(Windows) HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial::
or else::
-(Windows) C:\Mercurial\Mercurial.ini::
+(Windows) C:\Mercurial\mercurial.ini::
Per-installation/system configuration files, for the system on
which Mercurial is running. Options in these files apply to all
Mercurial commands executed by any user in any directory.
Registry keys contain PATH-like strings, every part of which must
- reference a Mercurial.ini file or be a directory where *.rc files
+ reference a mercurial.ini file or be a directory where *.rc files
will be read.
(Unix) $HOME/.hgrc::
-(Windows) %HOME%\Mercurial.ini::
+(Windows) %HOME%\mercurial.ini::
(Windows) %HOME%\.hgrc::
-(Windows) %USERPROFILE%\Mercurial.ini::
+(Windows) %USERPROFILE%\mercurial.ini::
(Windows) %USERPROFILE%\.hgrc::
Per-user configuration file(s), for the user running Mercurial.
On Windows 9x, %HOME% is replaced by %APPDATA%.
diff --git a/hgext/win32text.py b/hgext/win32text.py
--- a/hgext/win32text.py
+++ b/hgext/win32text.py
@@ -47,7 +47,7 @@
ui.warn(_('WARNING: %s already has %s line endings\n'
'and does not need EOL conversion by the win32text plugin.\n'
'Before your next commit, please reconsider your '
- 'encode/decode settings in \nMercurial.ini or %s.\n') %
+ 'encode/decode settings in \nmercurial.ini or %s.\n') %
(filename, newlinestr[newline], repo.join('hgrc')))
def dumbdecode(s, cmd, **kwargs):
@@ -115,7 +115,7 @@
crlf = newlinestr[newline].lower()
filter = filterstr[newline]
ui.warn(_('\nTo prevent this mistake in your local repository,\n'
- 'add to Mercurial.ini or .hg/hgrc:\n'
+ 'add to mercurial.ini or .hg/hgrc:\n'
'\n'
'[hooks]\n'
'pretxncommit.%s = python:hgext.win32text.forbid%s\n'
diff --git a/i18n/da.po b/i18n/da.po
--- a/i18n/da.po
+++ b/i18n/da.po
@@ -4539,7 +4539,7 @@
"WARNING: %s already has %s line endings\n"
"and does not need EOL conversion by the win32text plugin.\n"
"Before your next commit, please reconsider your encode/decode settings in \n"
-"Mercurial.ini or %s.\n"
+"mercurial.ini or %s.\n"
msgstr ""
#, python-format
@@ -4554,7 +4554,7 @@
msgid ""
"\n"
"To prevent this mistake in your local repository,\n"
-"add to Mercurial.ini or .hg/hgrc:\n"
+"add to mercurial.ini or .hg/hgrc:\n"
"\n"
"[hooks]\n"
"pretxncommit.%s = python:hgext.win32text.forbid%s\n"
diff --git a/i18n/zh.po b/i18n/zh.po
--- a/i18n/zh.po
+++ b/i18n/zh.po
@@ -4271,7 +4271,7 @@
"WARNING: %s already has %s line endings\n"
"and does not need EOL conversion by the win32text plugin.\n"
"Before your next commit, please reconsider your encode/decode settings in \n"
-"Mercurial.ini or %s.\n"
+"mercurial.ini or %s.\n"
msgstr ""
msgid "Attempt to commit or push text file(s) using %s line endings\n"
@@ -4283,7 +4283,7 @@
msgid ""
"\n"
"To prevent this mistake in your local repository,\n"
-"add to Mercurial.ini or .hg/hgrc:\n"
+"add to mercurial.ini or .hg/hgrc:\n"
"\n"
"[hooks]\n"
"pretxncommit.%s = python:hgext.win32text.forbid%s\n"
diff --git a/tests/test-win32text.out b/tests/test-win32text.out
--- a/tests/test-win32text.out
+++ b/tests/test-win32text.out
@@ -113,7 +113,7 @@
in 6e8a7629ff5b: d
To prevent this mistake in your local repository,
-add to Mercurial.ini or .hg/hgrc:
+add to mercurial.ini or .hg/hgrc:
[hooks]
pretxncommit.crlf = python:hgext.win32text.forbidcrlf
@@ -170,7 +170,7 @@
WARNING: f4.bat already has CRLF line endings
and does not need EOL conversion by the win32text plugin.
Before your next commit, please reconsider your encode/decode settings in
-Mercurial.ini or ..../.hg/hgrc.
+mercurial.ini or ..../.hg/hgrc.
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
hello<NUL><CR><LF>
some<CR><LF>text<CR><LF>
More information about the Mercurial-devel
mailing list