Mercurial > hg

changeset 12870:363c145a27ae stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Tue, 26 Oct 2010 18:47:45 -0200
parents b00eda50ad2b (diff) beeaaa538d0a (current diff)
children 805567785485
files
diffstat 41 files changed, 65 insertions(+), 112 deletions(-) [+]
line wrap: on
line diff
--- a/doc/Makefile	Tue Oct 26 10:54:32 2010 +0200
+++ b/doc/Makefile	Tue Oct 26 18:47:45 2010 -0200
@@ -34,7 +34,7 @@
 MANIFEST: man html
 # tracked files are already in the main MANIFEST
 	$(RM) $@
-	for i in $(MAN) $(HTML) hg.1.gendoc.txt; do \
+	for i in $(MAN) $(HTML); do \
 	  echo "doc/$$i" >> $@ ; \
 	done
 
@@ -46,4 +46,4 @@
 	done
 
 clean:
-	$(RM) $(MAN) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST
+	$(RM) $(MAN) $(HTML) hg.1.gendoc.txt MANIFEST
--- a/hgext/keyword.py	Tue Oct 26 10:54:32 2010 +0200
+++ b/hgext/keyword.py	Tue Oct 26 18:47:45 2010 -0200
@@ -205,11 +205,11 @@
 
     def overwrite(self, ctx, candidates, lookup, expand, rekw=False):
         '''Overwrites selected files expanding/shrinking keywords.'''
-        if self.restrict or lookup: # exclude kw_copy
+        if self.restrict or lookup or self.record: # exclude kw_copy
             candidates = self.iskwfile(candidates, ctx)
         if not candidates:
             return
-        commit = self.restrict and not lookup
+        kwcmd = self.restrict and lookup # kwexpand/kwshrink
         if self.restrict or expand and lookup:
             mf = ctx.manifest()
         fctx = ctx
@@ -234,7 +234,7 @@
             if found:
                 self.ui.note(msg % f)
                 self.repo.wwrite(f, data, ctx.flags(f))
-                if commit:
+                if kwcmd:
                     self.repo.dirstate.normal(f)
                 elif self.record:
                     self.repo.dirstate.normallookup(f)
--- a/hgext/patchbomb.py	Tue Oct 26 10:54:32 2010 +0200
+++ b/hgext/patchbomb.py	Tue Oct 26 18:47:45 2010 -0200
@@ -213,7 +213,7 @@
       hg email -o -m mbox &&    # generate an mbox file...
         mutt -R -f mbox         # ... and view it with mutt
       hg email -o -m mbox &&    # generate an mbox file ...
-        formail -s sendmail \   # ... and use formail to send from the mbox
+        formail -s sendmail \\   # ... and use formail to send from the mbox
           -bm -t < mbox         # ... using sendmail
 
     Before using this command, you will need to enable email in your
--- a/hgext/win32text.py	Tue Oct 26 10:54:32 2010 +0200
+++ b/hgext/win32text.py	Tue Oct 26 18:47:45 2010 -0200
@@ -164,3 +164,7 @@
     for name, fn in _filters.iteritems():
         repo.adddatafilter(name, fn)
 
+def extsetup(ui):
+    if ui.configbool('win32text', 'warn', True):
+        ui.warn(_("win32text is deprecated: "
+                  "http://mercurial.selenic.com/wiki/Win32TextExtension\n"))
--- a/mercurial/help/merge-tools.txt	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/help/merge-tools.txt	Tue Oct 26 18:47:45 2010 -0200
@@ -35,13 +35,14 @@
 merge tools are:
 
 ``internal:merge``
-   Uses the internal non-interactive simple merge algorithm for merging files.
-   It will fail if there are any conflicts.
+   Uses the internal non-interactive simple merge algorithm for merging
+   files. It will fail if there are any conflicts and leave markers in
+   the partially merged file.
 
 ``internal:fail``
    Rather than attempting to merge files that were modified on both
-   branches, it marks these files as unresolved. Then the resolve
-   command must be used to mark files resolved.
+   branches, it marks them as unresolved. The resolve command must be
+   used to resolve these conflicts.
 
 ``internal:local``
    Uses the local version of files as the merged version.
