Show More
@@ -8,7 +8,7 b'' | |||
|
8 | 8 | # |
|
9 | 9 | # Please update this file with any revsets you use for benchmarking a change so |
|
10 | 10 | # that future contributors can easily find and retest it when doing further |
|
11 |
# modification. Feel free to highlight inter |
|
|
11 | # modification. Feel free to highlight interesting variants if needed. | |
|
12 | 12 | |
|
13 | 13 | |
|
14 | 14 | ## Revset from this section are all extracted from changelog when this file was |
@@ -720,7 +720,7 b' function! <SID>_GenericReview(argslist) ' | |||
|
720 | 720 | let s:origtabpagenr = tabpagenr() |
|
721 | 721 | silent! exe 'tabedit ' . StrippedRelativeFilePath |
|
722 | 722 | if exists('patchcmd') |
|
723 |
" modelines in loaded files mess with diff comparis |
|
|
723 | " modelines in loaded files mess with diff comparison | |
|
724 | 724 | let s:keep_modeline=&modeline |
|
725 | 725 | let &modeline=0 |
|
726 | 726 | silent! exe 'vert diffsplit ' . tmpname . '.file' |
@@ -629,7 +629,7 b' class chgunixservicehandler(object):' | |||
|
629 | 629 | |
|
630 | 630 | def chgunixservice(ui, repo, opts): |
|
631 | 631 | if repo: |
|
632 | # one chgserver can serve multiple repos. drop repo infomation | |
|
632 | # one chgserver can serve multiple repos. drop repo information | |
|
633 | 633 | ui.setconfig('bundle', 'mainreporoot', '', 'repo') |
|
634 | 634 | h = chgunixservicehandler(ui) |
|
635 | 635 | return commandserver.unixforkingservice(ui, repo=None, opts=opts, handler=h) |
@@ -563,7 +563,7 b' def wrapsymlink(orig, source, link_name)' | |||
|
563 | 563 | pass |
|
564 | 564 | |
|
565 | 565 | class state_update(object): |
|
566 |
''' This context mana |
|
|
566 | ''' This context manager is responsible for dispatching the state-enter | |
|
567 | 567 | and state-leave signals to the watchman service ''' |
|
568 | 568 | |
|
569 | 569 | def __init__(self, repo, node, distance, partial): |
@@ -1405,12 +1405,12 b' def verifyactions(actions, state, ctxs):' | |||
|
1405 | 1405 | % node.short(missing[0])) |
|
1406 | 1406 | |
|
1407 | 1407 | def adjustreplacementsfrommarkers(repo, oldreplacements): |
|
1408 |
"""Adjust replacements from obsolescen |
|
|
1408 | """Adjust replacements from obsolescence markers | |
|
1409 | 1409 | |
|
1410 | 1410 | Replacements structure is originally generated based on |
|
1411 | 1411 | histedit's state and does not account for changes that are |
|
1412 | 1412 | not recorded there. This function fixes that by adding |
|
1413 |
data read from obsolescen |
|
|
1413 | data read from obsolescence markers""" | |
|
1414 | 1414 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
1415 | 1415 | return oldreplacements |
|
1416 | 1416 |
@@ -27,7 +27,7 b' For example::' | |||
|
27 | 27 | |
|
28 | 28 | would log the warning message and traceback of any failed command dispatch. |
|
29 | 29 | |
|
30 | Scripts are run asychronously as detached daemon processes; mercurial will | |
|
30 | Scripts are run asynchronously as detached daemon processes; mercurial will | |
|
31 | 31 | not ensure that they exit cleanly. |
|
32 | 32 | |
|
33 | 33 | """ |
@@ -1385,7 +1385,7 b' def _computeobsoletenotrebased(repo, reb' | |||
|
1385 | 1385 | """return a mapping obsolete => successor for all obsolete nodes to be |
|
1386 | 1386 | rebased that have a successors in the destination |
|
1387 | 1387 | |
|
1388 | obsolete => None entries in the mapping indicate nodes with no succesor""" | |
|
1388 | obsolete => None entries in the mapping indicate nodes with no successor""" | |
|
1389 | 1389 | obsoletenotrebased = {} |
|
1390 | 1390 | |
|
1391 | 1391 | # Build a mapping successor => obsolete nodes for the obsolete |
@@ -6747,7 +6747,7 b' msgid ""' | |||
|
6747 | 6747 | msgstr "" |
|
6748 | 6748 | |
|
6749 | 6749 | msgid "" |
|
6750 | "Scripts are run asychronously as detached daemon processes; mercurial will\n" | |
|
6750 | "Scripts are run asynchronously as detached daemon processes; mercurial will\n" | |
|
6751 | 6751 | "not ensure that they exit cleanly." |
|
6752 | 6752 | msgstr "" |
|
6753 | 6753 | |
@@ -10366,7 +10366,7 b' msgid "corrupted shelved state file"' | |||
|
10366 | 10366 | msgstr "shelve 状態管理ファイルが破損しています" |
|
10367 | 10367 | |
|
10368 | 10368 | msgid "please run hg unshelve --abort to abort unshelve operation" |
|
10369 |
msgstr "'hg unshelve --abort' を実施して unsh |
|
|
10369 | msgstr "'hg unshelve --abort' を実施して unshelve 操作を中断してください" | |
|
10370 | 10370 | |
|
10371 | 10371 | msgid "" |
|
10372 | 10372 | "could not read shelved state file, your working copy may be in an unexpected " |
@@ -14200,7 +14200,7 b' msgid "cannot delete obsmarkers in the m' | |||
|
14200 | 14200 | msgstr "トランザクション実施途中は廃止マーカを破棄できません" |
|
14201 | 14201 | |
|
14202 | 14202 | #, python-format |
|
14203 |
msgid "deleted %i obsolescen |
|
|
14203 | msgid "deleted %i obsolescence markers\n" | |
|
14204 | 14204 | msgstr "%i 個の廃止マーカを破棄\n" |
|
14205 | 14205 | |
|
14206 | 14206 | #, python-format |
@@ -32665,8 +32665,8 b' msgstr ""' | |||
|
32665 | 32665 | msgid "revset expects one or more arguments" |
|
32666 | 32666 | msgstr "revset の引数は1個以上です" |
|
32667 | 32667 | |
|
32668 |
msgid ":rstdoc(text, style): Format |
|
|
32669 |
msgstr ":rstdoc(text, style): 出力を |
|
|
32668 | msgid ":rstdoc(text, style): Format reStructuredText." | |
|
32669 | msgstr ":rstdoc(text, style): 出力を reStructuredText として整形します。" | |
|
32670 | 32670 | |
|
32671 | 32671 | #. i18n: "rstdoc" is a keyword |
|
32672 | 32672 | msgid "rstdoc expects two arguments" |
@@ -6761,7 +6761,7 b' msgstr ""' | |||
|
6761 | 6761 | "falhasse." |
|
6762 | 6762 | |
|
6763 | 6763 | msgid "" |
|
6764 | "Scripts are run asychronously as detached daemon processes; mercurial will\n" | |
|
6764 | "Scripts are run asynchronously as detached daemon processes; mercurial will\n" | |
|
6765 | 6765 | "not ensure that they exit cleanly." |
|
6766 | 6766 | msgstr "" |
|
6767 | 6767 | "Os scripts são executados assincronamente como processos desanexados;\n" |
@@ -14438,7 +14438,7 b' msgstr ""' | |||
|
14438 | 14438 | "não é possível apagar marcações de obsolescência durante uma transação." |
|
14439 | 14439 | |
|
14440 | 14440 | #, python-format |
|
14441 |
msgid "deleted %i obsolescen |
|
|
14441 | msgid "deleted %i obsolescence markers\n" | |
|
14442 | 14442 | msgstr "%i marcações de obsolescência apagadas\n" |
|
14443 | 14443 | |
|
14444 | 14444 | #, python-format |
@@ -33523,8 +33523,8 b' msgstr ""' | |||
|
33523 | 33523 | msgid "revset expects one or more arguments" |
|
33524 | 33524 | msgstr "revset espera um ou mais argumentos" |
|
33525 | 33525 | |
|
33526 |
msgid ":rstdoc(text, style): Format |
|
|
33527 |
msgstr ":rstdoc(texto, estilo): Formata |
|
|
33526 | msgid ":rstdoc(text, style): Format reStructuredText." | |
|
33527 | msgstr ":rstdoc(texto, estilo): Formata reStructuredText." | |
|
33528 | 33528 | |
|
33529 | 33529 | #. i18n: "rstdoc" is a keyword |
|
33530 | 33530 | msgid "rstdoc expects two arguments" |
@@ -3471,7 +3471,7 b' def howtocontinue(repo):' | |||
|
3471 | 3471 | '''Check for an unfinished operation and return the command to finish |
|
3472 | 3472 | it. |
|
3473 | 3473 | |
|
3474 |
afterresolvedstates tup |
|
|
3474 | afterresolvedstates tuples define a .hg/{file} and the corresponding | |
|
3475 | 3475 | command needed to finish it. |
|
3476 | 3476 | |
|
3477 | 3477 | Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is |
@@ -3068,7 +3068,7 b' def debugobsolete(ui, repo, precursor=No' | |||
|
3068 | 3068 | |
|
3069 | 3069 | with repo.lock(): |
|
3070 | 3070 | n = repair.deleteobsmarkers(repo.obsstore, indices) |
|
3071 |
ui.write(_('deleted %i obsolescen |
|
|
3071 | ui.write(_('deleted %i obsolescence markers\n') % n) | |
|
3072 | 3072 | |
|
3073 | 3073 | return |
|
3074 | 3074 |
@@ -1401,13 +1401,13 b' are you sure you want to review/edit and' | |||
|
1401 | 1401 | "Press any key to continue.") |
|
1402 | 1402 | elif opts.get('amend') is None: |
|
1403 | 1403 | opts['amend'] = True |
|
1404 | msg = ("Amend option is turned on -- commiting the currently " | |
|
1404 | msg = ("Amend option is turned on -- committing the currently " | |
|
1405 | 1405 | "selected changes will not create a new changeset, but " |
|
1406 | 1406 | "instead update the most recently committed changeset.\n\n" |
|
1407 | 1407 | "Press any key to continue.") |
|
1408 | 1408 | elif opts.get('amend') is True: |
|
1409 | 1409 | opts['amend'] = None |
|
1410 | msg = ("Amend option is turned off -- commiting the currently " | |
|
1410 | msg = ("Amend option is turned off -- committing the currently " | |
|
1411 | 1411 | "selected changes will create a new changeset.\n\n" |
|
1412 | 1412 | "Press any key to continue.") |
|
1413 | 1413 | if not test: |
@@ -1610,7 +1610,7 b' are you sure you want to review/edit and' | |||
|
1610 | 1610 | except curses.error: |
|
1611 | 1611 | self.initerr = _('this diff is too large to be displayed') |
|
1612 | 1612 | return |
|
1613 | # initialize selecteitemendline (initial start-line is 0) | |
|
1613 | # initialize selecteditemendline (initial start-line is 0) | |
|
1614 | 1614 | self.selecteditemendline = self.getnumlinesdisplayed( |
|
1615 | 1615 | self.currentselecteditem, recursechildren=False) |
|
1616 | 1616 |
@@ -133,7 +133,7 b' def _destupdatebranchfallback(repo, clea' | |||
|
133 | 133 | assert node is not None, "'tip' exists even in empty repository" |
|
134 | 134 | return node, movemark, None |
|
135 | 135 | |
|
136 |
# order in which each step should be evalu |
|
|
136 | # order in which each step should be evaluated | |
|
137 | 137 | # steps are run until one finds a destination |
|
138 | 138 | destupdatesteps = ['evolution', 'bookmark', 'branch', 'branchfallback'] |
|
139 | 139 | # mapping to ease extension overriding steps. |
@@ -84,7 +84,7 b' class NoMergeDestAbort(MergeDestAbort):' | |||
|
84 | 84 | """Raised when an update is aborted because there is nothing to merge""" |
|
85 | 85 | |
|
86 | 86 | class ManyMergeDestAbort(MergeDestAbort): |
|
87 |
"""Raised when an update is aborted because destination is ambig |
|
|
87 | """Raised when an update is aborted because destination is ambiguous""" | |
|
88 | 88 | |
|
89 | 89 | class ResponseExpected(Abort): |
|
90 | 90 | """Raised when an EOF is received for a prompt""" |
@@ -64,7 +64,7 b' def parsebundlespec(repo, spec, strict=T' | |||
|
64 | 64 | |
|
65 | 65 | Where <compression> is one of the supported compression formats |
|
66 | 66 | and <type> is (currently) a version string. A ";" can follow the type and |
|
67 |
all text afterwards is interpret |
|
|
67 | all text afterwards is interpreted as URI encoded, ";" delimited key=value | |
|
68 | 68 | pairs. |
|
69 | 69 | |
|
70 | 70 | If ``strict`` is True (the default) <compression> is required. Otherwise, |
@@ -282,7 +282,7 b' def _forcebundle1(op):' | |||
|
282 | 282 | This function is used to allow testing of the older bundle version""" |
|
283 | 283 | ui = op.repo.ui |
|
284 | 284 | forcebundle1 = False |
|
285 |
# The goal is this config is to allow develop |
|
|
285 | # The goal is this config is to allow developer to choose the bundle | |
|
286 | 286 | # version used during exchanged. This is especially handy during test. |
|
287 | 287 | # Value is a list of bundle version to be picked from, highest version |
|
288 | 288 | # should be used. |
@@ -1425,7 +1425,7 b' def _pullapplyphases(pullop, remotephase' | |||
|
1425 | 1425 | pullop.stepsdone.add('phases') |
|
1426 | 1426 | publishing = bool(remotephases.get('publishing', False)) |
|
1427 | 1427 | if remotephases and not publishing: |
|
1428 |
# remote is new and |
|
|
1428 | # remote is new and non-publishing | |
|
1429 | 1429 | pheads, _dr = phases.analyzeremotephases(pullop.repo, |
|
1430 | 1430 | pullop.pulledsubset, |
|
1431 | 1431 | remotephases) |
@@ -1502,7 +1502,7 b' class localrepository(object):' | |||
|
1502 | 1502 | return fparent1 |
|
1503 | 1503 | |
|
1504 | 1504 | def checkcommitpatterns(self, wctx, vdirs, match, status, fail): |
|
1505 | """check for commit arguments that aren't commitable""" | |
|
1505 | """check for commit arguments that aren't committable""" | |
|
1506 | 1506 | if match.isexact() or match.prefix(): |
|
1507 | 1507 | matched = set(status.modified + status.added + status.removed) |
|
1508 | 1508 |
@@ -66,7 +66,7 b' class mergestate(object):' | |||
|
66 | 66 | (experimental) |
|
67 | 67 | m: the external merge driver defined for this merge plus its run state |
|
68 | 68 | (experimental) |
|
69 | f: a (filename, dictonary) tuple of optional values for a given file | |
|
69 | f: a (filename, dictionary) tuple of optional values for a given file | |
|
70 | 70 | X: unsupported mandatory record type (used in tests) |
|
71 | 71 | x: unsupported advisory record type (used in tests) |
|
72 | 72 | l: the labels for the parts of the merge. |
@@ -248,7 +248,7 b' class basealiasrules(object):' | |||
|
248 | 248 | This is a helper for fileset/revset/template aliases. A concrete rule set |
|
249 | 249 | should be made by sub-classing this and implementing class/static methods. |
|
250 | 250 | |
|
251 |
It supports alias expansion of symbol and func |
|
|
251 | It supports alias expansion of symbol and function-call styles:: | |
|
252 | 252 | |
|
253 | 253 | # decl = defn |
|
254 | 254 | h = heads(default) |
@@ -84,7 +84,7 b' class pathauditor(object):' | |||
|
84 | 84 | normparts.pop() |
|
85 | 85 | prefixes = [] |
|
86 | 86 | # It's important that we check the path parts starting from the root. |
|
87 | # This means we won't accidentaly traverse a symlink into some other | |
|
87 | # This means we won't accidentally traverse a symlink into some other | |
|
88 | 88 | # filesystem (which is potentially expensive to access). |
|
89 | 89 | for i in range(len(parts)): |
|
90 | 90 | prefix = os.sep.join(parts[:i + 1]) |
@@ -13,7 +13,7 b' from . import (' | |||
|
13 | 13 | ) |
|
14 | 14 | |
|
15 | 15 | class _funcregistrarbase(object): |
|
16 | """Base of decorator to register a fuction for specific purpose | |
|
16 | """Base of decorator to register a function for specific purpose | |
|
17 | 17 | |
|
18 | 18 | This decorator stores decorated functions into own dict 'table'. |
|
19 | 19 | |
@@ -177,7 +177,7 b' class templatekeyword(_templateregistrar' | |||
|
177 | 177 | |
|
178 | 178 | Usage:: |
|
179 | 179 | |
|
180 |
templa |
|
|
180 | templatekeyword = registrar.templatekeyword() | |
|
181 | 181 | |
|
182 | 182 | @templatekeyword('mykeyword') |
|
183 | 183 | def mykeywordfunc(repo, ctx, templ, cache, revcache, **args): |
@@ -1443,7 +1443,7 b' def only(repo, subset, x):' | |||
|
1443 | 1443 | |
|
1444 | 1444 | results = set(cl.findmissingrevs(common=exclude, heads=include)) |
|
1445 | 1445 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1446 |
# some optimi |
|
|
1446 | # some optimizations from the fact this is a baseset. | |
|
1447 | 1447 | return subset & results |
|
1448 | 1448 | |
|
1449 | 1449 | @predicate('origin([set])', safe=True) |
@@ -1475,7 +1475,7 b' def origin(repo, subset, x):' | |||
|
1475 | 1475 | o = set([_firstsrc(r) for r in dests]) |
|
1476 | 1476 | o -= set([None]) |
|
1477 | 1477 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1478 |
# some optimi |
|
|
1478 | # some optimizations from the fact this is a baseset. | |
|
1479 | 1479 | return subset & o |
|
1480 | 1480 | |
|
1481 | 1481 | @predicate('outgoing([path])', safe=True) |
@@ -1521,7 +1521,7 b' def p1(repo, subset, x):' | |||
|
1521 | 1521 | ps.add(cl.parentrevs(r)[0]) |
|
1522 | 1522 | ps -= set([node.nullrev]) |
|
1523 | 1523 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1524 |
# some optimi |
|
|
1524 | # some optimizations from the fact this is a baseset. | |
|
1525 | 1525 | return subset & ps |
|
1526 | 1526 | |
|
1527 | 1527 | @predicate('p2([set])', safe=True) |
@@ -1544,7 +1544,7 b' def p2(repo, subset, x):' | |||
|
1544 | 1544 | ps.add(cl.parentrevs(r)[1]) |
|
1545 | 1545 | ps -= set([node.nullrev]) |
|
1546 | 1546 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1547 |
# some optimi |
|
|
1547 | # some optimizations from the fact this is a baseset. | |
|
1548 | 1548 | return subset & ps |
|
1549 | 1549 | |
|
1550 | 1550 | def parentpost(repo, subset, x, order): |
@@ -3198,7 +3198,7 b' class filteredset(abstractsmartset):' | |||
|
3198 | 3198 | def __len__(self): |
|
3199 | 3199 | # Basic implementation to be changed in future patches. |
|
3200 | 3200 | # until this gets improved, we use generator expression |
|
3201 |
# here, since list compr |
|
|
3201 | # here, since list comprehensions are free to call __len__ again | |
|
3202 | 3202 | # causing infinite recursion |
|
3203 | 3203 | l = baseset(r for r in self) |
|
3204 | 3204 | return len(l) |
@@ -274,7 +274,7 b' class Merge3Text(object):' | |||
|
274 | 274 | def minimize(self, merge_regions): |
|
275 | 275 | """Trim conflict regions of lines where A and B sides match. |
|
276 | 276 | |
|
277 | Lines where both A and B have made the same changes at the begining | |
|
277 | Lines where both A and B have made the same changes at the beginning | |
|
278 | 278 | or the end of each merge region are eliminated from the conflict |
|
279 | 279 | region and are instead considered the same. |
|
280 | 280 | """ |
@@ -638,7 +638,7 b' def _verifycert(cert, hostname):' | |||
|
638 | 638 | # According to RFC 2818 the most specific Common Name must |
|
639 | 639 | # be used. |
|
640 | 640 | if key == 'commonName': |
|
641 |
# 'subject' entries are unic |
|
|
641 | # 'subject' entries are unicode. | |
|
642 | 642 | try: |
|
643 | 643 | value = value.encode('ascii') |
|
644 | 644 | except UnicodeEncodeError: |
@@ -764,7 +764,7 b' def _defaultcacerts(ui):' | |||
|
764 | 764 | return None |
|
765 | 765 | |
|
766 | 766 | def validatesocket(sock): |
|
767 |
"""Validate a socket meets security requirem |
|
|
767 | """Validate a socket meets security requirements. | |
|
768 | 768 | |
|
769 | 769 | The passed socket must have been created with ``wrapsocket()``. |
|
770 | 770 | """ |
@@ -286,11 +286,11 b" def generatebundlev1(repo, compression='" | |||
|
286 | 286 | def consumev1(repo, fp, filecount, bytecount): |
|
287 | 287 | """Apply the contents from version 1 of a streaming clone file handle. |
|
288 | 288 | |
|
289 | This takes the output from "streamout" and applies it to the specified | |
|
289 | This takes the output from "stream_out" and applies it to the specified | |
|
290 | 290 | repository. |
|
291 | 291 | |
|
292 |
Like "streamout," the status line added by the wire protocol is not |
|
|
293 | by this function. | |
|
292 | Like "stream_out," the status line added by the wire protocol is not | |
|
293 | handled by this function. | |
|
294 | 294 | """ |
|
295 | 295 | with repo.lock(): |
|
296 | 296 | repo.ui.status(_('%d files to transfer, %s of data\n') % |
@@ -792,7 +792,7 b' def revset(context, mapping, args):' | |||
|
792 | 792 | |
|
793 | 793 | @templatefunc('rstdoc(text, style)') |
|
794 | 794 | def rstdoc(context, mapping, args): |
|
795 |
"""Format |
|
|
795 | """Format reStructuredText.""" | |
|
796 | 796 | if len(args) != 2: |
|
797 | 797 | # i18n: "rstdoc" is a keyword |
|
798 | 798 | raise error.ParseError(_("rstdoc expects two arguments")) |
@@ -736,7 +736,7 b' class ui(object):' | |||
|
736 | 736 | is curses, the interface for histedit is text and the interface for |
|
737 | 737 | selecting chunk is crecord (the best curses interface available). |
|
738 | 738 | |
|
739 |
Consider the following ex |
|
|
739 | Consider the following example: | |
|
740 | 740 | ui.interface = curses |
|
741 | 741 | ui.interface.histedit = text |
|
742 | 742 |
@@ -1456,7 +1456,7 b' class filestat(object):' | |||
|
1456 | 1456 | def __eq__(self, old): |
|
1457 | 1457 | try: |
|
1458 | 1458 | # if ambiguity between stat of new and old file is |
|
1459 |
# avoided, comparis |
|
|
1459 | # avoided, comparison of size, ctime and mtime is enough | |
|
1460 | 1460 | # to exactly detect change of a file regardless of platform |
|
1461 | 1461 | return (self.stat.st_size == old.stat.st_size and |
|
1462 | 1462 | self.stat.st_ctime == old.stat.st_ctime and |
@@ -1,4 +1,4 b'' | |||
|
1 | # extension to emulate interupting filemerge._filemerge | |
|
1 | # extension to emulate interrupting filemerge._filemerge | |
|
2 | 2 | |
|
3 | 3 | from __future__ import absolute_import |
|
4 | 4 |
@@ -68,7 +68,7 b' class testatomictempfile(unittest.TestCa' | |||
|
68 | 68 | repetition = 3 |
|
69 | 69 | |
|
70 | 70 | # repeat atomic write with checkambig=True, to examine |
|
71 |
# whether st_mtime is advanced multiple times as expec |
|
|
71 | # whether st_mtime is advanced multiple times as expected | |
|
72 | 72 | for j in xrange(repetition): |
|
73 | 73 | atomicwrite(True) |
|
74 | 74 | newstat = os.stat(self._filename) |
@@ -77,7 +77,7 b' class testatomictempfile(unittest.TestCa' | |||
|
77 | 77 | continue |
|
78 | 78 | |
|
79 | 79 | # st_mtime should be advanced "repetition" times, because |
|
80 | # all atomicwrite() occured at same time (in sec) | |
|
80 | # all atomicwrite() occurred at same time (in sec) | |
|
81 | 81 | self.assertTrue(newstat.st_mtime == |
|
82 | 82 | ((oldstat.st_mtime + repetition) & 0x7fffffff)) |
|
83 | 83 | # no more examination is needed, if assumption above is true |
@@ -272,7 +272,7 b' external hook process' | |||
|
272 | 272 | |
|
273 | 273 | (1) update to REV1 (REV2 => REV1) |
|
274 | 274 | (2) revert by REV1^1 |
|
275 |
(3) commit back |
|
|
275 | (3) commit backing out revision (REV3) | |
|
276 | 276 | (4) update to REV2 (REV3 => REV2) |
|
277 | 277 | (5) merge with REV3 (REV2 => REV2, REV3) |
|
278 | 278 | |
@@ -287,7 +287,7 b' external hook process' | |||
|
287 | 287 | > preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate |
|
288 | 288 | > EOF |
|
289 | 289 | |
|
290 | ("-m" is needed to avoid writing dirstte changes out at other than | |
|
290 | ("-m" is needed to avoid writing dirstate changes out at other than | |
|
291 | 291 | invocation of the hook to be examined) |
|
292 | 292 | |
|
293 | 293 | $ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment' |
@@ -550,7 +550,7 b' hgweb' | |||
|
550 | 550 | |
|
551 | 551 | $ cd .. |
|
552 | 552 | |
|
553 |
Test to show result of bookmarks comparis |
|
|
553 | Test to show result of bookmarks comparison | |
|
554 | 554 | |
|
555 | 555 | $ mkdir bmcomparison |
|
556 | 556 | $ cd bmcomparison |
@@ -734,7 +734,7 b' tipmost surviving ancestor of the stripp' | |||
|
734 | 734 | summary: 0 |
|
735 | 735 | |
|
736 | 736 | |
|
737 | no-op update doesn't deactive bookmarks | |
|
737 | no-op update doesn't deactivate bookmarks | |
|
738 | 738 | |
|
739 | 739 | $ hg bookmarks |
|
740 | 740 | * four 3:9ba5f110a0b3 |
@@ -817,7 +817,7 b' cases.' | |||
|
817 | 817 | $ echo foo > foo |
|
818 | 818 | $ hg add foo |
|
819 | 819 | |
|
820 |
(failu |
|
|
820 | (failure before finalization) | |
|
821 | 821 | |
|
822 | 822 | >>> from hgclient import readchannel, runcommand, check |
|
823 | 823 | >>> @check |
@@ -836,7 +836,7 b' cases.' | |||
|
836 | 836 | *** runcommand log |
|
837 | 837 | *** runcommand verify -q |
|
838 | 838 | |
|
839 |
(failu |
|
|
839 | (failure after finalization) | |
|
840 | 840 | |
|
841 | 841 | >>> from hgclient import readchannel, runcommand, check |
|
842 | 842 | >>> @check |
@@ -251,10 +251,10 b' Check absolute/relative import of extens' | |||
|
251 | 251 | |
|
252 | 252 | #if demandimport absimport |
|
253 | 253 | |
|
254 | Examine whether module loading is delayed until actual refering, even | |
|
254 | Examine whether module loading is delayed until actual referring, even | |
|
255 | 255 | though module is imported with "absolute_import" feature. |
|
256 | 256 | |
|
257 |
Files below in each packages are used for desc |
|
|
257 | Files below in each packages are used for described purpose: | |
|
258 | 258 | |
|
259 | 259 | - "called": examine whether "from MODULE import ATTR" works correctly |
|
260 | 260 | - "unused": examine whether loading is delayed correctly |
@@ -197,7 +197,7 b' def antiambiguity():' | |||
|
197 | 197 | repetition = 3 |
|
198 | 198 | |
|
199 | 199 | # repeat changing via checkambigatclosing, to examine whether |
|
200 |
# st_mtime is advanced multiple times as expec |
|
|
200 | # st_mtime is advanced multiple times as expected | |
|
201 | 201 | for i in xrange(repetition): |
|
202 | 202 | # explicit closing |
|
203 | 203 | fp = scmutil.checkambigatclosing(open(filename, 'a')) |
@@ -214,7 +214,7 b' def antiambiguity():' | |||
|
214 | 214 | continue |
|
215 | 215 | |
|
216 | 216 | # st_mtime should be advanced "repetition * 2" times, because |
|
217 | # all changes occured at same time (in sec) | |
|
217 | # all changes occurred at same time (in sec) | |
|
218 | 218 | expected = (oldstat.st_mtime + repetition * 2) & 0x7fffffff |
|
219 | 219 | if newstat.st_mtime != expected: |
|
220 | 220 | print("'newstat.st_mtime %s is not %s (as %s + %s * 2)" % |
@@ -74,7 +74,7 b' commit.' | |||
|
74 | 74 | $ cd .. |
|
75 | 75 | |
|
76 | 76 | Test "usegeneraldelta" config |
|
77 |
(repo are general delta, but incoming bundle are not re-delt |
|
|
77 | (repo are general delta, but incoming bundle are not re-deltafied) | |
|
78 | 78 | |
|
79 | 79 | delta coming from the server base delta server are not recompressed. |
|
80 | 80 | (also include the aggressive version for comparison) |
@@ -379,7 +379,7 b' Changing the cipher string works' | |||
|
379 | 379 | |
|
380 | 380 | Fingerprints |
|
381 | 381 | |
|
382 |
- works without cacerts (host |
|
|
382 | - works without cacerts (hostfingerprints) | |
|
383 | 383 | $ hg -R copy-pull id https://localhost:$HGPORT/ --insecure --config hostfingerprints.localhost=ec:d8:7c:d6:b3:86:d0:4f:c1:b8:b4:1c:9d:8f:5e:16:8e:ef:1c:03 |
|
384 | 384 | warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info (?) |
|
385 | 385 | 5fed3813f7f5 |
@@ -431,10 +431,10 b' patches: import patch1 patch2; rollback' | |||
|
431 | 431 | parent: 0 |
|
432 | 432 | |
|
433 | 433 | Test that "hg rollback" doesn't restore dirstate to one at the |
|
434 |
beginning of the rollback |
|
|
434 | beginning of the rolled back transaction in not-"parent-gone" case. | |
|
435 | 435 | |
|
436 | 436 | invoking pretxncommit hook will cause marking '.hg/dirstate' as a file |
|
437 |
to be restored |
|
|
437 | to be restored when rolling back, after DirstateTransactionPlan (see wiki | |
|
438 | 438 | page for detail). |
|
439 | 439 | |
|
440 | 440 | $ hg --cwd b branch -q foobar |
@@ -451,7 +451,7 b' page for detail).' | |||
|
451 | 451 | $ hg --cwd b update -q -C 0 |
|
452 | 452 | $ hg --cwd b --config extensions.strip= strip -q 1 |
|
453 | 453 | |
|
454 | Test visibility of in-memory distate changes inside transaction to | |
|
454 | Test visibility of in-memory dirstate changes inside transaction to | |
|
455 | 455 | external process |
|
456 | 456 | |
|
457 | 457 | $ echo foo > a/foo |
@@ -388,7 +388,7 b' available locally.' | |||
|
388 | 388 | |
|
389 | 389 | $ killdaemons.py |
|
390 | 390 | |
|
391 |
largefiles should not ask for password again after succesful |
|
|
391 | largefiles should not ask for password again after successful authorization | |
|
392 | 392 | |
|
393 | 393 | $ hg init credentialmain |
|
394 | 394 | $ cd credentialmain |
@@ -199,7 +199,7 b' Test saving last-message.txt:' | |||
|
199 | 199 | |
|
200 | 200 | test saving last-message.txt |
|
201 | 201 | |
|
202 | Test visibility of in-memory distate changes outside transaction to | |
|
202 | Test visibility of in-memory dirstate changes outside transaction to | |
|
203 | 203 | external process |
|
204 | 204 | |
|
205 | 205 | $ cat > $TESTTMP/checkvisibility.sh <<EOF |
@@ -1211,7 +1211,7 b' Test the --delete option of debugobsolet' | |||
|
1211 | 1211 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
|
1212 | 1212 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) |
|
1213 | 1213 | $ hg debugobsolete --delete 1 --delete 3 |
|
1214 |
deleted 2 obsolescen |
|
|
1214 | deleted 2 obsolescence markers | |
|
1215 | 1215 | $ hg debugobsolete |
|
1216 | 1216 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
|
1217 | 1217 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
@@ -130,7 +130,7 b' explicit destination of the update.' | |||
|
130 | 130 | |
|
131 | 131 | Test that updating deactivates current active bookmark, if the |
|
132 | 132 | destination of the update is explicitly specified, and it doesn't |
|
133 |
match with the name of any ex |
|
|
133 | match with the name of any existing bookmarks. | |
|
134 | 134 | |
|
135 | 135 | $ cd ../t |
|
136 | 136 | $ hg bookmark -d active-after-pull |
@@ -838,7 +838,7 b' Test experimental revset' | |||
|
838 | 838 | |
|
839 | 839 | $ cd .. |
|
840 | 840 | |
|
841 |
Make the repo a bit more inter |
|
|
841 | Make the repo a bit more interesting | |
|
842 | 842 | |
|
843 | 843 | $ hg up 1 |
|
844 | 844 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
@@ -137,7 +137,7 b' Test that --interactive lift the need fo' | |||
|
137 | 137 | $ ls folder1/ |
|
138 | 138 | g |
|
139 | 139 | |
|
140 | Test that a noop revert doesn't do an unecessary backup | |
|
140 | Test that a noop revert doesn't do an unnecessary backup | |
|
141 | 141 | $ (echo y; echo n) | hg revert -i -r 2 folder1/g |
|
142 | 142 | diff --git a/folder1/g b/folder1/g |
|
143 | 143 | 1 hunks, 1 lines changed |
@@ -1079,7 +1079,7 b" Test '%' operator" | |||
|
1079 | 1079 | 8 |
|
1080 | 1080 | 9 |
|
1081 | 1081 | |
|
1082 |
Test op |
|
|
1082 | Test operand of '%' is optimized recursively (issue4670) | |
|
1083 | 1083 | |
|
1084 | 1084 | $ try --optimize '8:9-8%' |
|
1085 | 1085 | (onlypost |
@@ -3085,7 +3085,7 b' far away.' | |||
|
3085 | 3085 | [255] |
|
3086 | 3086 | |
|
3087 | 3087 | test scope of alias expansion: 'universe' is expanded prior to 'shadowall(0)', |
|
3088 |
but 'all()' should never be substitu |
|
|
3088 | but 'all()' should never be substituted to '0()'. | |
|
3089 | 3089 | |
|
3090 | 3090 | $ echo 'universe = all()' >> .hg/hgrc |
|
3091 | 3091 | $ echo 'shadowall(all) = all and universe' >> .hg/hgrc |
@@ -1493,7 +1493,7 b' test branch.' | |||
|
1493 | 1493 | When i unshelve resulting in merge conflicts and makes saved |
|
1494 | 1494 | file shelvedstate looks like in previous versions in |
|
1495 | 1495 | mercurial(without restore branch information in 7th line) i |
|
1496 | expect that after resolving conflicts and succesfully | |
|
1496 | expect that after resolving conflicts and successfully | |
|
1497 | 1497 | running 'shelve --continue' the branch information won't be |
|
1498 | 1498 | restored and branch will be unchanged. |
|
1499 | 1499 | |
@@ -1587,7 +1587,7 b' On non bare shelve the branch informatio' | |||
|
1587 | 1587 | default |
|
1588 | 1588 | $ cd .. |
|
1589 | 1589 | |
|
1590 |
Prepare unsh |
|
|
1590 | Prepare unshelve with a corrupted shelvedstate | |
|
1591 | 1591 | $ hg init r1 && cd r1 |
|
1592 | 1592 | $ echo text1 > file && hg add file |
|
1593 | 1593 | $ hg shelve |
General Comments 0
You need to be logged in to leave comments.
Login now