##// END OF EJS Templates
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich -
r24180:d8e0c591 default
parent child Browse files
Show More
@@ -427,7 +427,7 b' class Translator(nodes.NodeVisitor):'
427 pass
427 pass
428
428
429 def visit_block_quote(self, node):
429 def visit_block_quote(self, node):
430 # BUG/HACK: indent alway uses the _last_ indention,
430 # BUG/HACK: indent always uses the _last_ indention,
431 # thus we need two of them.
431 # thus we need two of them.
432 self.indent(BLOCKQOUTE_INDENT)
432 self.indent(BLOCKQOUTE_INDENT)
433 self.indent(0)
433 self.indent(0)
@@ -471,9 +471,8 b' def updatelfiles(ui, repo, filelist=None'
471 if lfile not in repo[None]: # not switched to normal file
471 if lfile not in repo[None]: # not switched to normal file
472 util.unlinkpath(abslfile, ignoremissing=True)
472 util.unlinkpath(abslfile, ignoremissing=True)
473 # use normallookup() to allocate an entry in largefiles
473 # use normallookup() to allocate an entry in largefiles
474 # dirstate, because lack of it misleads
474 # dirstate to prevent lfilesrepo.status() from reporting
475 # lfilesrepo.status() into recognition that such cache
475 # missing files as removed.
476 # missing files are removed.
477 lfdirstate.normallookup(lfile)
476 lfdirstate.normallookup(lfile)
478 update[lfile] = expecthash
477 update[lfile] = expecthash
479 else:
478 else:
@@ -329,10 +329,10 b' def reposetup(ui, repo):'
329 actualfiles.append(lf)
329 actualfiles.append(lf)
330 if not matcheddir:
330 if not matcheddir:
331 # There may still be normal files in the dir, so
331 # There may still be normal files in the dir, so
332 # make sure _a_ directory is in the list, which
332 # add a directory to the list, which
333 # forces status/dirstate to walk all files and
333 # forces status/dirstate to walk all files and
334 # call the match function on the matcher, even
334 # call the match function on the matcher, even
335 # on case sensitive filesytems.
335 # on case sensitive filesystems.
336 actualfiles.append('.')
336 actualfiles.append('.')
337 matcheddir = True
337 matcheddir = True
338 # Nothing in dir, so readd it
338 # Nothing in dir, so readd it
@@ -456,5 +456,5 b' def validdest(repo, old, new):'
456 elif repo.obsstore:
456 elif repo.obsstore:
457 return new.node() in obsolete.foreground(repo, [old.node()])
457 return new.node() in obsolete.foreground(repo, [old.node()])
458 else:
458 else:
459 # still an independent clause as it is lazyer (and therefore faster)
459 # still an independent clause as it is lazier (and therefore faster)
460 return old.descendant(new)
460 return old.descendant(new)
@@ -111,7 +111,8 b' def writebundle(ui, cg, filename, bundle'
111 chunkiter = bundle.getchunks()
111 chunkiter = bundle.getchunks()
112 else:
112 else:
113 if cg.version != '01':
113 if cg.version != '01':
114 raise util.Abort(_('Bundle1 only supports v1 changegroups\n'))
114 raise util.Abort(_('old bundle types only supports v1 '
115 'changegroups'))
115 header, compressor = bundletypes[bundletype]
116 header, compressor = bundletypes[bundletype]
116 fh.write(header)
117 fh.write(header)
117 z = compressor()
118 z = compressor()
@@ -110,22 +110,22 b' def logmessage(ui, opts):'
110 (logfile, inst.strerror))
110 (logfile, inst.strerror))
111 return message
111 return message
112
112
113 def mergeeditform(ctxorbool, baseform):
113 def mergeeditform(ctxorbool, baseformname):
114 """build appropriate editform from ctxorbool and baseform
114 """return appropriate editform name (referencing a committemplate)
115
115
116 'ctxorbool' is one of a ctx to be committed, or a bool whether
116 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
117 merging is committed.
117 merging is committed.
118
118
119 This returns editform 'baseform' with '.merge' if merging is
119 This returns baseformname with '.merge' appended if it is a merge,
120 committed, or one with '.normal' suffix otherwise.
120 otherwise '.normal' is appended.
121 """
121 """
122 if isinstance(ctxorbool, bool):
122 if isinstance(ctxorbool, bool):
123 if ctxorbool:
123 if ctxorbool:
124 return baseform + ".merge"
124 return baseformname + ".merge"
125 elif 1 < len(ctxorbool.parents()):
125 elif 1 < len(ctxorbool.parents()):
126 return baseform + ".merge"
126 return baseformname + ".merge"
127
127
128 return baseform + ".normal"
128 return baseformname + ".normal"
129
129
130 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
130 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
131 editform='', **opts):
131 editform='', **opts):
@@ -2600,9 +2600,8 b' def revert(ui, repo, ctx, parents, *pats'
2600 deladded = _deleted - smf
2600 deladded = _deleted - smf
2601 deleted = _deleted - deladded
2601 deleted = _deleted - deladded
2602
2602
2603 # We need to account for the state of file in the dirstate.
2603 # We need to account for the state of the file in the dirstate,
2604 #
2604 # even when we revert against something else than parent. This will
2605 # Even, when we revert against something else than parent. This will
2606 # slightly alter the behavior of revert (doing back up or not, delete
2605 # slightly alter the behavior of revert (doing back up or not, delete
2607 # or just forget etc).
2606 # or just forget etc).
2608 if parent == node:
2607 if parent == node:
@@ -754,7 +754,7 b' class basefilectx(object):'
754 return True
754 return True
755
755
756 def _adjustlinkrev(self, path, filelog, fnode, srcrev, inclusive=False):
756 def _adjustlinkrev(self, path, filelog, fnode, srcrev, inclusive=False):
757 """return the first ancestor of <srcrev> introducting <fnode>
757 """return the first ancestor of <srcrev> introducing <fnode>
758
758
759 If the linkrev of the file revision does not point to an ancestor of
759 If the linkrev of the file revision does not point to an ancestor of
760 srcrev, we'll walk down the ancestors until we find one introducing
760 srcrev, we'll walk down the ancestors until we find one introducing
@@ -826,7 +826,7 b' class basefilectx(object):'
826 # be replaced with the rename information. This parent is -always-
826 # be replaced with the rename information. This parent is -always-
827 # the first one.
827 # the first one.
828 #
828 #
829 # As null id have alway been filtered out in the previous list
829 # As null id have always been filtered out in the previous list
830 # comprehension, inserting to 0 will always result in "replacing
830 # comprehension, inserting to 0 will always result in "replacing
831 # first nullid parent with rename information.
831 # first nullid parent with rename information.
832 pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
832 pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
@@ -122,7 +122,7 b' def groupbranchiter(revs, parentsfunc, f'
122 heappush(pendingheap, -currentrev)
122 heappush(pendingheap, -currentrev)
123 pendingset.add(currentrev)
123 pendingset.add(currentrev)
124 # iterates on pending rev until after the current rev have been
124 # iterates on pending rev until after the current rev have been
125 # processeed.
125 # processed.
126 rev = None
126 rev = None
127 while rev != currentrev:
127 while rev != currentrev:
128 rev = -heappop(pendingheap)
128 rev = -heappop(pendingheap)
@@ -1210,7 +1210,7 b' class localrepository(object):'
1210
1210
1211 # Here, we used to search backwards through history to try to find
1211 # Here, we used to search backwards through history to try to find
1212 # where the file copy came from if the source of a copy was not in
1212 # where the file copy came from if the source of a copy was not in
1213 # the parent diretory. However, this doesn't actually make sense to
1213 # the parent directory. However, this doesn't actually make sense to
1214 # do (what does a copy from something not in your working copy even
1214 # do (what does a copy from something not in your working copy even
1215 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
1215 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
1216 # the user that copy information was dropped, so if they didn't
1216 # the user that copy information was dropped, so if they didn't
@@ -142,7 +142,7 b' class namespace(object):'
142 is used
142 is used
143 colorname: the name to use for colored log output; if not specified
143 colorname: the name to use for colored log output; if not specified
144 logname is used
144 logname is used
145 logfmt: the format to use for (l10n-ed) log output; if not specified
145 logfmt: the format to use for (i18n-ed) log output; if not specified
146 it is composed from logname
146 it is composed from logname
147 listnames: function to list all names
147 listnames: function to list all names
148 namemap: function that inputs a node, output name(s)
148 namemap: function that inputs a node, output name(s)
@@ -30,12 +30,12 b''
30 adding foo
30 adding foo
31 $ hg forget foo
31 $ hg forget foo
32 #if windows
32 #if windows
33 $ hg -v addremove nonexistant
33 $ hg -v addremove nonexistent
34 nonexistant: The system cannot find the file specified
34 nonexistent: The system cannot find the file specified
35 [1]
35 [1]
36 #else
36 #else
37 $ hg -v addremove nonexistant
37 $ hg -v addremove nonexistent
38 nonexistant: No such file or directory
38 nonexistent: No such file or directory
39 [1]
39 [1]
40 #endif
40 #endif
41 $ cd ..
41 $ cd ..
@@ -88,13 +88,13 b''
88
88
89 $ rm c
89 $ rm c
90 #if windows
90 #if windows
91 $ hg ci -A -m "c" nonexistant
91 $ hg ci -A -m "c" nonexistent
92 nonexistant: The system cannot find the file specified
92 nonexistent: The system cannot find the file specified
93 abort: failed to mark all new/missing files as added/removed
93 abort: failed to mark all new/missing files as added/removed
94 [255]
94 [255]
95 #else
95 #else
96 $ hg ci -A -m "c" nonexistant
96 $ hg ci -A -m "c" nonexistent
97 nonexistant: No such file or directory
97 nonexistent: No such file or directory
98 abort: failed to mark all new/missing files as added/removed
98 abort: failed to mark all new/missing files as added/removed
99 [255]
99 [255]
100 #endif
100 #endif
@@ -51,7 +51,7 b' print ctxb.status(ctxa)'
51 for d in ctxb.diff(ctxa, git=True):
51 for d in ctxb.diff(ctxa, git=True):
52 print d
52 print d
53
53
54 # test safeness and correctness of "cxt.status()"
54 # test safeness and correctness of "ctx.status()"
55 print '= checking context.status():'
55 print '= checking context.status():'
56
56
57 # ancestor "wcctx ~ 2"
57 # ancestor "wcctx ~ 2"
@@ -136,7 +136,7 b' Test permission of files created by push'
136 #endif
136 #endif
137
137
138 Test issue 4053 (remove --after on a deleted, uncommitted file shouldn't say
138 Test issue 4053 (remove --after on a deleted, uncommitted file shouldn't say
139 it is missing, but a remove on a nonexistant unknown file still should. Same
139 it is missing, but a remove on a nonexistent unknown file still should. Same
140 for a forget.)
140 for a forget.)
141
141
142 $ cd src
142 $ cd src
@@ -1659,7 +1659,7 b' hg log -f dir across branches'
1659 |
1659 |
1660 o a
1660 o a
1661
1661
1662 Ensure that largefiles doesn't intefere with following a normal file
1662 Ensure that largefiles doesn't interfere with following a normal file
1663 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
1663 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
1664 @ c
1664 @ c
1665 |
1665 |
General Comments 0
You need to be logged in to leave comments. Login now