--- a/mercurial/localrepo.py	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/localrepo.py	Tue Oct 26 18:47:45 2010 -0200
@@ -1272,7 +1272,7 @@
                 self.ui.status(_("no changes found\n"))
                 return 0
 
-            if fetch == [nullid]:
+            if heads is None and fetch == [nullid]:
                 self.ui.status(_("requesting all changes\n"))
             elif heads is None and remote.capable('changegroupsubset'):
                 # issue1320, avoid a race if remote changed after discovery
--- a/mercurial/lsprof.py	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/lsprof.py	Tue Oct 26 18:47:45 2010 -0200
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 import sys
 from _lsprof import Profiler, profiler_entry
 
--- a/mercurial/templates/paper/branches.tmpl	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/templates/paper/branches.tmpl	Tue Oct 26 18:47:45 2010 -0200
@@ -19,6 +19,9 @@
 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
 <li class="active">branches</li>
 </ul>
+<ul>
+ <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
+</ul>
 </div>
 
 <div class="main">
--- a/mercurial/templates/paper/manifest.tmpl	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/templates/paper/manifest.tmpl	Tue Oct 26 18:47:45 2010 -0200
@@ -25,9 +25,6 @@
 <ul>
  <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<ul>
-<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
-</ul>
 </div>
 
 <div class="main">
--- a/mercurial/templates/spartan/branches.tmpl	Tue Oct 26 10:54:32 2010 +0200
+++ b/mercurial/templates/spartan/branches.tmpl	Tue Oct 26 18:47:45 2010 -0200
@@ -13,6 +13,7 @@
 <a href="{url}graph{sessionvars%urlparameter}">graph</a>
 <a href="{url}tags{sessionvars%urlparameter}">tags</a>
 <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
+<a href="{url}help{sessionvars%urlparameter}">help</a>
 <a type="application/rss+xml" href="{url}rss-branches">rss</a>
 <a type="application/atom+xml" href="{url}atom-branches">atom</a>
 </div>
--- a/tests/test-acl.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-acl.t	Tue Oct 26 18:47:45 2010 -0200
@@ -63,7 +63,6 @@
 
   $ cd ..
   $ hg clone -r 0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-branch-option.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-branch-option.t	Tue Oct 26 18:47:45 2010 -0200
@@ -18,7 +18,6 @@
   $ hg tag -l z
   $ cd ..
   $ hg clone -r 0 branch branch2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -97,7 +96,6 @@
 
   $ cd ..
   $ hg clone branch2#b branch3
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -114,7 +112,6 @@
 clone rev a branch b
 
   $ hg clone -r a branch2#b branch3
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-bundle-vs-outgoing.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-bundle-vs-outgoing.t	Tue Oct 26 18:47:45 2010 -0200
@@ -105,7 +105,6 @@
 sanity check of outgoing: expect revs 4 5 6 7 8
 
   $ hg clone -r3 . ../repo2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-bundle.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-bundle.t	Tue Oct 26 18:47:45 2010 -0200
