Merge with main

Merge with main

--- a/contrib/zsh_completion	Wed Dec 13 13:27:09 2006 -0600
+++ b/contrib/zsh_completion	Thu Dec 14 13:49:33 2006 -0800
@@ -178,6 +178,7 @@
 }
 
 _hg_status() {
+  [[ -d $PREFIX ]] || PREFIX=$PREFIX:h
   status_files=(${(ps:\0:)"$(_hg_cmd status -0n$1 ./$PREFIX 2>/dev/null)"})
 }
 

--- a/hgext/patchbomb.py	Wed Dec 13 13:27:09 2006 -0600
+++ b/hgext/patchbomb.py	Thu Dec 14 13:49:33 2006 -0800
@@ -215,8 +215,6 @@
     bcc = [a.strip() for a in bcc if a.strip()]
 
     if len(patches) > 1:
-        ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
-
         tlen = len(str(len(patches)))
 
         subj = '[PATCH %0*d of %d] %s' % (
@@ -226,21 +224,13 @@
             prompt('Subject:', rest = ' [PATCH %0*d of %d] ' % (tlen, 0,
                 len(patches))))
 
-        ui.write(_('Finish with ^D or a dot on a line by itself.\n\n'))
-
-        body = []
-
-        while True:
-            try: l = raw_input()
-            except EOFError: break
-            if l == '.': break
-            body.append(l)
-
+        body = ''
         if opts['diffstat']:
             d = cdiffstat(_('Final summary:\n'), jumbo)
-            if d: body.append('\n' + d)
+            if d: body = '\n' + d
 
-        body = '\n'.join(body) + '\n'
+        ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
+        body = ui.edit(body, sender)
 
         msg = email.MIMEText.MIMEText(body)
         msg['Subject'] = subj

--- a/mercurial/commands.py	Wed Dec 13 13:27:09 2006 -0600
+++ b/mercurial/commands.py	Thu Dec 14 13:49:33 2006 -0800
@@ -2581,7 +2581,7 @@
           ('n', 'number', None, _('list the revision number (default)')),
           ('c', 'changeset', None, _('list the changeset')),
          ] + walkopts,
-         _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
+         _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] FILE...')),
     "archive":
         (archive,
          [('', 'no-decode', None, _('do not pass files through decoders')),
@@ -2610,7 +2610,7 @@
           ('', 'base', [],
            _('a base changeset to specify instead of a destination')),
          ] + remoteopts,
-         _('hg bundle [--base REV]... [--rev REV]... FILE [DEST]')),
+         _('hg bundle [-f] [-r REV]... [--base REV]... FILE [DEST]')),
     "cat":
         (cat,
          [('o', 'output', '', _('print output to file with formatted name')),
@@ -2679,7 +2679,7 @@
           ('B', 'ignore-blank-lines', None,
            _('ignore changes whose lines are all blank')),
          ] + walkopts,
-         _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
+         _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
     "^export":
         (export,
          [('o', 'output', '', _('print output to file with formatted name')),
@@ -2687,7 +2687,7 @@
           ('g', 'git', None, _('use git extended diff format')),
           ('', 'nodates', None, _("don't include dates in diff headers")),
           ('', 'switch-parent', None, _('diff against the second parent'))],
-         _('hg export [-a] [-o OUTFILESPEC] REV...')),
+         _('hg export [OPTION]... [-o OUTFILESPEC] REV...')),
     "grep":
         (grep,
          [('0', 'print0', None, _('end fields with NUL')),
@@ -2730,10 +2730,12 @@
           ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
           ('', 'template', '', _('display with template')),
          ] + remoteopts,
-         _('hg incoming [-p] [-n] [-M] [-r REV]...'
+         _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...'
            ' [--bundle FILENAME] [SOURCE]')),
     "^init":
-        (init, remoteopts, _('hg init [-e FILE] [--remotecmd FILE] [DEST]')),
+        (init,
+         remoteopts,
+         _('hg init [-e CMD] [--remotecmd CMD] [DEST]')),
     "locate":
         (locate,
          [('r', 'rev', '', _('search the repository as it stood at rev')),
@@ -2778,7 +2780,7 @@
           ('n', 'newest-first', None, _('show newest record first')),
           ('', 'template', '', _('display with template')),
          ] + remoteopts,
-         _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')),
+         _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
     "^parents":
         (parents,
          [('r', 'rev', '', _('show parents from the specified rev')),
@@ -2792,15 +2794,16 @@
            _('update to new tip if changesets were pulled')),
           ('f', 'force', None,
            _('run even when remote repository is unrelated')),
-          ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
+          ('r', 'rev', [],
+           _('a specific revision up to which you would like to pull')),
          ] + remoteopts,
-         _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')),
+         _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
     "^push":
         (push,
          [('f', 'force', None, _('force push')),
           ('r', 'rev', [], _('a specific revision you would like to push')),
          ] + remoteopts,
-         _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')),
+         _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
     "debugrawcommit|rawcommit":
         (rawcommit,
          [('p', 'parent', [], _('parent')),
@@ -2830,7 +2833,7 @@
           ('r', 'rev', '', _('revision to revert to')),
           ('', 'no-backup', None, _('do not save backup copies of files')),
          ] + walkopts + dryrunopts,
-         _('hg revert [-r REV] [NAME]...')),
+         _('hg revert [OPTION]... [-r REV] [NAME]...')),
     "rollback": (rollback, [], _('hg rollback')),
     "root": (root, [], _('hg root')),
     "showconfig|debugconfig":
@@ -2896,7 +2899,7 @@
         (update,
          [('C', 'clean', None, _('overwrite locally modified files')),
           ('d', 'date', '', _('tipmost revision matching date'))],
-         _('hg update [-C] [REV]')),
+         _('hg update [-C] [-d DATE] [REV]')),
     "verify": (verify, [], _('hg verify')),
     "version": (version_, [], _('hg version')),
 }

--- a/mercurial/hgweb/hgweb_mod.py	Wed Dec 13 13:27:09 2006 -0600
+++ b/mercurial/hgweb/hgweb_mod.py	Thu Dec 14 13:49:33 2006 -0800
@@ -651,7 +651,7 @@
     def run_wsgi(self, req):
         def header(**map):
             header_file = cStringIO.StringIO(
-                ''.join(self.t("header", encoding = util._encoding, **map)))
+                ''.join(self.t("header", encoding=util._encoding, **map)))
             msg = mimetools.Message(header_file, 0)
             req.header(msg.items())
             yield header_file.read()

--- a/mercurial/hgweb/hgwebdir_mod.py	Wed Dec 13 13:27:09 2006 -0600
+++ b/mercurial/hgweb/hgwebdir_mod.py	Thu Dec 14 13:49:33 2006 -0800
@@ -60,7 +60,8 @@
 
     def run_wsgi(self, req):
         def header(**map):
-            header_file = cStringIO.StringIO(''.join(tmpl("header", **map)))
+            header_file = cStringIO.StringIO(
+                ''.join(tmpl("header", encoding=util._encoding, **map)))
             msg = mimetools.Message(header_file, 0)
             req.header(msg.items())
             yield header_file.read()

--- a/tests/test-help.out	Wed Dec 13 13:27:09 2006 -0600
+++ b/tests/test-help.out	Thu Dec 14 13:49:33 2006 -0800
@@ -163,7 +163,7 @@
  -I --include  include names matching the given patterns
  -X --exclude  exclude names matching the given patterns
  -n --dry-run  do not perform actions, just print output
-hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
+hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
 
 diff repository (or selected files)