# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1262727699 -3600
# Node ID 3ab391dd5ec5ab1f4af06169bde7a9c850a7f4ce
# Parent  37c4ce51a12d0cdc4c560e8991b7b52976180435# Parent  a474f950357be8acb8704f46b4443872d0461feb
Merge with stable.

diff -r 37c4ce51a12d -r 3ab391dd5ec5 contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html	Tue Jan 05 10:20:28 2010 -0600
+++ b/contrib/win32/ReadMe.html	Tue Jan 05 22:41:39 2010 +0100
@@ -140,7 +140,7 @@
     </p>
 
     <p>
-      Mercurial is Copyright 2005-2009 Matt Mackall and others. See
+      Mercurial is Copyright 2005-2010 Matt Mackall and others. See
       the <tt>Contributors.txt</tt> file for a list of contributors.
     </p>
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Tue Jan 05 10:20:28 2010 -0600
+++ b/contrib/win32/mercurial.iss	Tue Jan 05 22:41:39 2010 +0100
@@ -17,7 +17,7 @@
 #endif
 
 [Setup]
-AppCopyright=Copyright 2005-2009 Matt Mackall and others
+AppCopyright=Copyright 2005-2010 Matt Mackall and others
 AppName=Mercurial
 AppVerName=Mercurial {#VERSION}
 InfoAfterFile=contrib/win32/postinstall.txt
@@ -33,7 +33,7 @@
 DefaultDirName={pf}\Mercurial
 SourceDir=..\..
 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
-VersionInfoCopyright=Copyright 2005-2009 Matt Mackall and others
+VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others
 InternalCompressLevel=max
 SolidCompression=true
diff -r 37c4ce51a12d -r 3ab391dd5ec5 doc/hg.1.txt
--- a/doc/hg.1.txt	Tue Jan 05 10:20:28 2010 -0600
+++ b/doc/hg.1.txt	Tue Jan 05 22:41:39 2010 +0100
@@ -93,7 +93,7 @@
 
 Copying
 -------
-Copyright (C) 2005-2009 Matt Mackall.
+Copyright (C) 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2.
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 doc/hgignore.5.txt
--- a/doc/hgignore.5.txt	Tue Jan 05 10:20:28 2010 -0600
+++ b/doc/hgignore.5.txt	Tue Jan 05 22:41:39 2010 +0100
@@ -104,7 +104,7 @@
 Copying
 -------
 This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005-2009 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2.
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Tue Jan 05 10:20:28 2010 -0600
+++ b/doc/hgrc.5.txt	Tue Jan 05 22:41:39 2010 +0100
@@ -202,6 +202,7 @@
 For example, to match any file ending in ``.txt`` in the root
 directory only, use the pattern ``*.txt``. To match any file ending
 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
+For each file only the first matching filter applies.
 
 The filter command can start with a specifier, either ``pipe:`` or
 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
@@ -952,7 +953,7 @@
 Copying
 -------
 This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2009 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2.
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/da.po
--- a/i18n/da.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/da.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6894,12 +6894,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> og andre\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> og andre\n"
 "Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n"
 "gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n"
 "NOGET BESTEMT FORMÅL.\n"
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/de.po
--- a/i18n/de.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/de.po	Tue Jan 05 22:41:39 2010 +0100
@@ -8409,12 +8409,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> und andere\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> und andere\n"
 "Dies ist freie Software; siehe Quellen für Kopierbestimmungen. Es besteht\n"
 "KEINE Gewährleistung für das Programm, nicht einmal der Marktreife oder der\n"
 "Verwendbarkeit für einen bestimmten Zweck.\n"
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/el.po
--- a/i18n/el.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/el.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6720,7 +6720,7 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/fr.po
--- a/i18n/fr.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/fr.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6859,7 +6859,7 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/it.po
--- a/i18n/it.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/it.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6986,12 +6986,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> e altri\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> e altri\n"
 "Questo è software libero; vedere i sorgenti per le condizioni di copia.\n"
 "Non c'è alcuna garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n"
 "SCOPO PARTICOLARE.\n"
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/ja.po
--- a/i18n/ja.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/ja.po	Tue Jan 05 22:41:39 2010 +0100
@@ -8496,12 +8496,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"著作権 (C) 2005-2009 Matt Mackall <mpm@selenic.com> 他\n"
+"著作権 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 他\n"
 "本製品はフリーソフトウェアです。頒布／改変の際はライセンス条項をお読み\n"
 "ください。市場適合性や特定用途への可否を含め、本製品は無保証です。\n"
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/pt_BR.po	Tue Jan 05 22:41:39 2010 +0100
@@ -9608,12 +9608,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> e outros\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> e outros\n"
 "Este software é livre; veja os fontes para condições de cópia. Não\n"
 "há garantias, nem mesmo de adequação para qualquer propósito em\n"
 "particular.\n"
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/sv.po
--- a/i18n/sv.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/sv.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6440,7 +6440,7 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/zh_CN.po
--- a/i18n/zh_CN.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/zh_CN.po	Tue Jan 05 22:41:39 2010 +0100
@@ -6364,12 +6364,12 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"版权所有 (C) 2005-2009 Matt Mackall <mpm@selenic.com> 和其他人。\n"
+"版权所有 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 和其他人。\n"
 "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n"
 "特定目的的隐含的担保。\n"
 
diff -r 37c4ce51a12d -r 3ab391dd5ec5 i18n/zh_TW.po
--- a/i18n/zh_TW.po	Tue Jan 05 10:20:28 2010 -0600
+++ b/i18n/zh_TW.po	Tue Jan 05 22:41:39 2010 +0100
@@ -7103,7 +7103,7 @@
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
diff -r 37c4ce51a12d -r 3ab391dd5ec5 mercurial/commands.py
--- a/mercurial/commands.py	Tue Jan 05 10:20:28 2010 -0600
+++ b/mercurial/commands.py	Tue Jan 05 22:41:39 2010 +0100
@@ -3575,7 +3575,7 @@
     "^pull":
         (pull,
          [('u', 'update', None,
-           _('update to new tip if changesets were pulled')),
+           _('update to new branch head if changesets were pulled')),
           ('f', 'force', None,
            _('run even when remote repository is unrelated')),
           ('r', 'rev', [],
@@ -3688,7 +3688,7 @@
     "unbundle":
         (unbundle,
          [('u', 'update', None,
-           _('update to new tip if changesets were unbundled'))],
+           _('update to new branch head if changesets were unbundled'))],
          _('[-u] FILE...')),
     "^update|up|checkout|co":
         (update,
diff -r 37c4ce51a12d -r 3ab391dd5ec5 tests/test-encode
--- a/tests/test-encode	Tue Jan 05 10:20:28 2010 -0600
+++ b/tests/test-encode	Tue Jan 05 22:41:39 2010 +0100
@@ -4,34 +4,40 @@
 
 cat > .hg/hgrc <<EOF
 [encode]
+not.gz = tr a-z A-Z
 *.gz = gzip -d
 
 [decode]
+not.gz = tr A-Z a-z
 *.gz = gzip
 
 EOF
 
 echo "this is a test" | gzip > a.gz
-hg add a.gz
+echo "this is a test" > not.gz
+hg add *
 hg ci -m "test" -d "1000000 0"
 echo %% no changes
 hg status
-touch a.gz
+touch *
 
 echo %% no changes
 hg status
 
-echo %% uncompressed contents in repo
+echo %% check contents in repo are encoded
 hg debugdata .hg/store/data/a.gz.d 0
+hg debugdata .hg/store/data/not.gz.d 0
 
-echo %% uncompress our working dir copy
+echo %% check committed content was decoded
 gunzip < a.gz
+cat not.gz
 
-rm a.gz
+rm *
 hg co -C
 
-echo %% uncompress our new working dir copy
+echo %% check decoding of our new working dir copy
 gunzip < a.gz
+cat not.gz
 
 echo %% check hg cat operation
 hg cat a.gz
diff -r 37c4ce51a12d -r 3ab391dd5ec5 tests/test-encode.out
--- a/tests/test-encode.out	Tue Jan 05 10:20:28 2010 -0600
+++ b/tests/test-encode.out	Tue Jan 05 22:41:39 2010 +0100
@@ -1,11 +1,14 @@
 %% no changes
 %% no changes
-%% uncompressed contents in repo
+%% check contents in repo are encoded
+this is a test
+THIS IS A TEST
+%% check committed content was decoded
 this is a test
-%% uncompress our working dir copy
 this is a test
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-%% uncompress our new working dir copy
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+%% check decoding of our new working dir copy
+this is a test
 this is a test
 %% check hg cat operation
 this is a test