@@ -236,7 +236,6 @@
   $ rm -r empty
   $ hg init empty
   $ hg clone -r 3 test partial
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-clone-r.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-clone-r.t	Tue Oct 26 18:47:45 2010 -0200
@@ -85,7 +85,6 @@
   > done
   
   ---- hg clone -r 0 test test-0
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -99,7 +98,6 @@
   1 files, 1 changesets, 1 total revisions
   
   ---- hg clone -r 1 test test-1
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -113,7 +111,6 @@
   1 files, 2 changesets, 2 total revisions
   
   ---- hg clone -r 2 test test-2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -127,7 +124,6 @@
   1 files, 3 changesets, 3 total revisions
   
   ---- hg clone -r 3 test test-3
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -141,7 +137,6 @@
   1 files, 4 changesets, 4 total revisions
   
   ---- hg clone -r 4 test test-4
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -155,7 +150,6 @@
   1 files, 2 changesets, 2 total revisions
   
   ---- hg clone -r 5 test test-5
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -169,7 +163,6 @@
   1 files, 3 changesets, 3 total revisions
   
   ---- hg clone -r 6 test test-6
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -183,7 +176,6 @@
   2 files, 4 changesets, 5 total revisions
   
   ---- hg clone -r 7 test test-7
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -197,7 +189,6 @@
   3 files, 5 changesets, 6 total revisions
   
   ---- hg clone -r 8 test test-8
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-clone-update-order.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-clone-update-order.t	Tue Oct 26 18:47:45 2010 -0200
@@ -24,7 +24,6 @@
   [255]
 
   $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -32,7 +31,6 @@
   $ rm -rf ../b
 
   $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -42,7 +40,6 @@
   $ rm -rf ../b
 
   $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -52,7 +49,6 @@
   $ rm -rf ../b
 
   $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -62,7 +58,6 @@
   $ rm -rf ../b
 
   $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -74,7 +69,6 @@
 Test -r mine ... mine is ignored:
 
   $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -84,7 +78,6 @@
   $ rm -rf ../b
 
   $ hg clone .#other ../b -b default -b mine
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -94,7 +87,6 @@
   $ rm -rf ../b
 
   $ hg clone .#other ../b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-clone.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-clone.t	Tue Oct 26 18:47:45 2010 -0200
@@ -306,7 +306,6 @@
 Testing #<branch>:
 
   $ hg clone -u . a#stable ua
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -343,7 +342,6 @@
 Testing -u -r <branch>:
 
   $ hg clone -u . -r stable a ua
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -380,7 +378,6 @@
 Testing -r <branch>:
 
   $ hg clone -r stable a ua
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -442,7 +439,6 @@
   > EOF
 
   $ python branchclone.py
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-empty-group.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-empty-group.t	Tue Oct 26 18:47:45 2010 -0200
@@ -49,7 +49,6 @@
   $ cd ..
 
   $ hg clone -r 3 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -58,7 +57,6 @@
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg clone -r 4 a c
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-eol-clone.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-eol-clone.t	Tue Oct 26 18:47:45 2010 -0200
@@ -60,7 +60,6 @@
 
   $ cd ..
   $ hg clone -r 0 repo repo-4
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-glog.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-glog.t	Tue Oct 26 18:47:45 2010 -0200
@@ -756,7 +756,6 @@
 Incoming and outgoing:
 
   $ hg clone -U -r31 repo repo2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-hgweb-descend-empties.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-hgweb-descend-empties.t	Tue Oct 26 18:47:45 2010 -0200
@@ -63,9 +63,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <ul>
-  <li><a href="/help">help</a></li>
-  </ul>
   </div>
   
   <div class="main">
--- a/tests/test-hgweb-diffs.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-hgweb-diffs.t	Tue Oct 26 18:47:45 2010 -0200
@@ -471,7 +471,6 @@
 test import rev as raw-rev
 
   $ hg clone -r0 test test1
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-hgweb-empty.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-hgweb-empty.t	Tue Oct 26 18:47:45 2010 -0200
@@ -352,9 +352,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <ul>
-  <li><a href="/help">help</a></li>
-  </ul>
   </div>
   
   <div class="main">
--- a/tests/test-hgweb.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-hgweb.t	Tue Oct 26 18:47:45 2010 -0200
@@ -226,9 +226,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <ul>
-  <li><a href="/help">help</a></li>
-  </ul>
   </div>
   
   <div class="main">
--- a/tests/test-http-clone-r.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-http-clone-r.t	Tue Oct 26 18:47:45 2010 -0200
@@ -92,7 +92,6 @@
   >       cd ..
   >    fi
   > done
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -104,7 +103,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -116,7 +114,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -128,7 +125,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -140,7 +136,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 4 changesets, 4 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -152,7 +147,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -164,7 +158,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -176,7 +169,6 @@
   crosschecking files in changesets and manifests
   checking files
   2 files, 4 changesets, 5 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -188,7 +180,6 @@
   crosschecking files in changesets and manifests
   checking files
   3 files, 5 changesets, 6 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-import.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-import.t	Tue Oct 26 18:47:45 2010 -0200
