# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1314307313 18000
# Node ID 7c03e3b1b858e078880abc872a36dd8d4d2f93c7
# Parent  ff3e9368630663194c00bf47bee7097936fb4b51# Parent  17ffb30d917475050c3d27c9e058d76629903647
merge with stable

diff -r ff3e93686306 -r 7c03e3b1b858 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Mon Aug 22 00:42:38 2011 +0200
+++ b/i18n/pt_BR.po	Thu Aug 25 16:21:53 2011 -0500
@@ -9671,11 +9671,14 @@
 
 msgid ""
 "    If one or more REVs are given, only branch heads on the branches\n"
-"    associated with the specified changesets are shown."
-msgstr ""
-"    Se um ou mais argumentos REV forem dados, as \"cabeças de ramo\"\n"
-"    serão mostradas para os ramos nomeados associados às revisões\n"
-"    especificadas."
+"    associated with the specified changesets are shown. This means\n"
+"    that you can use :hg:`heads foo` to see the heads on a branch\n"
+"    named ``foo``."
+msgstr ""
+"    Se um ou mais argumentos REV forem dados, apenas cabeças de ramo\n"
+"    nos ramos correspondentes a essas revisões serão mostradas. Ou\n"
+"    seja, você pode usar :hg:`heads foo` para mostrar as cabeças no\n"
+"    ramo ``foo``."
 
 msgid ""
 "    If -c/--closed is specified, also show branch heads marked closed\n"
@@ -10911,7 +10914,7 @@
 "    - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified\n"
 "      files, discarding any previous merge attempts. Re-merging is not\n"
 "      performed for files already marked as resolved. Use ``--all/-a``\n"
-"      to selects all unresolved files. ``--tool`` can be used to specify\n"
+"      to select all unresolved files. ``--tool`` can be used to specify\n"
 "      the merge tool used for the given files. It overrides the HGMERGE\n"
 "      environment variable and your configuration files."
 msgstr ""
@@ -13095,14 +13098,19 @@
 "    Optional. Username to authenticate with. If not given, and the\n"
 "    remote site requires basic or digest authentication, the user will\n"
 "    be prompted for it. Environment variables are expanded in the\n"
-"    username letting you do ``foo.username = $USER``."
+"    username letting you do ``foo.username = $USER``. If the URI\n"
+"    includes a username, only ``[auth]`` entries with a matching\n"
+"    username or without a username will be considered."
 msgstr ""
 "``username``\n"
 "    Opcional. Nome do usuário usado para a autenticação. Se não for\n"
 "    fornecido, e o servidor remoto solicitar autenticação básica ou\n"
 "    digest, o usuário do Mercurial será consultado interativamente para\n"
 "    fornecê-lo. Variáveis de ambiente são expandidas no nome de usuário,\n"
-"    de forma a suportar ``foo.username = $USER``."
+"    de forma a suportar ``foo.username = $USER``.\n"
+"    Se a URI incluir um nome de usuário, só serão consideradas as\n"
+"    entradas ``[auth]`` com o nome de usuário correspondente ou\n"
+"    sem nome de usuário."
 
 msgid ""
 "``password``\n"
@@ -15110,6 +15118,22 @@
 "    allow_push é examinado após a lista deny_push."
 
 msgid ""
+"``guessmime``\n"
+"    Control MIME types for raw download of file content.\n"
+"    Set to True to let hgweb guess the content type from the file\n"
+"    extension. This will serve HTML files as ``text/html`` and might\n"
+"    allow cross-site scripting attacks when serving untrusted\n"
+"    repositories. Default is False."
+msgstr ""
+"``guessmime``\n"
+"    Controla tipos MIME para download inalterado do conteúdo de\n"
+"    arquivos. Use True para permitir que o hgweb determine o tipo de\n"
+"    conteúdo a partir da extensão do arquivo. Isto servirá arquivos\n"
+"    HTML como ``text/html``, e portanto pode permitir ataques de\n"
+"    cross-site scripting (XSS) ao servir repositórios não confiáveis.\n"
+"    O padrão é False."
+
+msgid ""
 "``allow_read``\n"
 "    If the user has not already been denied repository access due to\n"
 "    the contents of deny_read, this list determines whether to grant\n"
diff -r ff3e93686306 -r 7c03e3b1b858 mercurial/dagutil.py
--- a/mercurial/dagutil.py	Mon Aug 22 00:42:38 2011 +0200
+++ b/mercurial/dagutil.py	Thu Aug 25 16:21:53 2011 -0500
@@ -260,7 +260,7 @@
             if isroot:
                 roots.append(rev)
             rev -= 1
-        self._walkfrom = rev - 1
+        self._walkfrom = rev
 
     def _getheads(self):
         self._walkto(nullrev)
diff -r ff3e93686306 -r 7c03e3b1b858 mercurial/ui.py
--- a/mercurial/ui.py	Mon Aug 22 00:42:38 2011 +0200
+++ b/mercurial/ui.py	Thu Aug 25 16:21:53 2011 -0500
@@ -558,7 +558,7 @@
         # instead of trying to emulate raw_input, swap self.fin with sys.stdin
         old = sys.stdin
         sys.stdin = self.fin
-        line = raw_input()
+        line = raw_input(' ')
         sys.stdin = old
 
         # When stdin is in binary mode on Windows, it can cause
@@ -575,7 +575,7 @@
             self.write(msg, ' ', default, "\n")
             return default
         try:
-            r = self._readline(self.label(msg, 'ui.prompt') + ' ')
+            r = self._readline(self.label(msg, 'ui.prompt'))
             if not r:
                 return default
             return r
diff -r ff3e93686306 -r 7c03e3b1b858 tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t	Mon Aug 22 00:42:38 2011 +0200
+++ b/tests/test-setdiscovery.t	Thu Aug 25 16:21:53 2011 -0500
@@ -260,7 +260,7 @@
   query 2; still undecided: 1029, sample size is: 11
   sampling from both directions
   searching: 3 queries
-  query 3; still undecided: 16, sample size is: 16
+  query 3; still undecided: 15, sample size is: 15
   3 total queries
   common heads: 7ead0cba2838