Show More
@@ -52,7 +52,7 b' Example:' | |||||
52 | x* = ignore |
|
52 | x* = ignore | |
53 |
|
53 | |||
54 | Note: the more specific you are in your filename patterns |
|
54 | Note: the more specific you are in your filename patterns | |
55 | the less you lose speed in huge repos. |
|
55 | the less you lose speed in huge repositories. | |
56 |
|
56 | |||
57 | For [keywordmaps] template mapping and expansion demonstration and |
|
57 | For [keywordmaps] template mapping and expansion demonstration and | |
58 | control run "hg kwdemo". |
|
58 | control run "hg kwdemo". | |
@@ -299,7 +299,7 b' def demo(ui, repo, *args, **opts):' | |||||
299 | fn = 'demo.txt' |
|
299 | fn = 'demo.txt' | |
300 | branchname = 'demobranch' |
|
300 | branchname = 'demobranch' | |
301 | tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
|
301 | tmpdir = tempfile.mkdtemp('', 'kwdemo.') | |
302 | ui.note(_('creating temporary repo at %s\n') % tmpdir) |
|
302 | ui.note(_('creating temporary repository at %s\n') % tmpdir) | |
303 | repo = localrepo.localrepository(ui, tmpdir, True) |
|
303 | repo = localrepo.localrepository(ui, tmpdir, True) | |
304 | ui.setconfig('keyword', fn, '') |
|
304 | ui.setconfig('keyword', fn, '') | |
305 | if args or opts.get('rcfile'): |
|
305 | if args or opts.get('rcfile'): | |
@@ -353,7 +353,7 b' def demo(ui, repo, *args, **opts):' | |||||
353 | fmt = ui.verbose and ' in %s' % path or '' |
|
353 | fmt = ui.verbose and ' in %s' % path or '' | |
354 | demostatus('%s keywords expanded%s' % (kwstatus, fmt)) |
|
354 | demostatus('%s keywords expanded%s' % (kwstatus, fmt)) | |
355 | ui.write(repo.wread(fn)) |
|
355 | ui.write(repo.wread(fn)) | |
356 | ui.debug(_('\nremoving temporary repo %s\n') % tmpdir) |
|
356 | ui.debug(_('\nremoving temporary repository %s\n') % tmpdir) | |
357 | shutil.rmtree(tmpdir, ignore_errors=True) |
|
357 | shutil.rmtree(tmpdir, ignore_errors=True) | |
358 |
|
358 | |||
359 | def expand(ui, repo, *pats, **opts): |
|
359 | def expand(ui, repo, *pats, **opts): |
@@ -1765,22 +1765,23 b' def clone(ui, source, dest=None, **opts)' | |||||
1765 | qbase = sr.lookup('qbase') |
|
1765 | qbase = sr.lookup('qbase') | |
1766 | except error.RepoError: |
|
1766 | except error.RepoError: | |
1767 | pass |
|
1767 | pass | |
1768 | ui.note(_('cloning main repo\n')) |
|
1768 | ui.note(_('cloning main repository\n')) | |
1769 | sr, dr = hg.clone(ui, sr.url(), dest, |
|
1769 | sr, dr = hg.clone(ui, sr.url(), dest, | |
1770 | pull=opts['pull'], |
|
1770 | pull=opts['pull'], | |
1771 | rev=destrev, |
|
1771 | rev=destrev, | |
1772 | update=False, |
|
1772 | update=False, | |
1773 | stream=opts['uncompressed']) |
|
1773 | stream=opts['uncompressed']) | |
1774 | ui.note(_('cloning patch repo\n')) |
|
1774 | ui.note(_('cloning patch repository\n')) | |
1775 | hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), |
|
1775 | hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), | |
1776 | pull=opts['pull'], update=not opts['noupdate'], |
|
1776 | pull=opts['pull'], update=not opts['noupdate'], | |
1777 | stream=opts['uncompressed']) |
|
1777 | stream=opts['uncompressed']) | |
1778 | if dr.local(): |
|
1778 | if dr.local(): | |
1779 | if qbase: |
|
1779 | if qbase: | |
1780 |
ui.note(_('stripping applied patches from destination |
|
1780 | ui.note(_('stripping applied patches from destination ' | |
|
1781 | 'repository\n')) | |||
1781 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1782 | dr.mq.strip(dr, qbase, update=False, backup=None) | |
1782 | if not opts['noupdate']: |
|
1783 | if not opts['noupdate']: | |
1783 | ui.note(_('updating destination repo\n')) |
|
1784 | ui.note(_('updating destination repository\n')) | |
1784 | hg.update(dr, dr.changelog.tip()) |
|
1785 | hg.update(dr, dr.changelog.tip()) | |
1785 |
|
1786 | |||
1786 | def commit(ui, repo, *pats, **opts): |
|
1787 | def commit(ui, repo, *pats, **opts): | |
@@ -2480,7 +2481,7 b' cmdtable = {' | |||||
2480 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
2481 | ('U', 'noupdate', None, _('do not update the new working directories')), | |
2481 | ('', 'uncompressed', None, |
|
2482 | ('', 'uncompressed', None, | |
2482 | _('use uncompressed transfer (fast over LAN)')), |
|
2483 | _('use uncompressed transfer (fast over LAN)')), | |
2483 | ('p', 'patches', '', _('location of source patch repo')), |
|
2484 | ('p', 'patches', '', _('location of source patch repository')), | |
2484 | ] + commands.remoteopts, |
|
2485 | ] + commands.remoteopts, | |
2485 | _('hg qclone [OPTION]... SOURCE [DEST]')), |
|
2486 | _('hg qclone [OPTION]... SOURCE [DEST]')), | |
2486 | "qcommit|qci": |
|
2487 | "qcommit|qci": |
@@ -59,9 +59,9 b' To use, configure notify extension and e' | |||||
59 | # key is glob pattern, value is ","-separated list of subscriber emails |
|
59 | # key is glob pattern, value is ","-separated list of subscriber emails | |
60 | pattern = user@host |
|
60 | pattern = user@host | |
61 |
|
61 | |||
62 | glob patterns are matched against path to repo root. |
|
62 | glob patterns are matched against path to repository root. | |
63 |
|
63 | |||
64 | if you like, you can put notify config file in repo that users can |
|
64 | if you like, you can put notify config file in repository that users can | |
65 | push changes to, they can manage their own subscriptions.''' |
|
65 | push changes to, they can manage their own subscriptions.''' | |
66 |
|
66 | |||
67 | from mercurial.i18n import _ |
|
67 | from mercurial.i18n import _ | |
@@ -268,7 +268,7 b' def hook(ui, repo, hooktype, node=None, ' | |||||
268 | ctx = repo[node] |
|
268 | ctx = repo[node] | |
269 |
|
269 | |||
270 | if not n.subs: |
|
270 | if not n.subs: | |
271 | ui.debug(_('notify: no subscribers to repo %s\n') % n.root) |
|
271 | ui.debug(_('notify: no subscribers to repository %s\n') % n.root) | |
272 | return |
|
272 | return | |
273 | if n.skipsource(source): |
|
273 | if n.skipsource(source): | |
274 | ui.debug(_('notify: changes have source "%s" - skipping\n') % source) |
|
274 | ui.debug(_('notify: changes have source "%s" - skipping\n') % source) |
@@ -542,7 +542,7 b' def cat(ui, repo, file1, *pats, **opts):' | |||||
542 | for the export command, with the following additions: |
|
542 | for the export command, with the following additions: | |
543 |
|
543 | |||
544 | %s basename of file being printed |
|
544 | %s basename of file being printed | |
545 | %d dirname of file being printed, or '.' if in repo root |
|
545 | %d dirname of file being printed, or '.' if in repository root | |
546 | %p root-relative path name of file being printed |
|
546 | %p root-relative path name of file being printed | |
547 | """ |
|
547 | """ | |
548 | ctx = repo[opts.get('rev')] |
|
548 | ctx = repo[opts.get('rev')] | |
@@ -1538,7 +1538,7 b' def identify(ui, repo, source=None,' | |||||
1538 | """identify the working copy or specified revision |
|
1538 | """identify the working copy or specified revision | |
1539 |
|
1539 | |||
1540 | With no revision, print a summary of the current state of the |
|
1540 | With no revision, print a summary of the current state of the | |
1541 | repo. |
|
1541 | repository. | |
1542 |
|
1542 | |||
1543 | With a path, do a lookup in another repository. |
|
1543 | With a path, do a lookup in another repository. | |
1544 |
|
1544 | |||
@@ -2925,7 +2925,7 b' def update(ui, repo, node=None, rev=None' | |||||
2925 | clone -U'). |
|
2925 | clone -U'). | |
2926 |
|
2926 | |||
2927 | When the working directory contains no uncommitted changes, it will be |
|
2927 | When the working directory contains no uncommitted changes, it will be | |
2928 | replaced by the state of the requested revision from the repo. |
|
2928 | replaced by the state of the requested revision from the repository. | |
2929 | When the requested revision is on a different branch, the working |
|
2929 | When the requested revision is on a different branch, the working | |
2930 | directory will additionally be switched to that branch. |
|
2930 | directory will additionally be switched to that branch. | |
2931 |
|
2931 | |||
@@ -3387,7 +3387,7 b' table = {' | |||||
3387 | ('n', 'name', '', |
|
3387 | ('n', 'name', '', | |
3388 | _('name to show in web pages (default: working directory)')), |
|
3388 | _('name to show in web pages (default: working directory)')), | |
3389 | ('', 'webdir-conf', '', _('name of the webdir config file' |
|
3389 | ('', 'webdir-conf', '', _('name of the webdir config file' | |
3390 | ' (serve more than one repo)')), |
|
3390 | ' (serve more than one repository)')), | |
3391 | ('', 'pid-file', '', _('name of file to write process ID to')), |
|
3391 | ('', 'pid-file', '', _('name of file to write process ID to')), | |
3392 | ('', 'stdio', None, _('for remote clients')), |
|
3392 | ('', 'stdio', None, _('for remote clients')), | |
3393 | ('t', 'templates', '', _('web templates to use')), |
|
3393 | ('t', 'templates', '', _('web templates to use')), |
@@ -14,7 +14,7 b' output the current or given revision of ' | |||||
14 | for the export command, with the following additions: |
|
14 | for the export command, with the following additions: | |
15 |
|
15 | |||
16 | %s basename of file being printed |
|
16 | %s basename of file being printed | |
17 | %d dirname of file being printed, or '.' if in repo root |
|
17 | %d dirname of file being printed, or '.' if in repository root | |
18 | %p root-relative path name of file being printed |
|
18 | %p root-relative path name of file being printed | |
19 |
|
19 | |||
20 | options: |
|
20 | options: |
@@ -19,7 +19,7 b' Example:' | |||||
19 | x* = ignore |
|
19 | x* = ignore | |
20 |
|
20 | |||
21 | Note: the more specific you are in your filename patterns |
|
21 | Note: the more specific you are in your filename patterns | |
22 | the less you lose speed in huge repos. |
|
22 | the less you lose speed in huge repositories. | |
23 |
|
23 | |||
24 | For [keywordmaps] template mapping and expansion demonstration and |
|
24 | For [keywordmaps] template mapping and expansion demonstration and | |
25 | control run "hg kwdemo". |
|
25 | control run "hg kwdemo". |
@@ -52,9 +52,9 b' To use, configure notify extension and e' | |||||
52 | # key is glob pattern, value is ","-separated list of subscriber emails |
|
52 | # key is glob pattern, value is ","-separated list of subscriber emails | |
53 | pattern = user@host |
|
53 | pattern = user@host | |
54 |
|
54 | |||
55 | glob patterns are matched against path to repo root. |
|
55 | glob patterns are matched against path to repository root. | |
56 |
|
56 | |||
57 | if you like, you can put notify config file in repo that users can |
|
57 | if you like, you can put notify config file in repository that users can | |
58 | push changes to, they can manage their own subscriptions. |
|
58 | push changes to, they can manage their own subscriptions. | |
59 |
|
59 | |||
60 | no commands defined |
|
60 | no commands defined |
General Comments 0
You need to be logged in to leave comments.
Login now