@@ -14,7 +14,6 @@
 import exported patch
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -45,7 +44,6 @@
   > EOF
   $ chmod +x dummypatch.py
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -63,7 +61,6 @@
 import of plain diff should fail without message
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -81,7 +78,6 @@
 import of plain diff should be ok with message
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -97,7 +93,6 @@
 import of plain diff with specific date and user
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -130,7 +125,6 @@
 import of plain diff should be ok with --no-commit
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -153,7 +147,6 @@
 import of malformed plain diff should fail
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -175,7 +168,6 @@
 
   $ mkdir dir
   $ hg clone -r0 a dir/b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -193,7 +185,6 @@
 import from stdin
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -221,7 +212,6 @@
 override commit message
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -247,7 +237,6 @@
 plain diff in email, subject, message body
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -267,7 +256,6 @@
 plain diff in email, no subject, message body
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -282,7 +270,6 @@
 plain diff in email, subject, no message body
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -297,7 +284,6 @@
 plain diff in email, no subject, no message body, should fail
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -314,7 +300,6 @@
 hg export in email, should use patch header
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -345,7 +330,6 @@
 plain diff in email, [PATCH] subject, message body with subject
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -394,7 +378,6 @@
 hg import in a subdirectory
 
   $ hg clone -r0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-issue1306.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-issue1306.t	Tue Oct 26 18:47:45 2010 -0200
@@ -42,7 +42,6 @@
 Try cloning -r branch:
 
   $ hg clone -rbr remote local1
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -62,7 +61,6 @@
 Try cloning -rother clone#branch:
 
   $ hg clone -r0 remote#br local2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -80,7 +78,6 @@
 Try cloning -r1 clone#branch:
 
   $ hg clone -r1 remote#br local3
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-keyword.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-keyword.t	Tue Oct 26 18:47:45 2010 -0200
@@ -440,6 +440,24 @@
   $ hg update -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+record added keyword ignored file
+
+  $ echo '$Id$' > i
+  $ hg add i
+  $ hg --verbose record -d '1 13' -m recignored<<EOF
+  > y
+  > EOF
+  diff --git a/i b/i
+  new file mode 100644
+  examine changes to 'i'? [Ynsfdaq?] 
+  i
+  committed changeset 3:5f40fe93bbdc
+  $ cat i
+  $Id$
+  $ hg -q rollback
+  $ hg forget i
+  $ rm i
+
 Test patch queue repo
 
   $ hg init --mq
@@ -726,7 +744,6 @@
 Clone to test incoming
 
   $ hg clone -r1 Test Test-a
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -775,8 +792,12 @@
 
   $ mkdir x
   $ hg copy a x/a
+  $ hg --verbose kwshrink a
+  overwriting a shrinking keywords
+  $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords
+  $ hg status a
 
 kwexpand x/a should abort
 
--- a/tests/test-merge-commit.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-merge-commit.t	Tue Oct 26 18:47:45 2010 -0200
@@ -100,7 +100,6 @@
 
   $ cd ..
   $ hg clone -U -r 1 -r 2 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-mq-safety.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-mq-safety.t	Tue Oct 26 18:47:45 2010 -0200
@@ -131,7 +131,6 @@
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg --cwd .. clone -r 0 forcepush forcepush2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-patch.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-patch.t	Tue Oct 26 18:47:45 2010 -0200
@@ -27,7 +27,6 @@
 
   $ hg --cwd a export -o ../a.diff tip
   $ hg clone -r 0 a b
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -64,7 +63,6 @@
 Clone and apply patch:
 
   $ hg clone -r 0 c d
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-patchbomb.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-patchbomb.t	Tue Oct 26 18:47:45 2010 -0200
@@ -145,8 +145,10 @@
   +b
   
 
