--- a/hgext/mq.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/hgext/mq.py	Tue Jun 09 09:25:17 2009 -0400
@@ -503,7 +503,7 @@
 
     def patch(self, repo, patchfile):
         '''Apply patchfile  to the working directory.
-        patchfile: file name of patch'''
+        patchfile: name of patch file'''
         files = {}
         try:
             fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root,
@@ -2541,7 +2541,7 @@
     "^qimport":
         (qimport,
          [('e', 'existing', None, _('import file in patch directory')),
-          ('n', 'name', '', _('patch file name')),
+          ('n', 'name', '', _('name of patch file')),
           ('f', 'force', None, _('overwrite existing files')),
           ('r', 'rev', [], _('place existing revisions under mq control')),
           ('g', 'git', None, _('use git extended diff format')),

--- a/hgext/patchbomb.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/hgext/patchbomb.py	Tue Jun 09 09:25:17 2009 -0400
@@ -148,7 +148,7 @@
             msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test')))
         p = mail.mimetextpatch('\n'.join(patch), 'x-patch', opts.get('test'))
         binnode = bin(node)
-        # if node is mq patch, it will have patch file name as tag
+        # if node is mq patch, it will have the patch file's name as a tag
         if not patchname:
             patchtags = [t for t in repo.nodetags(binnode)
                          if t.endswith('.patch') or t.endswith('.diff')]
@@ -490,7 +490,7 @@
           ('b', 'bundle', None,
            _('send changes not in target as a binary bundle')),
           ('', 'bundlename', 'bundle',
-           _('file name of the bundle attachment')),
+           _('name of the bundle attachment file')),
           ('r', 'rev', [], _('a revision to send')),
           ('', 'force', None,
            _('run even when remote repository is unrelated '

--- a/hgext/purge.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/hgext/purge.py	Tue Jun 09 09:25:17 2009 -0400
@@ -102,7 +102,7 @@
         (purge,
          [('a', 'abort-on-err', None, _('abort if an error occurs')),
           ('',  'all', None, _('purge ignored files too')),
-          ('p', 'print', None, _('print the file names instead of deleting them')),
+          ('p', 'print', None, _('print filenames instead of deleting them')),
           ('0', 'print0', None, _('end filenames with NUL, for use with xargs'
                                   ' (implies -p/--print)')),
          ] + commands.walkopts,

--- a/mercurial/cmdutil.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/cmdutil.py	Tue Jun 09 09:25:17 2009 -0400
@@ -217,7 +217,7 @@
             i += 1
         return ''.join(newname)
     except KeyError, inst:
-        raise util.Abort(_("invalid format spec '%%%s' in output file name") %
+        raise util.Abort(_("invalid format spec '%%%s' in output filename") %
                          inst.args[0])
 
 def make_file(repo, pat, node=None,
@@ -1005,7 +1005,7 @@
     positive if walking forwards through revs, last rev in the
     sequence iterated over - use to reset state for the current window
 
-    "add", rev, fns: out-of-order traversal of the given file names
+    "add", rev, fns: out-of-order traversal of the given filenames
     fns, which changed during revision rev - use to gather data for
     possible display
 
@@ -1096,7 +1096,7 @@
     if slowpath:
         if follow:
             raise util.Abort(_('can only follow copies/renames for explicit '
-                               'file names'))
+                               'filenames'))
 
         # The slow path checks files modified in every changeset.
         def changerevgen():

--- a/mercurial/commands.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/commands.py	Tue Jun 09 09:25:17 2009 -0400
@@ -88,7 +88,7 @@
     getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
 
     if not pats:
-        raise util.Abort(_('at least one file name or pattern required'))
+        raise util.Abort(_('at least one filename or pattern is required'))
 
     opmap = [('user', lambda x: ui.shortuser(x[0].user())),
              ('number', lambda x: str(x[0].rev())),
@@ -630,7 +630,7 @@
     will be committed.
 
     If you are committing the result of a merge, do not provide any
-    file names or -I/-X filters.
+    filenames or -I/-X filters.
 
     If no commit message is specified, the configured editor is
     started to prompt you for a message.
@@ -1894,8 +1894,8 @@
     project.
 
     File history is shown without following rename or copy history of
-    files. Use -f/--follow with a file name to follow history across
-    renames and copies. --follow without a file name will only show
+    files. Use -f/--follow with a filename to follow history across
+    renames and copies. --follow without a filename will only show
     ancestors or descendants of the starting revision. --follow-first
     only follows the first parent of merge revisions.
 
@@ -2151,7 +2151,7 @@
     if file_:
         m = cmdutil.match(repo, (file_,), opts)
         if m.anypats() or len(m.files()) != 1:
-            raise util.Abort(_('can only specify an explicit file name'))
+            raise util.Abort(_('can only specify an explicit filename'))
         file_ = m.files()[0]
         filenodes = []
         for cp in ctx.parents():

--- a/mercurial/hgweb/common.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/hgweb/common.py	Tue Jun 09 09:25:17 2009 -0400
@@ -71,7 +71,7 @@
         req.respond(HTTP_OK, ct, length = os.path.getsize(path))
         return file(path, 'rb').read()
     except TypeError:
-        raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal file name')
+        raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')
     except OSError, err:
         if err.errno == errno.ENOENT:
             raise ErrorResponse(HTTP_NOT_FOUND)

--- a/mercurial/match.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/match.py	Tue Jun 09 09:25:17 2009 -0400
@@ -1,4 +1,4 @@
-# match.py - file name matching
+# match.py - filename matching
 #
 #  Copyright 2008, 2009 Matt Mackall <mpm@selenic.com> and others
 #

--- a/mercurial/patch.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/patch.py	Tue Jun 09 09:25:17 2009 -0400
@@ -1350,7 +1350,7 @@
             if line.startswith('diff --git'):
                 filename = gitre.search(line).group(1)
             else:
-                # format: "diff -r ... -r ... file name"
+                # format: "diff -r ... -r ... filename"
                 filename = line.split(None, 5)[-1]
         elif line.startswith('+') and not line.startswith('+++'):
             adds += 1

--- a/mercurial/posix.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/posix.py	Tue Jun 09 09:25:17 2009 -0400
@@ -46,7 +46,7 @@
     return [os.path.expanduser('~/.hgrc')]
 
 def parse_patch_output(output_line):
-    """parses the output produced by patch and returns the file name"""
+    """parses the output produced by patch and returns the filename"""
     pf = output_line[14:]
     if os.sys.platform == 'OpenVMS':
         if pf[0] == '`':

--- a/mercurial/streamclone.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/streamclone.py	Tue Jun 09 09:25:17 2009 -0400
@@ -28,7 +28,7 @@
 #
 # then for each file:
 #
-#   server writes out line that says file name, how many bytes in
+#   server writes out line that says filename, how many bytes in
 #   file.  separator is ascii nul, byte count is string.
 #
 #   server writes out raw file data.

--- a/mercurial/windows.py	Tue Jun 09 09:25:31 2009 -0400
+++ b/mercurial/windows.py	Tue Jun 09 09:25:17 2009 -0400
@@ -91,7 +91,7 @@
     return path
 
 def parse_patch_output(output_line):
-    """parses the output produced by patch and returns the file name"""
+    """parses the output produced by patch and returns the filename"""
     pf = output_line[14:]
     if pf[0] == '`':
         pf = pf[1:-1] # Remove the quotes

--- a/tests/test-parents.out	Tue Jun 09 09:25:31 2009 -0400
+++ b/tests/test-parents.out	Tue Jun 09 09:25:17 2009 -0400
@@ -53,7 +53,7 @@
 summary:     a
 
 % hg parents -r 2 glob:a
-abort: can only specify an explicit file name
+abort: can only specify an explicit filename
 % merge working dir with 2 parents, hg parents c
 merging c
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved