Show More
@@ -461,7 +461,7 b' Each key is of the form (section . name)' | |||||
461 | (defun hg-complete-repo (string predicate all) |
|
461 | (defun hg-complete-repo (string predicate all) | |
462 | "Attempt to complete a repository name. |
|
462 | "Attempt to complete a repository name. | |
463 | We complete on either symbolic names from Mercurial's config or real |
|
463 | We complete on either symbolic names from Mercurial's config or real | |
464 |
directory names from the file system. We do not penali |
|
464 | directory names from the file system. We do not penalize URLs." | |
465 | (or (if all |
|
465 | (or (if all | |
466 | (all-completions string hg-repo-completion-table predicate) |
|
466 | (all-completions string hg-repo-completion-table predicate) | |
467 | (try-completion string hg-repo-completion-table predicate)) |
|
467 | (try-completion string hg-repo-completion-table predicate)) |
@@ -27,7 +27,7 b'' | |||||
27 | " |
|
27 | " | |
28 | " You still can read the documentation at the end of this file. Locate it by |
|
28 | " You still can read the documentation at the end of this file. Locate it by | |
29 | " searching the "hgcommand-contents" string (and set ft=help to have |
|
29 | " searching the "hgcommand-contents" string (and set ft=help to have | |
30 |
" appropriate synta |
|
30 | " appropriate syntactic coloration). | |
31 |
|
31 | |||
32 | " Section: Plugin header {{{1 |
|
32 | " Section: Plugin header {{{1 | |
33 |
|
33 | |||
@@ -752,7 +752,7 b' function! s:HGCommit(...)' | |||||
752 | " Protect against case and backslash issues in Windows. |
|
752 | " Protect against case and backslash issues in Windows. | |
753 | let autoPattern = '\c' . messageFileName |
|
753 | let autoPattern = '\c' . messageFileName | |
754 |
|
754 | |||
755 |
" Ensure exist |
|
755 | " Ensure existence of group | |
756 | augroup HGCommit |
|
756 | augroup HGCommit | |
757 | augroup END |
|
757 | augroup END | |
758 |
|
758 |
@@ -17,7 +17,7 b'' | |||||
17 | " |
|
17 | " | |
18 | " 0.2.1 - Minor temp directory autodetection logic and cleanup |
|
18 | " 0.2.1 - Minor temp directory autodetection logic and cleanup | |
19 | " |
|
19 | " | |
20 | " 0.2 - Removed the need for filterdiff by implemeting it in pure vim script |
|
20 | " 0.2 - Removed the need for filterdiff by implementing it in pure vim script | |
21 | " - Added DiffReview command for reverse (changed repository to |
|
21 | " - Added DiffReview command for reverse (changed repository to | |
22 | " pristine state) reviews. |
|
22 | " pristine state) reviews. | |
23 | " (PatchReview does pristine repository to patch review) |
|
23 | " (PatchReview does pristine repository to patch review) |
@@ -158,7 +158,7 b' class Translator(nodes.NodeVisitor):' | |||||
158 | """""" |
|
158 | """""" | |
159 |
|
159 | |||
160 | words_and_spaces = re.compile(r'\S+| +|\n') |
|
160 | words_and_spaces = re.compile(r'\S+| +|\n') | |
161 |
document_start = """Man page generated from reStruct |
|
161 | document_start = """Man page generated from reStructuredText.""" | |
162 |
|
162 | |||
163 | def __init__(self, document): |
|
163 | def __init__(self, document): | |
164 | nodes.NodeVisitor.__init__(self, document) |
|
164 | nodes.NodeVisitor.__init__(self, document) | |
@@ -900,7 +900,7 b' class Translator(nodes.NodeVisitor):' | |||||
900 | # ``.PP`` : Start standard indented paragraph. |
|
900 | # ``.PP`` : Start standard indented paragraph. | |
901 | # ``.LP`` : Start block paragraph, all except the first. |
|
901 | # ``.LP`` : Start block paragraph, all except the first. | |
902 | # ``.P [type]`` : Start paragraph type. |
|
902 | # ``.P [type]`` : Start paragraph type. | |
903 | # NOTE dont use paragraph starts because they reset indentation. |
|
903 | # NOTE don't use paragraph starts because they reset indentation. | |
904 | # ``.sp`` is only vertical space |
|
904 | # ``.sp`` is only vertical space | |
905 | self.ensure_eol() |
|
905 | self.ensure_eol() | |
906 | self.body.append('.sp\n') |
|
906 | self.body.append('.sp\n') |
@@ -45,7 +45,7 b' Access via XMLRPC/email uses XMLRPC to q' | |||||
45 | email to the Bugzilla email interface to submit comments to bugs. |
|
45 | email to the Bugzilla email interface to submit comments to bugs. | |
46 | The From: address in the email is set to the email address of the Mercurial |
|
46 | The From: address in the email is set to the email address of the Mercurial | |
47 | user, so the comment appears to come from the Mercurial user. In the event |
|
47 | user, so the comment appears to come from the Mercurial user. In the event | |
48 |
that the Mercurial user email is not recogni |
|
48 | that the Mercurial user email is not recognized by Bugzilla as a Bugzilla | |
49 | user, the email associated with the Bugzilla username used to log into |
|
49 | user, the email associated with the Bugzilla username used to log into | |
50 | Bugzilla is used instead as the source of the comment. Marking bugs fixed |
|
50 | Bugzilla is used instead as the source of the comment. Marking bugs fixed | |
51 | works on all supported Bugzilla versions. |
|
51 | works on all supported Bugzilla versions. | |
@@ -53,7 +53,7 b' works on all supported Bugzilla versions' | |||||
53 | Configuration items common to all access modes: |
|
53 | Configuration items common to all access modes: | |
54 |
|
54 | |||
55 | bugzilla.version |
|
55 | bugzilla.version | |
56 |
Th |
|
56 | The access type to use. Values recognized are: | |
57 |
|
57 | |||
58 | :``xmlrpc``: Bugzilla XMLRPC interface. |
|
58 | :``xmlrpc``: Bugzilla XMLRPC interface. | |
59 | :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces. |
|
59 | :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces. | |
@@ -303,7 +303,7 b' class bzaccess(object):' | |||||
303 | # Methods to be implemented by access classes. |
|
303 | # Methods to be implemented by access classes. | |
304 | # |
|
304 | # | |
305 | # 'bugs' is a dict keyed on bug id, where values are a dict holding |
|
305 | # 'bugs' is a dict keyed on bug id, where values are a dict holding | |
306 |
# updates to bug state. Recogni |
|
306 | # updates to bug state. Recognized dict keys are: | |
307 | # |
|
307 | # | |
308 | # 'hours': Value, float containing work hours to be updated. |
|
308 | # 'hours': Value, float containing work hours to be updated. | |
309 | # 'fix': If key present, bug is to be marked fixed. Value ignored. |
|
309 | # 'fix': If key present, bug is to be marked fixed. Value ignored. |
@@ -43,7 +43,7 b' def _create_auth_baton(pool):' | |||||
43 | svn.client.get_ssl_client_cert_pw_file_provider(pool), |
|
43 | svn.client.get_ssl_client_cert_pw_file_provider(pool), | |
44 | svn.client.get_ssl_server_trust_file_provider(pool), |
|
44 | svn.client.get_ssl_server_trust_file_provider(pool), | |
45 | ] |
|
45 | ] | |
46 |
# Platform-depend |
|
46 | # Platform-dependent authentication methods | |
47 | getprovider = getattr(svn.core, 'svn_auth_get_platform_specific_provider', |
|
47 | getprovider = getattr(svn.core, 'svn_auth_get_platform_specific_provider', | |
48 | None) |
|
48 | None) | |
49 | if getprovider: |
|
49 | if getprovider: |
@@ -99,7 +99,7 b" testedwith = 'internal'" | |||||
99 | # Matches a lone LF, i.e., one that is not part of CRLF. |
|
99 | # Matches a lone LF, i.e., one that is not part of CRLF. | |
100 | singlelf = re.compile('(^|[^\r])\n') |
|
100 | singlelf = re.compile('(^|[^\r])\n') | |
101 | # Matches a single EOL which can either be a CRLF where repeated CR |
|
101 | # Matches a single EOL which can either be a CRLF where repeated CR | |
102 |
# are removed or a LF. We do not care about old Mac |
|
102 | # are removed or a LF. We do not care about old Macintosh files, so a | |
103 | # stray CR is an error. |
|
103 | # stray CR is an error. | |
104 | eolre = re.compile('\r*\n') |
|
104 | eolre = re.compile('\r*\n') | |
105 |
|
105 |
@@ -61,7 +61,7 b' PyDoc_STRVAR(' | |||||
61 | init_doc, |
|
61 | init_doc, | |
62 | "init() -> fd\n" |
|
62 | "init() -> fd\n" | |
63 | "\n" |
|
63 | "\n" | |
64 |
"Initiali |
|
64 | "Initialize an inotify instance.\n" | |
65 | "Return a file descriptor associated with a new inotify event queue."); |
|
65 | "Return a file descriptor associated with a new inotify event queue."); | |
66 |
|
66 | |||
67 | static PyObject *add_watch(PyObject *self, PyObject *args) |
|
67 | static PyObject *add_watch(PyObject *self, PyObject *args) |
@@ -1696,7 +1696,7 b' def debugdag(ui, repo, file_=None, *revs' | |||||
1696 | """format the changelog or an index DAG as a concise textual description |
|
1696 | """format the changelog or an index DAG as a concise textual description | |
1697 |
|
1697 | |||
1698 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1698 | If you pass a revlog index, the revlog's DAG is emitted. If you list | |
1699 |
revision numbers, they get label |
|
1699 | revision numbers, they get labeled in the output as rN. | |
1700 |
|
1700 | |||
1701 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1701 | Otherwise, the changelog DAG of the current repo is emitted. | |
1702 | """ |
|
1702 | """ |
@@ -67,9 +67,9 b' class config(object):' | |||||
67 | return self._data.get(section, {}).get(item, default) |
|
67 | return self._data.get(section, {}).get(item, default) | |
68 |
|
68 | |||
69 | def backup(self, section, item): |
|
69 | def backup(self, section, item): | |
70 |
"""return a tuple allowing restore to reinstall previous value |
|
70 | """return a tuple allowing restore to reinstall a previous value | |
71 |
|
71 | |||
72 | The main reason we need it is because it handle the "no data" case. |
|
72 | The main reason we need it is because it handles the "no data" case. | |
73 | """ |
|
73 | """ | |
74 | try: |
|
74 | try: | |
75 | value = self._data[section][item] |
|
75 | value = self._data[section][item] |
@@ -56,13 +56,13 b' def parsedag(desc):' | |||||
56 | ... :forkhere # a label for the last of the 3 nodes from above |
|
56 | ... :forkhere # a label for the last of the 3 nodes from above | |
57 | ... +5 # 5 more nodes on one branch |
|
57 | ... +5 # 5 more nodes on one branch | |
58 | ... :mergethis # label again |
|
58 | ... :mergethis # label again | |
59 |
... <forkhere # set default parent to label |
|
59 | ... <forkhere # set default parent to labeled fork node | |
60 | ... +10 # 10 more nodes on a parallel branch |
|
60 | ... +10 # 10 more nodes on a parallel branch | |
61 | ... @stable # following nodes will be annotated as "stable" |
|
61 | ... @stable # following nodes will be annotated as "stable" | |
62 | ... +5 # 5 nodes in stable |
|
62 | ... +5 # 5 nodes in stable | |
63 | ... !addfile # custom command; could trigger new file in next node |
|
63 | ... !addfile # custom command; could trigger new file in next node | |
64 | ... +2 # two more nodes |
|
64 | ... +2 # two more nodes | |
65 |
... /mergethis # merge last node with label |
|
65 | ... /mergethis # merge last node with labeled node | |
66 | ... +4 # 4 more nodes descending from merge node |
|
66 | ... +4 # 4 more nodes descending from merge node | |
67 | ... |
|
67 | ... | |
68 | ... """))) |
|
68 | ... """))) |
@@ -299,9 +299,9 b' class localrepository(object):' | |||||
299 | def hiddenrevs(self): |
|
299 | def hiddenrevs(self): | |
300 | """hiddenrevs: revs that should be hidden by command and tools |
|
300 | """hiddenrevs: revs that should be hidden by command and tools | |
301 |
|
301 | |||
302 |
This set is carried on the repo to ease initiali |
|
302 | This set is carried on the repo to ease initialization and lazy | |
303 | loading; it'll probably move back to changelog for efficiency and |
|
303 | loading; it'll probably move back to changelog for efficiency and | |
304 | consistency reason |
|
304 | consistency reasons. | |
305 |
|
305 | |||
306 | Note that the hiddenrevs will needs invalidations when |
|
306 | Note that the hiddenrevs will needs invalidations when | |
307 | - a new changesets is added (possible unstable above extinct) |
|
307 | - a new changesets is added (possible unstable above extinct) |
@@ -122,7 +122,7 b' class lock(object):' | |||||
122 | def release(self): |
|
122 | def release(self): | |
123 | """release the lock and execute callback function if any |
|
123 | """release the lock and execute callback function if any | |
124 |
|
124 | |||
125 | If the lock has been acquired multiple time, the actual release is |
|
125 | If the lock has been acquired multiple times, the actual release is | |
126 | delayed to the last release call.""" |
|
126 | delayed to the last release call.""" | |
127 | if self.held > 1: |
|
127 | if self.held > 1: | |
128 | self.held -= 1 |
|
128 | self.held -= 1 |
@@ -226,9 +226,9 b' class obsstore(object):' | |||||
226 | self.caches.clear() |
|
226 | self.caches.clear() | |
227 | return len(new) |
|
227 | return len(new) | |
228 |
|
228 | |||
229 | def mergemarkers(self, transation, data): |
|
229 | def mergemarkers(self, transaction, data): | |
230 | markers = _readmarkers(data) |
|
230 | markers = _readmarkers(data) | |
231 | self.add(transation, markers) |
|
231 | self.add(transaction, markers) | |
232 |
|
232 | |||
233 | def _load(self, markers): |
|
233 | def _load(self, markers): | |
234 | for mark in markers: |
|
234 | for mark in markers: | |
@@ -320,7 +320,7 b' def successormarkers(ctx):' | |||||
320 | def anysuccessors(obsstore, node): |
|
320 | def anysuccessors(obsstore, node): | |
321 | """Yield every successor of <node> |
|
321 | """Yield every successor of <node> | |
322 |
|
322 | |||
323 |
This is a linear yield unsuit |
|
323 | This is a linear yield unsuited to detecting split changesets.""" | |
324 | remaining = set([node]) |
|
324 | remaining = set([node]) | |
325 | seen = set(remaining) |
|
325 | seen = set(remaining) | |
326 | while remaining: |
|
326 | while remaining: |
@@ -13,7 +13,7 b'' | |||||
13 | # tokenizer is an iterator that returns type, value pairs |
|
13 | # tokenizer is an iterator that returns type, value pairs | |
14 | # elements is a mapping of types to binding strength, prefix and infix actions |
|
14 | # elements is a mapping of types to binding strength, prefix and infix actions | |
15 | # an action is a tree node name, a tree label, and an optional match |
|
15 | # an action is a tree node name, a tree label, and an optional match | |
16 |
# __call__(program) parses program into a label |
|
16 | # __call__(program) parses program into a labeled tree | |
17 |
|
17 | |||
18 | import error |
|
18 | import error | |
19 | from i18n import _ |
|
19 | from i18n import _ |
@@ -315,7 +315,7 b' def listphases(repo):' | |||||
315 | return keys |
|
315 | return keys | |
316 |
|
316 | |||
317 | def pushphase(repo, nhex, oldphasestr, newphasestr): |
|
317 | def pushphase(repo, nhex, oldphasestr, newphasestr): | |
318 |
"""List phases root for seriali |
|
318 | """List phases root for serialization over pushkey""" | |
319 | lock = repo.lock() |
|
319 | lock = repo.lock() | |
320 | try: |
|
320 | try: | |
321 | currentphase = repo[nhex].phase() |
|
321 | currentphase = repo[nhex].phase() |
@@ -10,7 +10,7 b' test-qrecord' | |||||
10 | test-strict |
|
10 | test-strict | |
11 |
|
11 | |||
12 | # --inotify activates de facto the inotify extension. It does not play well |
|
12 | # --inotify activates de facto the inotify extension. It does not play well | |
13 |
# with inotify-specific tests, which activate/de |
|
13 | # with inotify-specific tests, which activate/deactivate inotify at will: | |
14 | test-inotify |
|
14 | test-inotify | |
15 | test-inotify-debuginotify |
|
15 | test-inotify-debuginotify | |
16 | test-inotify-dirty-dirstate |
|
16 | test-inotify-dirty-dirstate |
@@ -34,7 +34,7 b' set bookmark' | |||||
34 |
|
34 | |||
35 | $ hg book test2 |
|
35 | $ hg book test2 | |
36 |
|
36 | |||
37 |
update to -2 ( |
|
37 | update to -2 (deactivates the active bookmark) | |
38 |
|
38 | |||
39 | $ hg update -r -2 |
|
39 | $ hg update -r -2 | |
40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -139,7 +139,7 b' moving a missing file' | |||||
139 | foo3 does not exist! |
|
139 | foo3 does not exist! | |
140 | $ hg up -qC . |
|
140 | $ hg up -qC . | |
141 |
|
141 | |||
142 |
copy --after to a nonexist |
|
142 | copy --after to a nonexistent target filename | |
143 | $ hg cp -A foo dummy |
|
143 | $ hg cp -A foo dummy | |
144 | foo: not recording copy - dummy does not exist |
|
144 | foo: not recording copy - dummy does not exist | |
145 |
|
145 |
@@ -1,4 +1,4 b'' | |||||
1 |
Just exerci |
|
1 | Just exercise debugindexdot | |
2 | Create a short file history including a merge. |
|
2 | Create a short file history including a merge. | |
3 | $ hg init t |
|
3 | $ hg init t | |
4 | $ cd t |
|
4 | $ cd t |
@@ -15,9 +15,9 b' Same issue, different code path' | |||||
15 |
|
15 | |||
16 | $ hg up -C |
|
16 | $ hg up -C | |
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | $ touch doesnt-exist-in-1 |
|
18 | $ touch does-not-exist-in-1 | |
19 | $ hg add |
|
19 | $ hg add | |
20 | adding doesnt-exist-in-1 |
|
20 | adding does-not-exist-in-1 | |
21 | $ hg ci -m third |
|
21 | $ hg ci -m third | |
22 | $ rm doesnt-exist-in-1 |
|
22 | $ rm does-not-exist-in-1 | |
23 | $ hg diff -r 1 |
|
23 | $ hg diff -r 1 |
@@ -12,7 +12,7 b" fl = repo.file('foobar')" | |||||
12 |
|
12 | |||
13 | def addrev(text, renamed=False): |
|
13 | def addrev(text, renamed=False): | |
14 | if renamed: |
|
14 | if renamed: | |
15 | # data doesnt matter. Just make sure filelog.renamed() returns True |
|
15 | # data doesn't matter. Just make sure filelog.renamed() returns True | |
16 | meta = dict(copyrev=hex(nullid), copy='bar') |
|
16 | meta = dict(copyrev=hex(nullid), copy='bar') | |
17 | else: |
|
17 | else: | |
18 | meta = {} |
|
18 | meta = {} |
@@ -529,12 +529,12 b' test python hook configured with python:' | |||||
529 | [1] |
|
529 | [1] | |
530 |
|
530 | |||
531 | $ echo '[hooks]' > .hg/hgrc |
|
531 | $ echo '[hooks]' > .hg/hgrc | |
532 |
$ echo "update.ne = python:`pwd`/nonexist |
|
532 | $ echo "update.ne = python:`pwd`/nonexistent.py:testhook" >> .hg/hgrc | |
533 | $ echo "pre-identify.npmd = python:`pwd`/:no_python_module_dir" >> .hg/hgrc |
|
533 | $ echo "pre-identify.npmd = python:`pwd`/:no_python_module_dir" >> .hg/hgrc | |
534 |
|
534 | |||
535 | $ hg up null |
|
535 | $ hg up null | |
536 | loading update.ne hook failed: |
|
536 | loading update.ne hook failed: | |
537 |
abort: No such file or directory: $TESTTMP/d/repo/nonexist |
|
537 | abort: No such file or directory: $TESTTMP/d/repo/nonexistent.py | |
538 | [255] |
|
538 | [255] | |
539 |
|
539 | |||
540 | $ hg id |
|
540 | $ hg id | |
@@ -581,7 +581,7 b' commit and update hooks should run after' | |||||
581 | cb9a9f314b8b |
|
581 | cb9a9f314b8b | |
582 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
582 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
583 |
|
583 | |||
584 |
make sure --verbose (and --quiet/--debug etc.) are prop |
|
584 | make sure --verbose (and --quiet/--debug etc.) are propagated to the local ui | |
585 | that is passed to pre/post hooks |
|
585 | that is passed to pre/post hooks | |
586 |
|
586 | |||
587 | $ echo '[hooks]' > .hg/hgrc |
|
587 | $ echo '[hooks]' > .hg/hgrc |
@@ -22,7 +22,7 b' let the daemon finish its stuff' | |||||
22 |
|
22 | |||
23 | $ sleep 1 |
|
23 | $ sleep 1 | |
24 |
|
24 | |||
25 |
eed to test all file op |
|
25 | eed to test all file operations | |
26 |
|
26 | |||
27 | $ hg rm a |
|
27 | $ hg rm a | |
28 | $ rm b |
|
28 | $ rm b |
@@ -814,7 +814,7 b' Clone to test global and local configura' | |||||
814 |
|
814 | |||
815 | $ cd .. |
|
815 | $ cd .. | |
816 |
|
816 | |||
817 | Expansion in destinaton with global configuration |
|
817 | Expansion in destination with global configuration | |
818 |
|
818 | |||
819 | $ hg --quiet clone Test globalconf |
|
819 | $ hg --quiet clone Test globalconf | |
820 | $ cat globalconf/a |
|
820 | $ cat globalconf/a |
@@ -191,7 +191,7 b' or true.executable not found in PATH:' | |||||
191 | false.whatever= |
|
191 | false.whatever= | |
192 | true.priority=1 |
|
192 | true.priority=1 | |
193 | # hg update -C 1 |
|
193 | # hg update -C 1 | |
194 |
$ hg merge -r 2 --config merge-tools.true.executable=nonexist |
|
194 | $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool | |
195 | merging f |
|
195 | merging f | |
196 | merging f failed! |
|
196 | merging f failed! | |
197 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
197 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
@@ -212,7 +212,7 b' or true.executable with bogus path:' | |||||
212 | false.whatever= |
|
212 | false.whatever= | |
213 | true.priority=1 |
|
213 | true.priority=1 | |
214 | # hg update -C 1 |
|
214 | # hg update -C 1 | |
215 |
$ hg merge -r 2 --config merge-tools.true.executable=/nonexist |
|
215 | $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool | |
216 | merging f |
|
216 | merging f | |
217 | merging f failed! |
|
217 | merging f failed! | |
218 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
218 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
@@ -336,7 +336,7 b' merge-patterns specifies executable not ' | |||||
336 | true.priority=1 |
|
336 | true.priority=1 | |
337 | true.executable=cat |
|
337 | true.executable=cat | |
338 | # hg update -C 1 |
|
338 | # hg update -C 1 | |
339 |
$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexist |
|
339 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool | |
340 | couldn't find merge tool true specified for f |
|
340 | couldn't find merge tool true specified for f | |
341 | merging f |
|
341 | merging f | |
342 | merging f failed! |
|
342 | merging f failed! | |
@@ -359,7 +359,7 b' merge-patterns specifies executable with' | |||||
359 | true.priority=1 |
|
359 | true.priority=1 | |
360 | true.executable=cat |
|
360 | true.executable=cat | |
361 | # hg update -C 1 |
|
361 | # hg update -C 1 | |
362 |
$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexist |
|
362 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool | |
363 | couldn't find merge tool true specified for f |
|
363 | couldn't find merge tool true specified for f | |
364 | merging f |
|
364 | merging f | |
365 | merging f failed! |
|
365 | merging f failed! |
@@ -240,7 +240,7 b' qimport -e --name with --force' | |||||
240 |
|
240 | |||
241 | qimport with bad name, should abort before reading file |
|
241 | qimport with bad name, should abort before reading file | |
242 |
|
242 | |||
243 |
$ hg qimport non-exist |
|
243 | $ hg qimport non-existent-file --name .hg | |
244 | abort: patch name cannot begin with ".hg" |
|
244 | abort: patch name cannot begin with ".hg" | |
245 | [255] |
|
245 | [255] | |
246 |
|
246 |
@@ -34,7 +34,7 b' test qpush on empty series' | |||||
34 | $ python -c 'print "\xe9"' > message |
|
34 | $ python -c 'print "\xe9"' > message | |
35 | $ cat .hg/patches/bad-patch >> message |
|
35 | $ cat .hg/patches/bad-patch >> message | |
36 | $ mv message .hg/patches/bad-patch |
|
36 | $ mv message .hg/patches/bad-patch | |
37 | $ hg qpush -a && echo 'qpush succeded?!' |
|
37 | $ hg qpush -a && echo 'qpush succeeded?!' | |
38 | applying patch1 |
|
38 | applying patch1 | |
39 | applying patch2 |
|
39 | applying patch2 | |
40 | applying bad-patch |
|
40 | applying bad-patch |
@@ -1,4 +1,4 b'' | |||||
1 |
Environ |
|
1 | Environment setup for MQ | |
2 |
|
2 | |||
3 | $ echo "[extensions]" >> $HGRCPATH |
|
3 | $ echo "[extensions]" >> $HGRCPATH | |
4 | $ echo "mq=" >> $HGRCPATH |
|
4 | $ echo "mq=" >> $HGRCPATH |
@@ -207,7 +207,7 b' qrefresh --short tests:' | |||||
207 |
|
207 | |||
208 | $ echo 'orphan' > orphanchild |
|
208 | $ echo 'orphan' > orphanchild | |
209 | $ hg add orphanchild |
|
209 | $ hg add orphanchild | |
210 |
$ hg qrefresh nonexist |
|
210 | $ hg qrefresh nonexistentfilename # clear patch | |
211 | $ hg qrefresh --short 1/base |
|
211 | $ hg qrefresh --short 1/base | |
212 | $ hg qrefresh --short 2/base |
|
212 | $ hg qrefresh --short 2/base | |
213 |
|
213 |
@@ -478,7 +478,7 b" both into 'revision' and 'patch file und" | |||||
478 | adding .hgsub |
|
478 | adding .hgsub | |
479 | $ hg -R sub update -C 1 |
|
479 | $ hg -R sub update -C 1 | |
480 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
480 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
481 |
$ hg commit -Am '#2 in parent (but be rollback |
|
481 | $ hg commit -Am '#2 in parent (but will be rolled back soon)' | |
482 | $ hg rollback |
|
482 | $ hg rollback | |
483 | repository tip rolled back to revision 1 (undo commit) |
|
483 | repository tip rolled back to revision 1 (undo commit) | |
484 | working directory now based on revision 1 |
|
484 | working directory now based on revision 1 |
@@ -1877,7 +1877,7 b' test single flag for multiple patches:' | |||||
1877 | +b |
|
1877 | +b | |
1878 |
|
1878 | |||
1879 |
|
1879 | |||
1880 | test mutiple flags for single patch: |
|
1880 | test multiple flags for single patch: | |
1881 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \ |
|
1881 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \ | |
1882 | > -c bar -s test -r 2 |
|
1882 | > -c bar -s test -r 2 | |
1883 | this patch series consists of 1 patches. |
|
1883 | this patch series consists of 1 patches. |
@@ -68,7 +68,7 b' Issue622: hg init && hg pull -u URL does' | |||||
68 |
|
68 | |||
69 | Test 'file:' uri handling: |
|
69 | Test 'file:' uri handling: | |
70 |
|
70 | |||
71 | $ hg pull -q file://../test-doesnt-exist |
|
71 | $ hg pull -q file://../test-does-not-exist | |
72 | abort: file:// URLs can only refer to localhost |
|
72 | abort: file:// URLs can only refer to localhost | |
73 | [255] |
|
73 | [255] | |
74 |
|
74 |
@@ -108,9 +108,9 b' qrecord patch (mq not present)' | |||||
108 |
|
108 | |||
109 | help (bad mq) |
|
109 | help (bad mq) | |
110 |
|
110 | |||
111 |
$ echo "mq=nonexist |
|
111 | $ echo "mq=nonexistent" >> $HGRCPATH | |
112 | $ hg help qrecord |
|
112 | $ hg help qrecord | |
113 |
*** failed to import extension mq from nonexist |
|
113 | *** failed to import extension mq from nonexistent: [Errno 2] * (glob) | |
114 | hg qrecord [OPTION]... PATCH [FILE]... |
|
114 | hg qrecord [OPTION]... PATCH [FILE]... | |
115 |
|
115 | |||
116 | interactively record a new patch |
|
116 | interactively record a new patch | |
@@ -121,7 +121,7 b' help (bad mq)' | |||||
121 |
|
121 | |||
122 | help (mq present) |
|
122 | help (mq present) | |
123 |
|
123 | |||
124 |
$ sed 's/mq=nonexist |
|
124 | $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp | |
125 | $ mv hgrc.tmp $HGRCPATH |
|
125 | $ mv hgrc.tmp $HGRCPATH | |
126 |
|
126 | |||
127 | $ hg help qrecord |
|
127 | $ hg help qrecord |
@@ -78,7 +78,7 b' Abort:' | |||||
78 | $ cd .. |
|
78 | $ cd .. | |
79 |
|
79 | |||
80 |
|
80 | |||
81 |
Constr |
|
81 | Construct new repo: | |
82 |
|
82 | |||
83 | $ hg init b |
|
83 | $ hg init b | |
84 | $ cd b |
|
84 | $ cd b |
@@ -66,7 +66,7 b' rename --after a single file when src an' | |||||
66 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
67 | $ rm d2/c |
|
67 | $ rm d2/c | |
68 |
|
68 | |||
69 |
rename --after a single file to a nonexist |
|
69 | rename --after a single file to a nonexistent target filename | |
70 |
|
70 | |||
71 | $ hg rename --after d1/a dummy |
|
71 | $ hg rename --after d1/a dummy | |
72 | d1/a: not recording move - dummy does not exist (glob) |
|
72 | d1/a: not recording move - dummy does not exist (glob) |
@@ -138,7 +138,7 b' class TestMerge3(TestCase):' | |||||
138 | ['aaa', 'bbb', 'zz'], |
|
138 | ['aaa', 'bbb', 'zz'], | |
139 | ['zz']) |
|
139 | ['zz']) | |
140 |
|
140 | |||
141 |
# todo: should use a sentin |
|
141 | # todo: should use a sentinel at end as from get_matching_blocks | |
142 | # to match without zz |
|
142 | # to match without zz | |
143 | self.assertEquals(list(m3.find_sync_regions()), |
|
143 | self.assertEquals(list(m3.find_sync_regions()), | |
144 | [(0, 1, 2, 3, 0, 1), |
|
144 | [(0, 1, 2, 3, 0, 1), | |
@@ -156,7 +156,7 b' class TestMerge3(TestCase):' | |||||
156 | m3 = Merge3([], |
|
156 | m3 = Merge3([], | |
157 | ['aaa', 'bbb'], |
|
157 | ['aaa', 'bbb'], | |
158 | []) |
|
158 | []) | |
159 |
# todo: should use a sentin |
|
159 | # todo: should use a sentinel at end as from get_matching_blocks | |
160 | # to match without zz |
|
160 | # to match without zz | |
161 | self.assertEquals(list(m3.find_sync_regions()), |
|
161 | self.assertEquals(list(m3.find_sync_regions()), | |
162 | [(0, 0, 2, 2, 0, 0)]) |
|
162 | [(0, 0, 2, 2, 0, 0)]) |
@@ -97,8 +97,8 b' trying to push' | |||||
97 | trying clone -r |
|
97 | trying clone -r | |
98 |
|
98 | |||
99 | $ cd .. |
|
99 | $ cd .. | |
100 | $ hg clone -r donotexist static-http://localhost:$HGPORT/remote local0 |
|
100 | $ hg clone -r doesnotexist static-http://localhost:$HGPORT/remote local0 | |
101 | abort: unknown revision 'donotexist'! |
|
101 | abort: unknown revision 'doesnotexist'! | |
102 | [255] |
|
102 | [255] | |
103 | $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 |
|
103 | $ hg clone -r 0 static-http://localhost:$HGPORT/remote local0 | |
104 | adding changesets |
|
104 | adding changesets |
@@ -46,7 +46,7 b' test what happens if we want to trick hg' | |||||
46 | $ rm dir/a.o |
|
46 | $ rm dir/a.o | |
47 | $ rm dir/b.o |
|
47 | $ rm dir/b.o | |
48 | $ mkdir dir/a.o |
|
48 | $ mkdir dir/a.o | |
49 | $ ln -s nonexist dir/b.o |
|
49 | $ ln -s nonexistent dir/b.o | |
50 | $ mkfifo a.c |
|
50 | $ mkfifo a.c | |
51 |
|
51 | |||
52 | it should show a.c, dir/a.o and dir/b.o deleted |
|
52 | it should show a.c, dir/a.o and dir/b.o deleted |
General Comments 0
You need to be logged in to leave comments.
Login now