-  $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip
-  This patch series consists of 2 patches.
+  $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
+  > --config extensions.progress= --config progress.assume-tty=1 \
+  > --config progress.delay=0 --config progress.refresh=0
+  \rwriting [                                                                 ] 0/3\rwriting [                                                                 ] 0/3\r                                                                                \r\r                                                                                \r\rwriting [====================>                                            ] 1/3\rwriting [====================>                                            ] 1/3\r                                                                                \r\r                                                                                \r\rwriting [==========================================>                      ] 2/3\rwriting [==========================================>                      ] 2/3\r                                                                                \rThis patch series consists of 2 patches.
   
   
   Write the introductory message for the patch series.
--- a/tests/test-pull-pull-corruption.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-pull-pull-corruption.t	Tue Oct 26 18:47:45 2010 -0200
@@ -14,7 +14,6 @@
 create one repo with a shorter history
 
   $ hg clone -r 0 source1 source2
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-record.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-record.t	Tue Oct 26 18:47:45 2010 -0200
@@ -900,6 +900,11 @@
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
 
+Ignore win32text deprecation warning for now:
+
+  $ echo '[win32text]' >> .hg/hgrc
+  $ echo 'warn = no' >> .hg/hgrc
+
   $ echo d >> subdir/f1
   $ hg record -d '23 0' -mw1 <<EOF
   > y
--- a/tests/test-relink.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-relink.t	Tue Oct 26 18:47:45 2010 -0200
@@ -40,7 +40,6 @@
 clone and pull to break links
 
   $ hg clone --pull -r0 repo clone
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-ssh-clone-r.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-ssh-clone-r.t	Tue Oct 26 18:47:45 2010 -0200
@@ -110,7 +110,6 @@
   >       cd ..
   >    fi
   > done
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -122,7 +121,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 1 changesets, 1 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -134,7 +132,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -146,7 +143,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -158,7 +154,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 4 changesets, 4 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -170,7 +165,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -182,7 +176,6 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 3 changesets, 3 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -194,7 +187,6 @@
   crosschecking files in changesets and manifests
   checking files
   2 files, 4 changesets, 5 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -206,7 +198,6 @@
   crosschecking files in changesets and manifests
   checking files
   3 files, 5 changesets, 6 total revisions
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-static-http.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-static-http.t	Tue Oct 26 18:47:45 2010 -0200
@@ -93,7 +93,6 @@
   abort: unknown revision 'donotexist'!
   [255]
   $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-subrepo.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-subrepo.t	Tue Oct 26 18:47:45 2010 -0200
@@ -632,7 +632,6 @@
   $ hg init issue1852c
   $ hg -R issue1852c pull -r0 -u issue1852a
   pulling from issue1852a
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-transplant.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-transplant.t	Tue Oct 26 18:47:45 2010 -0200
@@ -96,7 +96,6 @@
 remote transplant
 
   $ hg clone -r 1 ../t ../remote
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -154,7 +153,6 @@
   $ cat ../t.pid >> $DAEMON_PIDS
 
   $ hg clone -r 0 ../t ../rp
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
@@ -274,7 +272,6 @@
   $ hg init empty
   $ cd empty
   $ hg transplant -s ../t -b tip -a
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-url-rev.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-url-rev.t	Tue Oct 26 18:47:45 2010 -0200
@@ -11,7 +11,6 @@
   $ cd ..
 
   $ hg clone 'repo#foo' clone
-  requesting all changes
   adding changesets
   adding manifests
   adding file changes
--- a/tests/test-win32text.t	Tue Oct 26 10:54:32 2010 +0200
+++ b/tests/test-win32text.t	Tue Oct 26 18:47:45 2010 -0200
@@ -390,8 +390,20 @@
   ** = cleverdecode:
   [encode]
   ** = cleverencode:
-  $ echo
-  
+
+Trigger deprecation warning:
+
+  $ hg id
+  win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
+  b910084e3c98+ tip
+
+Disable warning:
+
+  $ echo '[win32text]' >> .hg/hgrc
+  $ echo 'warn = no' >> .hg/hgrc
+  $ hg id
+  b910084e3c98+ tip
+
   $ rm f3 f4.bat bin
   $ hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
   WARNING: f4.bat already has CRLF line endings