facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

Generally replace "file name" with "filename" in help and comments.

Browse Source
This commit is contained in:
timeless 2009-06-09 09:25:17 -04:00
parent 3ccbc308d0
commit fb33de67af
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hgext/mq.py
View File

@ -503,7 +503,7 @@ class queue:
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 @@ cmdtable = {
"^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')),

4
hgext/patchbomb.py
View File

@ -148,7 +148,7 @@ def makepatch(ui, repo, patch, opts, _charsets, idx, total, patchname=None):
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 @@ cmdtable = {
('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 '

2
hgext/purge.py
View File

@ -102,7 +102,7 @@ cmdtable = {
(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,

6
mercurial/cmdutil.py
View File

@ -217,7 +217,7 @@ def make_filename(repo, pat, node,
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 @@ def walkchangerevs(ui, repo, pats, change, opts):
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 @@ def walkchangerevs(ui, repo, pats, change, opts):
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():

10
mercurial/commands.py
View File

@ -88,7 +88,7 @@ def annotate(ui, repo, *pats, **opts):
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 @@ def commit(ui, repo, *pats, **opts):
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 @@ def log(ui, repo, *pats, **opts):
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 @@ def parents(ui, repo, file_=None, **opts):
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():

2
mercurial/hgweb/common.py
View File

@ -71,7 +71,7 @@ def staticfile(directory, fname, req):
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)

2
mercurial/match.py
View File

@ -1,4 +1,4 @@
# match.py - file name matching
# match.py - filename matching
#
# Copyright 2008, 2009 Matt Mackall <mpm@selenic.com> and others
#

2
mercurial/patch.py
View File

@ -1350,7 +1350,7 @@ def diffstatdata(lines):
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

2
mercurial/posix.py
View File

@ -46,7 +46,7 @@ def user_rcpath():
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] == '`':

2
mercurial/streamclone.py
View File

@ -28,7 +28,7 @@ class StreamException(Exception):
#
# 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.

2
mercurial/windows.py
View File

@ -91,7 +91,7 @@ def user_rcpath():
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

2
tests/test-parents.out
View File

@ -53,7 +53,7 @@ date: Thu Jan 01 00:00:01 1970 +0000
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