Show More
@@ -1,3166 +1,3167 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from node import * |
|
8 | from node import * | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import os, re, sys, urllib |
|
10 | import os, re, sys, urllib | |
11 | import hg, util, revlog, bundlerepo, extensions |
|
11 | import hg, util, revlog, bundlerepo, extensions | |
12 | import difflib, patch, time, help, mdiff, tempfile |
|
12 | import difflib, patch, time, help, mdiff, tempfile | |
13 | import errno, version, socket |
|
13 | import errno, version, socket | |
14 | import archival, changegroup, cmdutil, hgweb.server, sshserver |
|
14 | import archival, changegroup, cmdutil, hgweb.server, sshserver | |
15 |
|
15 | |||
16 | # Commands start here, listed alphabetically |
|
16 | # Commands start here, listed alphabetically | |
17 |
|
17 | |||
18 | def add(ui, repo, *pats, **opts): |
|
18 | def add(ui, repo, *pats, **opts): | |
19 | """add the specified files on the next commit |
|
19 | """add the specified files on the next commit | |
20 |
|
20 | |||
21 | Schedule files to be version controlled and added to the repository. |
|
21 | Schedule files to be version controlled and added to the repository. | |
22 |
|
22 | |||
23 | The files will be added to the repository at the next commit. To |
|
23 | The files will be added to the repository at the next commit. To | |
24 | undo an add before that, see hg revert. |
|
24 | undo an add before that, see hg revert. | |
25 |
|
25 | |||
26 | If no names are given, add all files in the repository. |
|
26 | If no names are given, add all files in the repository. | |
27 | """ |
|
27 | """ | |
28 |
|
28 | |||
29 | names = [] |
|
29 | names = [] | |
30 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): |
|
30 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): | |
31 | if exact: |
|
31 | if exact: | |
32 | if ui.verbose: |
|
32 | if ui.verbose: | |
33 | ui.status(_('adding %s\n') % rel) |
|
33 | ui.status(_('adding %s\n') % rel) | |
34 | names.append(abs) |
|
34 | names.append(abs) | |
35 | elif abs not in repo.dirstate: |
|
35 | elif abs not in repo.dirstate: | |
36 | ui.status(_('adding %s\n') % rel) |
|
36 | ui.status(_('adding %s\n') % rel) | |
37 | names.append(abs) |
|
37 | names.append(abs) | |
38 | if not opts.get('dry_run'): |
|
38 | if not opts.get('dry_run'): | |
39 | repo.add(names) |
|
39 | repo.add(names) | |
40 |
|
40 | |||
41 | def addremove(ui, repo, *pats, **opts): |
|
41 | def addremove(ui, repo, *pats, **opts): | |
42 | """add all new files, delete all missing files |
|
42 | """add all new files, delete all missing files | |
43 |
|
43 | |||
44 | Add all new files and remove all missing files from the repository. |
|
44 | Add all new files and remove all missing files from the repository. | |
45 |
|
45 | |||
46 | New files are ignored if they match any of the patterns in .hgignore. As |
|
46 | New files are ignored if they match any of the patterns in .hgignore. As | |
47 | with add, these changes take effect at the next commit. |
|
47 | with add, these changes take effect at the next commit. | |
48 |
|
48 | |||
49 | Use the -s option to detect renamed files. With a parameter > 0, |
|
49 | Use the -s option to detect renamed files. With a parameter > 0, | |
50 | this compares every removed file with every added file and records |
|
50 | this compares every removed file with every added file and records | |
51 | those similar enough as renames. This option takes a percentage |
|
51 | those similar enough as renames. This option takes a percentage | |
52 | between 0 (disabled) and 100 (files must be identical) as its |
|
52 | between 0 (disabled) and 100 (files must be identical) as its | |
53 | parameter. Detecting renamed files this way can be expensive. |
|
53 | parameter. Detecting renamed files this way can be expensive. | |
54 | """ |
|
54 | """ | |
55 | try: |
|
55 | try: | |
56 | sim = float(opts.get('similarity') or 0) |
|
56 | sim = float(opts.get('similarity') or 0) | |
57 | except ValueError: |
|
57 | except ValueError: | |
58 | raise util.Abort(_('similarity must be a number')) |
|
58 | raise util.Abort(_('similarity must be a number')) | |
59 | if sim < 0 or sim > 100: |
|
59 | if sim < 0 or sim > 100: | |
60 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
60 | raise util.Abort(_('similarity must be between 0 and 100')) | |
61 | return cmdutil.addremove(repo, pats, opts, similarity=sim/100.) |
|
61 | return cmdutil.addremove(repo, pats, opts, similarity=sim/100.) | |
62 |
|
62 | |||
63 | def annotate(ui, repo, *pats, **opts): |
|
63 | def annotate(ui, repo, *pats, **opts): | |
64 | """show changeset information per file line |
|
64 | """show changeset information per file line | |
65 |
|
65 | |||
66 | List changes in files, showing the revision id responsible for each line |
|
66 | List changes in files, showing the revision id responsible for each line | |
67 |
|
67 | |||
68 | This command is useful to discover who did a change or when a change took |
|
68 | This command is useful to discover who did a change or when a change took | |
69 | place. |
|
69 | place. | |
70 |
|
70 | |||
71 | Without the -a option, annotate will avoid processing files it |
|
71 | Without the -a option, annotate will avoid processing files it | |
72 | detects as binary. With -a, annotate will generate an annotation |
|
72 | detects as binary. With -a, annotate will generate an annotation | |
73 | anyway, probably with undesirable results. |
|
73 | anyway, probably with undesirable results. | |
74 | """ |
|
74 | """ | |
75 | getdate = util.cachefunc(lambda x: util.datestr(x[0].date())) |
|
75 | getdate = util.cachefunc(lambda x: util.datestr(x[0].date())) | |
76 |
|
76 | |||
77 | if not pats: |
|
77 | if not pats: | |
78 | raise util.Abort(_('at least one file name or pattern required')) |
|
78 | raise util.Abort(_('at least one file name or pattern required')) | |
79 |
|
79 | |||
80 | opmap = [('user', lambda x: ui.shortuser(x[0].user())), |
|
80 | opmap = [('user', lambda x: ui.shortuser(x[0].user())), | |
81 | ('number', lambda x: str(x[0].rev())), |
|
81 | ('number', lambda x: str(x[0].rev())), | |
82 | ('changeset', lambda x: short(x[0].node())), |
|
82 | ('changeset', lambda x: short(x[0].node())), | |
83 | ('date', getdate), |
|
83 | ('date', getdate), | |
84 | ('follow', lambda x: x[0].path()), |
|
84 | ('follow', lambda x: x[0].path()), | |
85 | ] |
|
85 | ] | |
86 |
|
86 | |||
87 | if (not opts['user'] and not opts['changeset'] and not opts['date'] |
|
87 | if (not opts['user'] and not opts['changeset'] and not opts['date'] | |
88 | and not opts['follow']): |
|
88 | and not opts['follow']): | |
89 | opts['number'] = 1 |
|
89 | opts['number'] = 1 | |
90 |
|
90 | |||
91 | linenumber = opts.get('line_number') is not None |
|
91 | linenumber = opts.get('line_number') is not None | |
92 | if (linenumber and (not opts['changeset']) and (not opts['number'])): |
|
92 | if (linenumber and (not opts['changeset']) and (not opts['number'])): | |
93 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
93 | raise util.Abort(_('at least one of -n/-c is required for -l')) | |
94 |
|
94 | |||
95 | funcmap = [func for op, func in opmap if opts.get(op)] |
|
95 | funcmap = [func for op, func in opmap if opts.get(op)] | |
96 | if linenumber: |
|
96 | if linenumber: | |
97 | lastfunc = funcmap[-1] |
|
97 | lastfunc = funcmap[-1] | |
98 | funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1]) |
|
98 | funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1]) | |
99 |
|
99 | |||
100 | ctx = repo.changectx(opts['rev']) |
|
100 | ctx = repo.changectx(opts['rev']) | |
101 |
|
101 | |||
102 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, |
|
102 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, | |
103 | node=ctx.node()): |
|
103 | node=ctx.node()): | |
104 | fctx = ctx.filectx(abs) |
|
104 | fctx = ctx.filectx(abs) | |
105 | if not opts['text'] and util.binary(fctx.data()): |
|
105 | if not opts['text'] and util.binary(fctx.data()): | |
106 | ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) |
|
106 | ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) | |
107 | continue |
|
107 | continue | |
108 |
|
108 | |||
109 | lines = fctx.annotate(follow=opts.get('follow'), |
|
109 | lines = fctx.annotate(follow=opts.get('follow'), | |
110 | linenumber=linenumber) |
|
110 | linenumber=linenumber) | |
111 | pieces = [] |
|
111 | pieces = [] | |
112 |
|
112 | |||
113 | for f in funcmap: |
|
113 | for f in funcmap: | |
114 | l = [f(n) for n, dummy in lines] |
|
114 | l = [f(n) for n, dummy in lines] | |
115 | if l: |
|
115 | if l: | |
116 | m = max(map(len, l)) |
|
116 | m = max(map(len, l)) | |
117 | pieces.append(["%*s" % (m, x) for x in l]) |
|
117 | pieces.append(["%*s" % (m, x) for x in l]) | |
118 |
|
118 | |||
119 | if pieces: |
|
119 | if pieces: | |
120 | for p, l in zip(zip(*pieces), lines): |
|
120 | for p, l in zip(zip(*pieces), lines): | |
121 | ui.write("%s: %s" % (" ".join(p), l[1])) |
|
121 | ui.write("%s: %s" % (" ".join(p), l[1])) | |
122 |
|
122 | |||
123 | def archive(ui, repo, dest, **opts): |
|
123 | def archive(ui, repo, dest, **opts): | |
124 | '''create unversioned archive of a repository revision |
|
124 | '''create unversioned archive of a repository revision | |
125 |
|
125 | |||
126 | By default, the revision used is the parent of the working |
|
126 | By default, the revision used is the parent of the working | |
127 | directory; use "-r" to specify a different revision. |
|
127 | directory; use "-r" to specify a different revision. | |
128 |
|
128 | |||
129 | To specify the type of archive to create, use "-t". Valid |
|
129 | To specify the type of archive to create, use "-t". Valid | |
130 | types are: |
|
130 | types are: | |
131 |
|
131 | |||
132 | "files" (default): a directory full of files |
|
132 | "files" (default): a directory full of files | |
133 | "tar": tar archive, uncompressed |
|
133 | "tar": tar archive, uncompressed | |
134 | "tbz2": tar archive, compressed using bzip2 |
|
134 | "tbz2": tar archive, compressed using bzip2 | |
135 | "tgz": tar archive, compressed using gzip |
|
135 | "tgz": tar archive, compressed using gzip | |
136 | "uzip": zip archive, uncompressed |
|
136 | "uzip": zip archive, uncompressed | |
137 | "zip": zip archive, compressed using deflate |
|
137 | "zip": zip archive, compressed using deflate | |
138 |
|
138 | |||
139 | The exact name of the destination archive or directory is given |
|
139 | The exact name of the destination archive or directory is given | |
140 | using a format string; see "hg help export" for details. |
|
140 | using a format string; see "hg help export" for details. | |
141 |
|
141 | |||
142 | Each member added to an archive file has a directory prefix |
|
142 | Each member added to an archive file has a directory prefix | |
143 | prepended. Use "-p" to specify a format string for the prefix. |
|
143 | prepended. Use "-p" to specify a format string for the prefix. | |
144 | The default is the basename of the archive, with suffixes removed. |
|
144 | The default is the basename of the archive, with suffixes removed. | |
145 | ''' |
|
145 | ''' | |
146 |
|
146 | |||
147 | ctx = repo.changectx(opts['rev']) |
|
147 | ctx = repo.changectx(opts['rev']) | |
148 | if not ctx: |
|
148 | if not ctx: | |
149 | raise util.Abort(_('repository has no revisions')) |
|
149 | raise util.Abort(_('repository has no revisions')) | |
150 | node = ctx.node() |
|
150 | node = ctx.node() | |
151 | dest = cmdutil.make_filename(repo, dest, node) |
|
151 | dest = cmdutil.make_filename(repo, dest, node) | |
152 | if os.path.realpath(dest) == repo.root: |
|
152 | if os.path.realpath(dest) == repo.root: | |
153 | raise util.Abort(_('repository root cannot be destination')) |
|
153 | raise util.Abort(_('repository root cannot be destination')) | |
154 | dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts) |
|
154 | dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts) | |
155 | kind = opts.get('type') or 'files' |
|
155 | kind = opts.get('type') or 'files' | |
156 | prefix = opts['prefix'] |
|
156 | prefix = opts['prefix'] | |
157 | if dest == '-': |
|
157 | if dest == '-': | |
158 | if kind == 'files': |
|
158 | if kind == 'files': | |
159 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
159 | raise util.Abort(_('cannot archive plain files to stdout')) | |
160 | dest = sys.stdout |
|
160 | dest = sys.stdout | |
161 | if not prefix: prefix = os.path.basename(repo.root) + '-%h' |
|
161 | if not prefix: prefix = os.path.basename(repo.root) + '-%h' | |
162 | prefix = cmdutil.make_filename(repo, prefix, node) |
|
162 | prefix = cmdutil.make_filename(repo, prefix, node) | |
163 | archival.archive(repo, dest, node, kind, not opts['no_decode'], |
|
163 | archival.archive(repo, dest, node, kind, not opts['no_decode'], | |
164 | matchfn, prefix) |
|
164 | matchfn, prefix) | |
165 |
|
165 | |||
166 | def backout(ui, repo, node=None, rev=None, **opts): |
|
166 | def backout(ui, repo, node=None, rev=None, **opts): | |
167 | '''reverse effect of earlier changeset |
|
167 | '''reverse effect of earlier changeset | |
168 |
|
168 | |||
169 | Commit the backed out changes as a new changeset. The new |
|
169 | Commit the backed out changes as a new changeset. The new | |
170 | changeset is a child of the backed out changeset. |
|
170 | changeset is a child of the backed out changeset. | |
171 |
|
171 | |||
172 | If you back out a changeset other than the tip, a new head is |
|
172 | If you back out a changeset other than the tip, a new head is | |
173 | created. This head is the parent of the working directory. If |
|
173 | created. This head is the parent of the working directory. If | |
174 | you back out an old changeset, your working directory will appear |
|
174 | you back out an old changeset, your working directory will appear | |
175 | old after the backout. You should merge the backout changeset |
|
175 | old after the backout. You should merge the backout changeset | |
176 | with another head. |
|
176 | with another head. | |
177 |
|
177 | |||
178 | The --merge option remembers the parent of the working directory |
|
178 | The --merge option remembers the parent of the working directory | |
179 | before starting the backout, then merges the new head with that |
|
179 | before starting the backout, then merges the new head with that | |
180 | changeset afterwards. This saves you from doing the merge by |
|
180 | changeset afterwards. This saves you from doing the merge by | |
181 | hand. The result of this merge is not committed, as for a normal |
|
181 | hand. The result of this merge is not committed, as for a normal | |
182 | merge.''' |
|
182 | merge.''' | |
183 | if rev and node: |
|
183 | if rev and node: | |
184 | raise util.Abort(_("please specify just one revision")) |
|
184 | raise util.Abort(_("please specify just one revision")) | |
185 |
|
185 | |||
186 | if not rev: |
|
186 | if not rev: | |
187 | rev = node |
|
187 | rev = node | |
188 |
|
188 | |||
189 | if not rev: |
|
189 | if not rev: | |
190 | raise util.Abort(_("please specify a revision to backout")) |
|
190 | raise util.Abort(_("please specify a revision to backout")) | |
191 |
|
191 | |||
192 | cmdutil.bail_if_changed(repo) |
|
192 | cmdutil.bail_if_changed(repo) | |
193 | op1, op2 = repo.dirstate.parents() |
|
193 | op1, op2 = repo.dirstate.parents() | |
194 | if op2 != nullid: |
|
194 | if op2 != nullid: | |
195 | raise util.Abort(_('outstanding uncommitted merge')) |
|
195 | raise util.Abort(_('outstanding uncommitted merge')) | |
196 | node = repo.lookup(rev) |
|
196 | node = repo.lookup(rev) | |
197 | p1, p2 = repo.changelog.parents(node) |
|
197 | p1, p2 = repo.changelog.parents(node) | |
198 | if p1 == nullid: |
|
198 | if p1 == nullid: | |
199 | raise util.Abort(_('cannot back out a change with no parents')) |
|
199 | raise util.Abort(_('cannot back out a change with no parents')) | |
200 | if p2 != nullid: |
|
200 | if p2 != nullid: | |
201 | if not opts['parent']: |
|
201 | if not opts['parent']: | |
202 | raise util.Abort(_('cannot back out a merge changeset without ' |
|
202 | raise util.Abort(_('cannot back out a merge changeset without ' | |
203 | '--parent')) |
|
203 | '--parent')) | |
204 | p = repo.lookup(opts['parent']) |
|
204 | p = repo.lookup(opts['parent']) | |
205 | if p not in (p1, p2): |
|
205 | if p not in (p1, p2): | |
206 | raise util.Abort(_('%s is not a parent of %s') % |
|
206 | raise util.Abort(_('%s is not a parent of %s') % | |
207 | (short(p), short(node))) |
|
207 | (short(p), short(node))) | |
208 | parent = p |
|
208 | parent = p | |
209 | else: |
|
209 | else: | |
210 | if opts['parent']: |
|
210 | if opts['parent']: | |
211 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
211 | raise util.Abort(_('cannot use --parent on non-merge changeset')) | |
212 | parent = p1 |
|
212 | parent = p1 | |
213 | hg.clean(repo, node, show_stats=False) |
|
213 | hg.clean(repo, node, show_stats=False) | |
214 | revert_opts = opts.copy() |
|
214 | revert_opts = opts.copy() | |
215 | revert_opts['date'] = None |
|
215 | revert_opts['date'] = None | |
216 | revert_opts['all'] = True |
|
216 | revert_opts['all'] = True | |
217 | revert_opts['rev'] = hex(parent) |
|
217 | revert_opts['rev'] = hex(parent) | |
218 | revert(ui, repo, **revert_opts) |
|
218 | revert(ui, repo, **revert_opts) | |
219 | commit_opts = opts.copy() |
|
219 | commit_opts = opts.copy() | |
220 | commit_opts['addremove'] = False |
|
220 | commit_opts['addremove'] = False | |
221 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
221 | if not commit_opts['message'] and not commit_opts['logfile']: | |
222 | commit_opts['message'] = _("Backed out changeset %s") % (short(node)) |
|
222 | commit_opts['message'] = _("Backed out changeset %s") % (short(node)) | |
223 | commit_opts['force_editor'] = True |
|
223 | commit_opts['force_editor'] = True | |
224 | commit(ui, repo, **commit_opts) |
|
224 | commit(ui, repo, **commit_opts) | |
225 | def nice(node): |
|
225 | def nice(node): | |
226 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
226 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
227 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
227 | ui.status(_('changeset %s backs out changeset %s\n') % | |
228 | (nice(repo.changelog.tip()), nice(node))) |
|
228 | (nice(repo.changelog.tip()), nice(node))) | |
229 | if op1 != node: |
|
229 | if op1 != node: | |
230 | if opts['merge']: |
|
230 | if opts['merge']: | |
231 | ui.status(_('merging with changeset %s\n') % nice(op1)) |
|
231 | ui.status(_('merging with changeset %s\n') % nice(op1)) | |
232 | hg.merge(repo, hex(op1)) |
|
232 | hg.merge(repo, hex(op1)) | |
233 | else: |
|
233 | else: | |
234 | ui.status(_('the backout changeset is a new head - ' |
|
234 | ui.status(_('the backout changeset is a new head - ' | |
235 | 'do not forget to merge\n')) |
|
235 | 'do not forget to merge\n')) | |
236 | ui.status(_('(use "backout --merge" ' |
|
236 | ui.status(_('(use "backout --merge" ' | |
237 | 'if you want to auto-merge)\n')) |
|
237 | 'if you want to auto-merge)\n')) | |
238 |
|
238 | |||
239 | def branch(ui, repo, label=None, **opts): |
|
239 | def branch(ui, repo, label=None, **opts): | |
240 | """set or show the current branch name |
|
240 | """set or show the current branch name | |
241 |
|
241 | |||
242 | With no argument, show the current branch name. With one argument, |
|
242 | With no argument, show the current branch name. With one argument, | |
243 | set the working directory branch name (the branch does not exist in |
|
243 | set the working directory branch name (the branch does not exist in | |
244 | the repository until the next commit). |
|
244 | the repository until the next commit). | |
245 |
|
245 | |||
246 | Unless --force is specified, branch will not let you set a |
|
246 | Unless --force is specified, branch will not let you set a | |
247 | branch name that shadows an existing branch. |
|
247 | branch name that shadows an existing branch. | |
248 | """ |
|
248 | """ | |
249 |
|
249 | |||
250 | if label: |
|
250 | if label: | |
251 | if not opts.get('force') and label in repo.branchtags(): |
|
251 | if not opts.get('force') and label in repo.branchtags(): | |
252 | if label not in [p.branch() for p in repo.workingctx().parents()]: |
|
252 | if label not in [p.branch() for p in repo.workingctx().parents()]: | |
253 | raise util.Abort(_('a branch of the same name already exists' |
|
253 | raise util.Abort(_('a branch of the same name already exists' | |
254 | ' (use --force to override)')) |
|
254 | ' (use --force to override)')) | |
255 | repo.dirstate.setbranch(util.fromlocal(label)) |
|
255 | repo.dirstate.setbranch(util.fromlocal(label)) | |
256 | ui.status(_('marked working directory as branch %s\n') % label) |
|
256 | ui.status(_('marked working directory as branch %s\n') % label) | |
257 | else: |
|
257 | else: | |
258 | ui.write("%s\n" % util.tolocal(repo.dirstate.branch())) |
|
258 | ui.write("%s\n" % util.tolocal(repo.dirstate.branch())) | |
259 |
|
259 | |||
260 | def branches(ui, repo, active=False): |
|
260 | def branches(ui, repo, active=False): | |
261 | """list repository named branches |
|
261 | """list repository named branches | |
262 |
|
262 | |||
263 | List the repository's named branches, indicating which ones are |
|
263 | List the repository's named branches, indicating which ones are | |
264 | inactive. If active is specified, only show active branches. |
|
264 | inactive. If active is specified, only show active branches. | |
265 |
|
265 | |||
266 | A branch is considered active if it contains unmerged heads. |
|
266 | A branch is considered active if it contains unmerged heads. | |
267 | """ |
|
267 | """ | |
268 | b = repo.branchtags() |
|
268 | b = repo.branchtags() | |
269 | heads = dict.fromkeys(repo.heads(), 1) |
|
269 | heads = dict.fromkeys(repo.heads(), 1) | |
270 | l = [((n in heads), repo.changelog.rev(n), n, t) for t, n in b.items()] |
|
270 | l = [((n in heads), repo.changelog.rev(n), n, t) for t, n in b.items()] | |
271 | l.sort() |
|
271 | l.sort() | |
272 | l.reverse() |
|
272 | l.reverse() | |
273 | for ishead, r, n, t in l: |
|
273 | for ishead, r, n, t in l: | |
274 | if active and not ishead: |
|
274 | if active and not ishead: | |
275 | # If we're only displaying active branches, abort the loop on |
|
275 | # If we're only displaying active branches, abort the loop on | |
276 | # encountering the first inactive head |
|
276 | # encountering the first inactive head | |
277 | break |
|
277 | break | |
278 | else: |
|
278 | else: | |
279 | hexfunc = ui.debugflag and hex or short |
|
279 | hexfunc = ui.debugflag and hex or short | |
280 | if ui.quiet: |
|
280 | if ui.quiet: | |
281 | ui.write("%s\n" % t) |
|
281 | ui.write("%s\n" % t) | |
282 | else: |
|
282 | else: | |
283 | spaces = " " * (30 - util.locallen(t)) |
|
283 | spaces = " " * (30 - util.locallen(t)) | |
284 | # The code only gets here if inactive branches are being |
|
284 | # The code only gets here if inactive branches are being | |
285 | # displayed or the branch is active. |
|
285 | # displayed or the branch is active. | |
286 | isinactive = ((not ishead) and " (inactive)") or '' |
|
286 | isinactive = ((not ishead) and " (inactive)") or '' | |
287 | ui.write("%s%s %s:%s%s\n" % (t, spaces, r, hexfunc(n), isinactive)) |
|
287 | ui.write("%s%s %s:%s%s\n" % (t, spaces, r, hexfunc(n), isinactive)) | |
288 |
|
288 | |||
289 | def bundle(ui, repo, fname, dest=None, **opts): |
|
289 | def bundle(ui, repo, fname, dest=None, **opts): | |
290 | """create a changegroup file |
|
290 | """create a changegroup file | |
291 |
|
291 | |||
292 | Generate a compressed changegroup file collecting changesets not |
|
292 | Generate a compressed changegroup file collecting changesets not | |
293 | found in the other repository. |
|
293 | found in the other repository. | |
294 |
|
294 | |||
295 | If no destination repository is specified the destination is assumed |
|
295 | If no destination repository is specified the destination is assumed | |
296 | to have all the nodes specified by one or more --base parameters. |
|
296 | to have all the nodes specified by one or more --base parameters. | |
|
297 | To create a bundle containing all changesets, use --base null. | |||
297 |
|
298 | |||
298 | The bundle file can then be transferred using conventional means and |
|
299 | The bundle file can then be transferred using conventional means and | |
299 | applied to another repository with the unbundle or pull command. |
|
300 | applied to another repository with the unbundle or pull command. | |
300 | This is useful when direct push and pull are not available or when |
|
301 | This is useful when direct push and pull are not available or when | |
301 | exporting an entire repository is undesirable. |
|
302 | exporting an entire repository is undesirable. | |
302 |
|
303 | |||
303 | Applying bundles preserves all changeset contents including |
|
304 | Applying bundles preserves all changeset contents including | |
304 | permissions, copy/rename information, and revision history. |
|
305 | permissions, copy/rename information, and revision history. | |
305 | """ |
|
306 | """ | |
306 | revs = opts.get('rev') or None |
|
307 | revs = opts.get('rev') or None | |
307 | if revs: |
|
308 | if revs: | |
308 | revs = [repo.lookup(rev) for rev in revs] |
|
309 | revs = [repo.lookup(rev) for rev in revs] | |
309 | base = opts.get('base') |
|
310 | base = opts.get('base') | |
310 | if base: |
|
311 | if base: | |
311 | if dest: |
|
312 | if dest: | |
312 | raise util.Abort(_("--base is incompatible with specifiying " |
|
313 | raise util.Abort(_("--base is incompatible with specifiying " | |
313 | "a destination")) |
|
314 | "a destination")) | |
314 | base = [repo.lookup(rev) for rev in base] |
|
315 | base = [repo.lookup(rev) for rev in base] | |
315 | # create the right base |
|
316 | # create the right base | |
316 | # XXX: nodesbetween / changegroup* should be "fixed" instead |
|
317 | # XXX: nodesbetween / changegroup* should be "fixed" instead | |
317 | o = [] |
|
318 | o = [] | |
318 | has = {nullid: None} |
|
319 | has = {nullid: None} | |
319 | for n in base: |
|
320 | for n in base: | |
320 | has.update(repo.changelog.reachable(n)) |
|
321 | has.update(repo.changelog.reachable(n)) | |
321 | if revs: |
|
322 | if revs: | |
322 | visit = list(revs) |
|
323 | visit = list(revs) | |
323 | else: |
|
324 | else: | |
324 | visit = repo.changelog.heads() |
|
325 | visit = repo.changelog.heads() | |
325 | seen = {} |
|
326 | seen = {} | |
326 | while visit: |
|
327 | while visit: | |
327 | n = visit.pop(0) |
|
328 | n = visit.pop(0) | |
328 | parents = [p for p in repo.changelog.parents(n) if p not in has] |
|
329 | parents = [p for p in repo.changelog.parents(n) if p not in has] | |
329 | if len(parents) == 0: |
|
330 | if len(parents) == 0: | |
330 | o.insert(0, n) |
|
331 | o.insert(0, n) | |
331 | else: |
|
332 | else: | |
332 | for p in parents: |
|
333 | for p in parents: | |
333 | if p not in seen: |
|
334 | if p not in seen: | |
334 | seen[p] = 1 |
|
335 | seen[p] = 1 | |
335 | visit.append(p) |
|
336 | visit.append(p) | |
336 | else: |
|
337 | else: | |
337 | cmdutil.setremoteconfig(ui, opts) |
|
338 | cmdutil.setremoteconfig(ui, opts) | |
338 | dest, revs, checkout = hg.parseurl( |
|
339 | dest, revs, checkout = hg.parseurl( | |
339 | ui.expandpath(dest or 'default-push', dest or 'default'), revs) |
|
340 | ui.expandpath(dest or 'default-push', dest or 'default'), revs) | |
340 | other = hg.repository(ui, dest) |
|
341 | other = hg.repository(ui, dest) | |
341 | o = repo.findoutgoing(other, force=opts['force']) |
|
342 | o = repo.findoutgoing(other, force=opts['force']) | |
342 |
|
343 | |||
343 | if revs: |
|
344 | if revs: | |
344 | cg = repo.changegroupsubset(o, revs, 'bundle') |
|
345 | cg = repo.changegroupsubset(o, revs, 'bundle') | |
345 | else: |
|
346 | else: | |
346 | cg = repo.changegroup(o, 'bundle') |
|
347 | cg = repo.changegroup(o, 'bundle') | |
347 | changegroup.writebundle(cg, fname, "HG10BZ") |
|
348 | changegroup.writebundle(cg, fname, "HG10BZ") | |
348 |
|
349 | |||
349 | def cat(ui, repo, file1, *pats, **opts): |
|
350 | def cat(ui, repo, file1, *pats, **opts): | |
350 | """output the current or given revision of files |
|
351 | """output the current or given revision of files | |
351 |
|
352 | |||
352 | Print the specified files as they were at the given revision. |
|
353 | Print the specified files as they were at the given revision. | |
353 | If no revision is given, the parent of the working directory is used, |
|
354 | If no revision is given, the parent of the working directory is used, | |
354 | or tip if no revision is checked out. |
|
355 | or tip if no revision is checked out. | |
355 |
|
356 | |||
356 | Output may be to a file, in which case the name of the file is |
|
357 | Output may be to a file, in which case the name of the file is | |
357 | given using a format string. The formatting rules are the same as |
|
358 | given using a format string. The formatting rules are the same as | |
358 | for the export command, with the following additions: |
|
359 | for the export command, with the following additions: | |
359 |
|
360 | |||
360 | %s basename of file being printed |
|
361 | %s basename of file being printed | |
361 | %d dirname of file being printed, or '.' if in repo root |
|
362 | %d dirname of file being printed, or '.' if in repo root | |
362 | %p root-relative path name of file being printed |
|
363 | %p root-relative path name of file being printed | |
363 | """ |
|
364 | """ | |
364 | ctx = repo.changectx(opts['rev']) |
|
365 | ctx = repo.changectx(opts['rev']) | |
365 | err = 1 |
|
366 | err = 1 | |
366 | for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts, |
|
367 | for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts, | |
367 | ctx.node()): |
|
368 | ctx.node()): | |
368 | fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs) |
|
369 | fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs) | |
369 | fp.write(ctx.filectx(abs).data()) |
|
370 | fp.write(ctx.filectx(abs).data()) | |
370 | err = 0 |
|
371 | err = 0 | |
371 | return err |
|
372 | return err | |
372 |
|
373 | |||
373 | def clone(ui, source, dest=None, **opts): |
|
374 | def clone(ui, source, dest=None, **opts): | |
374 | """make a copy of an existing repository |
|
375 | """make a copy of an existing repository | |
375 |
|
376 | |||
376 | Create a copy of an existing repository in a new directory. |
|
377 | Create a copy of an existing repository in a new directory. | |
377 |
|
378 | |||
378 | If no destination directory name is specified, it defaults to the |
|
379 | If no destination directory name is specified, it defaults to the | |
379 | basename of the source. |
|
380 | basename of the source. | |
380 |
|
381 | |||
381 | The location of the source is added to the new repository's |
|
382 | The location of the source is added to the new repository's | |
382 | .hg/hgrc file, as the default to be used for future pulls. |
|
383 | .hg/hgrc file, as the default to be used for future pulls. | |
383 |
|
384 | |||
384 | For efficiency, hardlinks are used for cloning whenever the source |
|
385 | For efficiency, hardlinks are used for cloning whenever the source | |
385 | and destination are on the same filesystem (note this applies only |
|
386 | and destination are on the same filesystem (note this applies only | |
386 | to the repository data, not to the checked out files). Some |
|
387 | to the repository data, not to the checked out files). Some | |
387 | filesystems, such as AFS, implement hardlinking incorrectly, but |
|
388 | filesystems, such as AFS, implement hardlinking incorrectly, but | |
388 | do not report errors. In these cases, use the --pull option to |
|
389 | do not report errors. In these cases, use the --pull option to | |
389 | avoid hardlinking. |
|
390 | avoid hardlinking. | |
390 |
|
391 | |||
391 | You can safely clone repositories and checked out files using full |
|
392 | You can safely clone repositories and checked out files using full | |
392 | hardlinks with |
|
393 | hardlinks with | |
393 |
|
394 | |||
394 | $ cp -al REPO REPOCLONE |
|
395 | $ cp -al REPO REPOCLONE | |
395 |
|
396 | |||
396 | which is the fastest way to clone. However, the operation is not |
|
397 | which is the fastest way to clone. However, the operation is not | |
397 | atomic (making sure REPO is not modified during the operation is |
|
398 | atomic (making sure REPO is not modified during the operation is | |
398 | up to you) and you have to make sure your editor breaks hardlinks |
|
399 | up to you) and you have to make sure your editor breaks hardlinks | |
399 | (Emacs and most Linux Kernel tools do so). |
|
400 | (Emacs and most Linux Kernel tools do so). | |
400 |
|
401 | |||
401 | If you use the -r option to clone up to a specific revision, no |
|
402 | If you use the -r option to clone up to a specific revision, no | |
402 | subsequent revisions will be present in the cloned repository. |
|
403 | subsequent revisions will be present in the cloned repository. | |
403 | This option implies --pull, even on local repositories. |
|
404 | This option implies --pull, even on local repositories. | |
404 |
|
405 | |||
405 | See pull for valid source format details. |
|
406 | See pull for valid source format details. | |
406 |
|
407 | |||
407 | It is possible to specify an ssh:// URL as the destination, but no |
|
408 | It is possible to specify an ssh:// URL as the destination, but no | |
408 | .hg/hgrc and working directory will be created on the remote side. |
|
409 | .hg/hgrc and working directory will be created on the remote side. | |
409 | Look at the help text for the pull command for important details |
|
410 | Look at the help text for the pull command for important details | |
410 | about ssh:// URLs. |
|
411 | about ssh:// URLs. | |
411 | """ |
|
412 | """ | |
412 | cmdutil.setremoteconfig(ui, opts) |
|
413 | cmdutil.setremoteconfig(ui, opts) | |
413 | hg.clone(ui, source, dest, |
|
414 | hg.clone(ui, source, dest, | |
414 | pull=opts['pull'], |
|
415 | pull=opts['pull'], | |
415 | stream=opts['uncompressed'], |
|
416 | stream=opts['uncompressed'], | |
416 | rev=opts['rev'], |
|
417 | rev=opts['rev'], | |
417 | update=not opts['noupdate']) |
|
418 | update=not opts['noupdate']) | |
418 |
|
419 | |||
419 | def commit(ui, repo, *pats, **opts): |
|
420 | def commit(ui, repo, *pats, **opts): | |
420 | """commit the specified files or all outstanding changes |
|
421 | """commit the specified files or all outstanding changes | |
421 |
|
422 | |||
422 | Commit changes to the given files into the repository. |
|
423 | Commit changes to the given files into the repository. | |
423 |
|
424 | |||
424 | If a list of files is omitted, all changes reported by "hg status" |
|
425 | If a list of files is omitted, all changes reported by "hg status" | |
425 | will be committed. |
|
426 | will be committed. | |
426 |
|
427 | |||
427 | If no commit message is specified, the editor configured in your hgrc |
|
428 | If no commit message is specified, the editor configured in your hgrc | |
428 | or in the EDITOR environment variable is started to enter a message. |
|
429 | or in the EDITOR environment variable is started to enter a message. | |
429 | """ |
|
430 | """ | |
430 | def commitfunc(ui, repo, files, message, match, opts): |
|
431 | def commitfunc(ui, repo, files, message, match, opts): | |
431 | return repo.commit(files, message, opts['user'], opts['date'], match, |
|
432 | return repo.commit(files, message, opts['user'], opts['date'], match, | |
432 | force_editor=opts.get('force_editor')) |
|
433 | force_editor=opts.get('force_editor')) | |
433 | cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
434 | cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
434 |
|
435 | |||
435 | def docopy(ui, repo, pats, opts): |
|
436 | def docopy(ui, repo, pats, opts): | |
436 | # called with the repo lock held |
|
437 | # called with the repo lock held | |
437 | # |
|
438 | # | |
438 | # hgsep => pathname that uses "/" to separate directories |
|
439 | # hgsep => pathname that uses "/" to separate directories | |
439 | # ossep => pathname that uses os.sep to separate directories |
|
440 | # ossep => pathname that uses os.sep to separate directories | |
440 | cwd = repo.getcwd() |
|
441 | cwd = repo.getcwd() | |
441 | errors = 0 |
|
442 | errors = 0 | |
442 | copied = [] |
|
443 | copied = [] | |
443 | targets = {} |
|
444 | targets = {} | |
444 |
|
445 | |||
445 | # abs: hgsep |
|
446 | # abs: hgsep | |
446 | # rel: ossep |
|
447 | # rel: ossep | |
447 | # return: hgsep |
|
448 | # return: hgsep | |
448 | def okaytocopy(abs, rel, exact): |
|
449 | def okaytocopy(abs, rel, exact): | |
449 | reasons = {'?': _('is not managed'), |
|
450 | reasons = {'?': _('is not managed'), | |
450 | 'r': _('has been marked for remove')} |
|
451 | 'r': _('has been marked for remove')} | |
451 | state = repo.dirstate[abs] |
|
452 | state = repo.dirstate[abs] | |
452 | reason = reasons.get(state) |
|
453 | reason = reasons.get(state) | |
453 | if reason: |
|
454 | if reason: | |
454 | if exact: |
|
455 | if exact: | |
455 | ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) |
|
456 | ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) | |
456 | else: |
|
457 | else: | |
457 | if state == 'a': |
|
458 | if state == 'a': | |
458 | origsrc = repo.dirstate.copied(abs) |
|
459 | origsrc = repo.dirstate.copied(abs) | |
459 | if origsrc is not None: |
|
460 | if origsrc is not None: | |
460 | return origsrc |
|
461 | return origsrc | |
461 | return abs |
|
462 | return abs | |
462 |
|
463 | |||
463 | # origsrc: hgsep |
|
464 | # origsrc: hgsep | |
464 | # abssrc: hgsep |
|
465 | # abssrc: hgsep | |
465 | # relsrc: ossep |
|
466 | # relsrc: ossep | |
466 | # otarget: ossep |
|
467 | # otarget: ossep | |
467 | def copy(origsrc, abssrc, relsrc, otarget, exact): |
|
468 | def copy(origsrc, abssrc, relsrc, otarget, exact): | |
468 | abstarget = util.canonpath(repo.root, cwd, otarget) |
|
469 | abstarget = util.canonpath(repo.root, cwd, otarget) | |
469 | reltarget = repo.pathto(abstarget, cwd) |
|
470 | reltarget = repo.pathto(abstarget, cwd) | |
470 | prevsrc = targets.get(abstarget) |
|
471 | prevsrc = targets.get(abstarget) | |
471 | src = repo.wjoin(abssrc) |
|
472 | src = repo.wjoin(abssrc) | |
472 | target = repo.wjoin(abstarget) |
|
473 | target = repo.wjoin(abstarget) | |
473 | if prevsrc is not None: |
|
474 | if prevsrc is not None: | |
474 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
475 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
475 | (reltarget, repo.pathto(abssrc, cwd), |
|
476 | (reltarget, repo.pathto(abssrc, cwd), | |
476 | repo.pathto(prevsrc, cwd))) |
|
477 | repo.pathto(prevsrc, cwd))) | |
477 | return |
|
478 | return | |
478 | if (not opts['after'] and os.path.exists(target) or |
|
479 | if (not opts['after'] and os.path.exists(target) or | |
479 | opts['after'] and repo.dirstate[abstarget] in 'mn'): |
|
480 | opts['after'] and repo.dirstate[abstarget] in 'mn'): | |
480 | if not opts['force']: |
|
481 | if not opts['force']: | |
481 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
482 | ui.warn(_('%s: not overwriting - file exists\n') % | |
482 | reltarget) |
|
483 | reltarget) | |
483 | return |
|
484 | return | |
484 | if not opts['after'] and not opts.get('dry_run'): |
|
485 | if not opts['after'] and not opts.get('dry_run'): | |
485 | os.unlink(target) |
|
486 | os.unlink(target) | |
486 | if opts['after']: |
|
487 | if opts['after']: | |
487 | if not os.path.exists(target): |
|
488 | if not os.path.exists(target): | |
488 | return |
|
489 | return | |
489 | else: |
|
490 | else: | |
490 | targetdir = os.path.dirname(target) or '.' |
|
491 | targetdir = os.path.dirname(target) or '.' | |
491 | if not os.path.isdir(targetdir) and not opts.get('dry_run'): |
|
492 | if not os.path.isdir(targetdir) and not opts.get('dry_run'): | |
492 | os.makedirs(targetdir) |
|
493 | os.makedirs(targetdir) | |
493 | try: |
|
494 | try: | |
494 | restore = repo.dirstate[abstarget] == 'r' |
|
495 | restore = repo.dirstate[abstarget] == 'r' | |
495 | if restore and not opts.get('dry_run'): |
|
496 | if restore and not opts.get('dry_run'): | |
496 | repo.undelete([abstarget]) |
|
497 | repo.undelete([abstarget]) | |
497 | try: |
|
498 | try: | |
498 | if not opts.get('dry_run'): |
|
499 | if not opts.get('dry_run'): | |
499 | util.copyfile(src, target) |
|
500 | util.copyfile(src, target) | |
500 | restore = False |
|
501 | restore = False | |
501 | finally: |
|
502 | finally: | |
502 | if restore: |
|
503 | if restore: | |
503 | repo.remove([abstarget]) |
|
504 | repo.remove([abstarget]) | |
504 | except IOError, inst: |
|
505 | except IOError, inst: | |
505 | if inst.errno == errno.ENOENT: |
|
506 | if inst.errno == errno.ENOENT: | |
506 | ui.warn(_('%s: deleted in working copy\n') % relsrc) |
|
507 | ui.warn(_('%s: deleted in working copy\n') % relsrc) | |
507 | else: |
|
508 | else: | |
508 | ui.warn(_('%s: cannot copy - %s\n') % |
|
509 | ui.warn(_('%s: cannot copy - %s\n') % | |
509 | (relsrc, inst.strerror)) |
|
510 | (relsrc, inst.strerror)) | |
510 | errors += 1 |
|
511 | errors += 1 | |
511 | return |
|
512 | return | |
512 | if ui.verbose or not exact: |
|
513 | if ui.verbose or not exact: | |
513 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
514 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
514 | targets[abstarget] = abssrc |
|
515 | targets[abstarget] = abssrc | |
515 | if abstarget != origsrc: |
|
516 | if abstarget != origsrc: | |
516 | if repo.dirstate[origsrc] == 'a': |
|
517 | if repo.dirstate[origsrc] == 'a': | |
517 | if not ui.quiet: |
|
518 | if not ui.quiet: | |
518 | ui.warn(_("%s has not been committed yet, so no copy " |
|
519 | ui.warn(_("%s has not been committed yet, so no copy " | |
519 | "data will be stored for %s.\n") |
|
520 | "data will be stored for %s.\n") | |
520 | % (repo.pathto(origsrc, cwd), reltarget)) |
|
521 | % (repo.pathto(origsrc, cwd), reltarget)) | |
521 | if abstarget not in repo.dirstate and not opts.get('dry_run'): |
|
522 | if abstarget not in repo.dirstate and not opts.get('dry_run'): | |
522 | repo.add([abstarget]) |
|
523 | repo.add([abstarget]) | |
523 | elif not opts.get('dry_run'): |
|
524 | elif not opts.get('dry_run'): | |
524 | repo.copy(origsrc, abstarget) |
|
525 | repo.copy(origsrc, abstarget) | |
525 | copied.append((abssrc, relsrc, exact)) |
|
526 | copied.append((abssrc, relsrc, exact)) | |
526 |
|
527 | |||
527 | # pat: ossep |
|
528 | # pat: ossep | |
528 | # dest ossep |
|
529 | # dest ossep | |
529 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
530 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
530 | # return: function that takes hgsep and returns ossep |
|
531 | # return: function that takes hgsep and returns ossep | |
531 | def targetpathfn(pat, dest, srcs): |
|
532 | def targetpathfn(pat, dest, srcs): | |
532 | if os.path.isdir(pat): |
|
533 | if os.path.isdir(pat): | |
533 | abspfx = util.canonpath(repo.root, cwd, pat) |
|
534 | abspfx = util.canonpath(repo.root, cwd, pat) | |
534 | abspfx = util.localpath(abspfx) |
|
535 | abspfx = util.localpath(abspfx) | |
535 | if destdirexists: |
|
536 | if destdirexists: | |
536 | striplen = len(os.path.split(abspfx)[0]) |
|
537 | striplen = len(os.path.split(abspfx)[0]) | |
537 | else: |
|
538 | else: | |
538 | striplen = len(abspfx) |
|
539 | striplen = len(abspfx) | |
539 | if striplen: |
|
540 | if striplen: | |
540 | striplen += len(os.sep) |
|
541 | striplen += len(os.sep) | |
541 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) |
|
542 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) | |
542 | elif destdirexists: |
|
543 | elif destdirexists: | |
543 | res = lambda p: os.path.join(dest, |
|
544 | res = lambda p: os.path.join(dest, | |
544 | os.path.basename(util.localpath(p))) |
|
545 | os.path.basename(util.localpath(p))) | |
545 | else: |
|
546 | else: | |
546 | res = lambda p: dest |
|
547 | res = lambda p: dest | |
547 | return res |
|
548 | return res | |
548 |
|
549 | |||
549 | # pat: ossep |
|
550 | # pat: ossep | |
550 | # dest ossep |
|
551 | # dest ossep | |
551 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
552 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
552 | # return: function that takes hgsep and returns ossep |
|
553 | # return: function that takes hgsep and returns ossep | |
553 | def targetpathafterfn(pat, dest, srcs): |
|
554 | def targetpathafterfn(pat, dest, srcs): | |
554 | if util.patkind(pat, None)[0]: |
|
555 | if util.patkind(pat, None)[0]: | |
555 | # a mercurial pattern |
|
556 | # a mercurial pattern | |
556 | res = lambda p: os.path.join(dest, |
|
557 | res = lambda p: os.path.join(dest, | |
557 | os.path.basename(util.localpath(p))) |
|
558 | os.path.basename(util.localpath(p))) | |
558 | else: |
|
559 | else: | |
559 | abspfx = util.canonpath(repo.root, cwd, pat) |
|
560 | abspfx = util.canonpath(repo.root, cwd, pat) | |
560 | if len(abspfx) < len(srcs[0][0]): |
|
561 | if len(abspfx) < len(srcs[0][0]): | |
561 | # A directory. Either the target path contains the last |
|
562 | # A directory. Either the target path contains the last | |
562 | # component of the source path or it does not. |
|
563 | # component of the source path or it does not. | |
563 | def evalpath(striplen): |
|
564 | def evalpath(striplen): | |
564 | score = 0 |
|
565 | score = 0 | |
565 | for s in srcs: |
|
566 | for s in srcs: | |
566 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
567 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) | |
567 | if os.path.exists(t): |
|
568 | if os.path.exists(t): | |
568 | score += 1 |
|
569 | score += 1 | |
569 | return score |
|
570 | return score | |
570 |
|
571 | |||
571 | abspfx = util.localpath(abspfx) |
|
572 | abspfx = util.localpath(abspfx) | |
572 | striplen = len(abspfx) |
|
573 | striplen = len(abspfx) | |
573 | if striplen: |
|
574 | if striplen: | |
574 | striplen += len(os.sep) |
|
575 | striplen += len(os.sep) | |
575 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
576 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | |
576 | score = evalpath(striplen) |
|
577 | score = evalpath(striplen) | |
577 | striplen1 = len(os.path.split(abspfx)[0]) |
|
578 | striplen1 = len(os.path.split(abspfx)[0]) | |
578 | if striplen1: |
|
579 | if striplen1: | |
579 | striplen1 += len(os.sep) |
|
580 | striplen1 += len(os.sep) | |
580 | if evalpath(striplen1) > score: |
|
581 | if evalpath(striplen1) > score: | |
581 | striplen = striplen1 |
|
582 | striplen = striplen1 | |
582 | res = lambda p: os.path.join(dest, |
|
583 | res = lambda p: os.path.join(dest, | |
583 | util.localpath(p)[striplen:]) |
|
584 | util.localpath(p)[striplen:]) | |
584 | else: |
|
585 | else: | |
585 | # a file |
|
586 | # a file | |
586 | if destdirexists: |
|
587 | if destdirexists: | |
587 | res = lambda p: os.path.join(dest, |
|
588 | res = lambda p: os.path.join(dest, | |
588 | os.path.basename(util.localpath(p))) |
|
589 | os.path.basename(util.localpath(p))) | |
589 | else: |
|
590 | else: | |
590 | res = lambda p: dest |
|
591 | res = lambda p: dest | |
591 | return res |
|
592 | return res | |
592 |
|
593 | |||
593 |
|
594 | |||
594 | pats = util.expand_glob(pats) |
|
595 | pats = util.expand_glob(pats) | |
595 | if not pats: |
|
596 | if not pats: | |
596 | raise util.Abort(_('no source or destination specified')) |
|
597 | raise util.Abort(_('no source or destination specified')) | |
597 | if len(pats) == 1: |
|
598 | if len(pats) == 1: | |
598 | raise util.Abort(_('no destination specified')) |
|
599 | raise util.Abort(_('no destination specified')) | |
599 | dest = pats.pop() |
|
600 | dest = pats.pop() | |
600 | destdirexists = os.path.isdir(dest) |
|
601 | destdirexists = os.path.isdir(dest) | |
601 | if not destdirexists: |
|
602 | if not destdirexists: | |
602 | if len(pats) > 1 or util.patkind(pats[0], None)[0]: |
|
603 | if len(pats) > 1 or util.patkind(pats[0], None)[0]: | |
603 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
604 | raise util.Abort(_('with multiple sources, destination must be an ' | |
604 | 'existing directory')) |
|
605 | 'existing directory')) | |
605 | if dest.endswith(os.sep) or os.altsep and dest.endswith(os.altsep): |
|
606 | if dest.endswith(os.sep) or os.altsep and dest.endswith(os.altsep): | |
606 | raise util.Abort(_('destination %s is not a directory') % dest) |
|
607 | raise util.Abort(_('destination %s is not a directory') % dest) | |
607 | if opts['after']: |
|
608 | if opts['after']: | |
608 | tfn = targetpathafterfn |
|
609 | tfn = targetpathafterfn | |
609 | else: |
|
610 | else: | |
610 | tfn = targetpathfn |
|
611 | tfn = targetpathfn | |
611 | copylist = [] |
|
612 | copylist = [] | |
612 | for pat in pats: |
|
613 | for pat in pats: | |
613 | srcs = [] |
|
614 | srcs = [] | |
614 | for tag, abssrc, relsrc, exact in cmdutil.walk(repo, [pat], opts, |
|
615 | for tag, abssrc, relsrc, exact in cmdutil.walk(repo, [pat], opts, | |
615 | globbed=True): |
|
616 | globbed=True): | |
616 | origsrc = okaytocopy(abssrc, relsrc, exact) |
|
617 | origsrc = okaytocopy(abssrc, relsrc, exact) | |
617 | if origsrc: |
|
618 | if origsrc: | |
618 | srcs.append((origsrc, abssrc, relsrc, exact)) |
|
619 | srcs.append((origsrc, abssrc, relsrc, exact)) | |
619 | if not srcs: |
|
620 | if not srcs: | |
620 | continue |
|
621 | continue | |
621 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
622 | copylist.append((tfn(pat, dest, srcs), srcs)) | |
622 | if not copylist: |
|
623 | if not copylist: | |
623 | raise util.Abort(_('no files to copy')) |
|
624 | raise util.Abort(_('no files to copy')) | |
624 |
|
625 | |||
625 | for targetpath, srcs in copylist: |
|
626 | for targetpath, srcs in copylist: | |
626 | for origsrc, abssrc, relsrc, exact in srcs: |
|
627 | for origsrc, abssrc, relsrc, exact in srcs: | |
627 | copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact) |
|
628 | copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact) | |
628 |
|
629 | |||
629 | if errors: |
|
630 | if errors: | |
630 | ui.warn(_('(consider using --after)\n')) |
|
631 | ui.warn(_('(consider using --after)\n')) | |
631 | return errors, copied |
|
632 | return errors, copied | |
632 |
|
633 | |||
633 | def copy(ui, repo, *pats, **opts): |
|
634 | def copy(ui, repo, *pats, **opts): | |
634 | """mark files as copied for the next commit |
|
635 | """mark files as copied for the next commit | |
635 |
|
636 | |||
636 | Mark dest as having copies of source files. If dest is a |
|
637 | Mark dest as having copies of source files. If dest is a | |
637 | directory, copies are put in that directory. If dest is a file, |
|
638 | directory, copies are put in that directory. If dest is a file, | |
638 | there can only be one source. |
|
639 | there can only be one source. | |
639 |
|
640 | |||
640 | By default, this command copies the contents of files as they |
|
641 | By default, this command copies the contents of files as they | |
641 | stand in the working directory. If invoked with --after, the |
|
642 | stand in the working directory. If invoked with --after, the | |
642 | operation is recorded, but no copying is performed. |
|
643 | operation is recorded, but no copying is performed. | |
643 |
|
644 | |||
644 | This command takes effect in the next commit. To undo a copy |
|
645 | This command takes effect in the next commit. To undo a copy | |
645 | before that, see hg revert. |
|
646 | before that, see hg revert. | |
646 | """ |
|
647 | """ | |
647 | wlock = repo.wlock(False) |
|
648 | wlock = repo.wlock(False) | |
648 | try: |
|
649 | try: | |
649 | errs, copied = docopy(ui, repo, pats, opts) |
|
650 | errs, copied = docopy(ui, repo, pats, opts) | |
650 | finally: |
|
651 | finally: | |
651 | del wlock |
|
652 | del wlock | |
652 | return errs |
|
653 | return errs | |
653 |
|
654 | |||
654 | def debugancestor(ui, index, rev1, rev2): |
|
655 | def debugancestor(ui, index, rev1, rev2): | |
655 | """find the ancestor revision of two revisions in a given index""" |
|
656 | """find the ancestor revision of two revisions in a given index""" | |
656 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index) |
|
657 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index) | |
657 | a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) |
|
658 | a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) | |
658 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
659 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
659 |
|
660 | |||
660 | def debugcomplete(ui, cmd='', **opts): |
|
661 | def debugcomplete(ui, cmd='', **opts): | |
661 | """returns the completion list associated with the given command""" |
|
662 | """returns the completion list associated with the given command""" | |
662 |
|
663 | |||
663 | if opts['options']: |
|
664 | if opts['options']: | |
664 | options = [] |
|
665 | options = [] | |
665 | otables = [globalopts] |
|
666 | otables = [globalopts] | |
666 | if cmd: |
|
667 | if cmd: | |
667 | aliases, entry = cmdutil.findcmd(ui, cmd, table) |
|
668 | aliases, entry = cmdutil.findcmd(ui, cmd, table) | |
668 | otables.append(entry[1]) |
|
669 | otables.append(entry[1]) | |
669 | for t in otables: |
|
670 | for t in otables: | |
670 | for o in t: |
|
671 | for o in t: | |
671 | if o[0]: |
|
672 | if o[0]: | |
672 | options.append('-%s' % o[0]) |
|
673 | options.append('-%s' % o[0]) | |
673 | options.append('--%s' % o[1]) |
|
674 | options.append('--%s' % o[1]) | |
674 | ui.write("%s\n" % "\n".join(options)) |
|
675 | ui.write("%s\n" % "\n".join(options)) | |
675 | return |
|
676 | return | |
676 |
|
677 | |||
677 | clist = cmdutil.findpossible(ui, cmd, table).keys() |
|
678 | clist = cmdutil.findpossible(ui, cmd, table).keys() | |
678 | clist.sort() |
|
679 | clist.sort() | |
679 | ui.write("%s\n" % "\n".join(clist)) |
|
680 | ui.write("%s\n" % "\n".join(clist)) | |
680 |
|
681 | |||
681 | def debugrebuildstate(ui, repo, rev=""): |
|
682 | def debugrebuildstate(ui, repo, rev=""): | |
682 | """rebuild the dirstate as it would look like for the given revision""" |
|
683 | """rebuild the dirstate as it would look like for the given revision""" | |
683 | if rev == "": |
|
684 | if rev == "": | |
684 | rev = repo.changelog.tip() |
|
685 | rev = repo.changelog.tip() | |
685 | ctx = repo.changectx(rev) |
|
686 | ctx = repo.changectx(rev) | |
686 | files = ctx.manifest() |
|
687 | files = ctx.manifest() | |
687 | wlock = repo.wlock() |
|
688 | wlock = repo.wlock() | |
688 | try: |
|
689 | try: | |
689 | repo.dirstate.rebuild(rev, files) |
|
690 | repo.dirstate.rebuild(rev, files) | |
690 | finally: |
|
691 | finally: | |
691 | del wlock |
|
692 | del wlock | |
692 |
|
693 | |||
693 | def debugcheckstate(ui, repo): |
|
694 | def debugcheckstate(ui, repo): | |
694 | """validate the correctness of the current dirstate""" |
|
695 | """validate the correctness of the current dirstate""" | |
695 | parent1, parent2 = repo.dirstate.parents() |
|
696 | parent1, parent2 = repo.dirstate.parents() | |
696 | m1 = repo.changectx(parent1).manifest() |
|
697 | m1 = repo.changectx(parent1).manifest() | |
697 | m2 = repo.changectx(parent2).manifest() |
|
698 | m2 = repo.changectx(parent2).manifest() | |
698 | errors = 0 |
|
699 | errors = 0 | |
699 | for f in repo.dirstate: |
|
700 | for f in repo.dirstate: | |
700 | state = repo.dirstate[f] |
|
701 | state = repo.dirstate[f] | |
701 | if state in "nr" and f not in m1: |
|
702 | if state in "nr" and f not in m1: | |
702 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
703 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
703 | errors += 1 |
|
704 | errors += 1 | |
704 | if state in "a" and f in m1: |
|
705 | if state in "a" and f in m1: | |
705 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
706 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
706 | errors += 1 |
|
707 | errors += 1 | |
707 | if state in "m" and f not in m1 and f not in m2: |
|
708 | if state in "m" and f not in m1 and f not in m2: | |
708 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
709 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
709 | (f, state)) |
|
710 | (f, state)) | |
710 | errors += 1 |
|
711 | errors += 1 | |
711 | for f in m1: |
|
712 | for f in m1: | |
712 | state = repo.dirstate[f] |
|
713 | state = repo.dirstate[f] | |
713 | if state not in "nrm": |
|
714 | if state not in "nrm": | |
714 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
715 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
715 | errors += 1 |
|
716 | errors += 1 | |
716 | if errors: |
|
717 | if errors: | |
717 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
718 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
718 | raise util.Abort(error) |
|
719 | raise util.Abort(error) | |
719 |
|
720 | |||
720 | def showconfig(ui, repo, *values, **opts): |
|
721 | def showconfig(ui, repo, *values, **opts): | |
721 | """show combined config settings from all hgrc files |
|
722 | """show combined config settings from all hgrc files | |
722 |
|
723 | |||
723 | With no args, print names and values of all config items. |
|
724 | With no args, print names and values of all config items. | |
724 |
|
725 | |||
725 | With one arg of the form section.name, print just the value of |
|
726 | With one arg of the form section.name, print just the value of | |
726 | that config item. |
|
727 | that config item. | |
727 |
|
728 | |||
728 | With multiple args, print names and values of all config items |
|
729 | With multiple args, print names and values of all config items | |
729 | with matching section names.""" |
|
730 | with matching section names.""" | |
730 |
|
731 | |||
731 | untrusted = bool(opts.get('untrusted')) |
|
732 | untrusted = bool(opts.get('untrusted')) | |
732 | if values: |
|
733 | if values: | |
733 | if len([v for v in values if '.' in v]) > 1: |
|
734 | if len([v for v in values if '.' in v]) > 1: | |
734 | raise util.Abort(_('only one config item permitted')) |
|
735 | raise util.Abort(_('only one config item permitted')) | |
735 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
736 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
736 | sectname = section + '.' + name |
|
737 | sectname = section + '.' + name | |
737 | if values: |
|
738 | if values: | |
738 | for v in values: |
|
739 | for v in values: | |
739 | if v == section: |
|
740 | if v == section: | |
740 | ui.write('%s=%s\n' % (sectname, value)) |
|
741 | ui.write('%s=%s\n' % (sectname, value)) | |
741 | elif v == sectname: |
|
742 | elif v == sectname: | |
742 | ui.write(value, '\n') |
|
743 | ui.write(value, '\n') | |
743 | else: |
|
744 | else: | |
744 | ui.write('%s=%s\n' % (sectname, value)) |
|
745 | ui.write('%s=%s\n' % (sectname, value)) | |
745 |
|
746 | |||
746 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
747 | def debugsetparents(ui, repo, rev1, rev2=None): | |
747 | """manually set the parents of the current working directory |
|
748 | """manually set the parents of the current working directory | |
748 |
|
749 | |||
749 | This is useful for writing repository conversion tools, but should |
|
750 | This is useful for writing repository conversion tools, but should | |
750 | be used with care. |
|
751 | be used with care. | |
751 | """ |
|
752 | """ | |
752 |
|
753 | |||
753 | if not rev2: |
|
754 | if not rev2: | |
754 | rev2 = hex(nullid) |
|
755 | rev2 = hex(nullid) | |
755 |
|
756 | |||
756 | wlock = repo.wlock() |
|
757 | wlock = repo.wlock() | |
757 | try: |
|
758 | try: | |
758 | repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) |
|
759 | repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) | |
759 | finally: |
|
760 | finally: | |
760 | del wlock |
|
761 | del wlock | |
761 |
|
762 | |||
762 | def debugstate(ui, repo): |
|
763 | def debugstate(ui, repo): | |
763 | """show the contents of the current dirstate""" |
|
764 | """show the contents of the current dirstate""" | |
764 | k = repo.dirstate._map.items() |
|
765 | k = repo.dirstate._map.items() | |
765 | k.sort() |
|
766 | k.sort() | |
766 | for file_, ent in k: |
|
767 | for file_, ent in k: | |
767 | if ent[3] == -1: |
|
768 | if ent[3] == -1: | |
768 | # Pad or slice to locale representation |
|
769 | # Pad or slice to locale representation | |
769 | locale_len = len(time.strftime("%x %X", time.localtime(0))) |
|
770 | locale_len = len(time.strftime("%x %X", time.localtime(0))) | |
770 | timestr = 'unset' |
|
771 | timestr = 'unset' | |
771 | timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr)) |
|
772 | timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr)) | |
772 | else: |
|
773 | else: | |
773 | timestr = time.strftime("%x %X", time.localtime(ent[3])) |
|
774 | timestr = time.strftime("%x %X", time.localtime(ent[3])) | |
774 | if ent[1] & 020000: |
|
775 | if ent[1] & 020000: | |
775 | mode = 'lnk' |
|
776 | mode = 'lnk' | |
776 | else: |
|
777 | else: | |
777 | mode = '%3o' % (ent[1] & 0777) |
|
778 | mode = '%3o' % (ent[1] & 0777) | |
778 | ui.write("%c %s %10d %s %s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
779 | ui.write("%c %s %10d %s %s\n" % (ent[0], mode, ent[2], timestr, file_)) | |
779 | for f in repo.dirstate.copies(): |
|
780 | for f in repo.dirstate.copies(): | |
780 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
781 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | |
781 |
|
782 | |||
782 | def debugdata(ui, file_, rev): |
|
783 | def debugdata(ui, file_, rev): | |
783 | """dump the contents of a data file revision""" |
|
784 | """dump the contents of a data file revision""" | |
784 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i") |
|
785 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i") | |
785 | try: |
|
786 | try: | |
786 | ui.write(r.revision(r.lookup(rev))) |
|
787 | ui.write(r.revision(r.lookup(rev))) | |
787 | except KeyError: |
|
788 | except KeyError: | |
788 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
789 | raise util.Abort(_('invalid revision identifier %s') % rev) | |
789 |
|
790 | |||
790 | def debugdate(ui, date, range=None, **opts): |
|
791 | def debugdate(ui, date, range=None, **opts): | |
791 | """parse and display a date""" |
|
792 | """parse and display a date""" | |
792 | if opts["extended"]: |
|
793 | if opts["extended"]: | |
793 | d = util.parsedate(date, util.extendeddateformats) |
|
794 | d = util.parsedate(date, util.extendeddateformats) | |
794 | else: |
|
795 | else: | |
795 | d = util.parsedate(date) |
|
796 | d = util.parsedate(date) | |
796 | ui.write("internal: %s %s\n" % d) |
|
797 | ui.write("internal: %s %s\n" % d) | |
797 | ui.write("standard: %s\n" % util.datestr(d)) |
|
798 | ui.write("standard: %s\n" % util.datestr(d)) | |
798 | if range: |
|
799 | if range: | |
799 | m = util.matchdate(range) |
|
800 | m = util.matchdate(range) | |
800 | ui.write("match: %s\n" % m(d[0])) |
|
801 | ui.write("match: %s\n" % m(d[0])) | |
801 |
|
802 | |||
802 | def debugindex(ui, file_): |
|
803 | def debugindex(ui, file_): | |
803 | """dump the contents of an index file""" |
|
804 | """dump the contents of an index file""" | |
804 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) |
|
805 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) | |
805 | ui.write(" rev offset length base linkrev" + |
|
806 | ui.write(" rev offset length base linkrev" + | |
806 | " nodeid p1 p2\n") |
|
807 | " nodeid p1 p2\n") | |
807 | for i in xrange(r.count()): |
|
808 | for i in xrange(r.count()): | |
808 | node = r.node(i) |
|
809 | node = r.node(i) | |
809 | try: |
|
810 | try: | |
810 | pp = r.parents(node) |
|
811 | pp = r.parents(node) | |
811 | except: |
|
812 | except: | |
812 | pp = [nullid, nullid] |
|
813 | pp = [nullid, nullid] | |
813 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
814 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
814 | i, r.start(i), r.length(i), r.base(i), r.linkrev(node), |
|
815 | i, r.start(i), r.length(i), r.base(i), r.linkrev(node), | |
815 | short(node), short(pp[0]), short(pp[1]))) |
|
816 | short(node), short(pp[0]), short(pp[1]))) | |
816 |
|
817 | |||
817 | def debugindexdot(ui, file_): |
|
818 | def debugindexdot(ui, file_): | |
818 | """dump an index DAG as a .dot file""" |
|
819 | """dump an index DAG as a .dot file""" | |
819 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) |
|
820 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) | |
820 | ui.write("digraph G {\n") |
|
821 | ui.write("digraph G {\n") | |
821 | for i in xrange(r.count()): |
|
822 | for i in xrange(r.count()): | |
822 | node = r.node(i) |
|
823 | node = r.node(i) | |
823 | pp = r.parents(node) |
|
824 | pp = r.parents(node) | |
824 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
825 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
825 | if pp[1] != nullid: |
|
826 | if pp[1] != nullid: | |
826 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
827 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
827 | ui.write("}\n") |
|
828 | ui.write("}\n") | |
828 |
|
829 | |||
829 | def debuginstall(ui): |
|
830 | def debuginstall(ui): | |
830 | '''test Mercurial installation''' |
|
831 | '''test Mercurial installation''' | |
831 |
|
832 | |||
832 | def writetemp(contents): |
|
833 | def writetemp(contents): | |
833 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
834 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") | |
834 | f = os.fdopen(fd, "wb") |
|
835 | f = os.fdopen(fd, "wb") | |
835 | f.write(contents) |
|
836 | f.write(contents) | |
836 | f.close() |
|
837 | f.close() | |
837 | return name |
|
838 | return name | |
838 |
|
839 | |||
839 | problems = 0 |
|
840 | problems = 0 | |
840 |
|
841 | |||
841 | # encoding |
|
842 | # encoding | |
842 | ui.status(_("Checking encoding (%s)...\n") % util._encoding) |
|
843 | ui.status(_("Checking encoding (%s)...\n") % util._encoding) | |
843 | try: |
|
844 | try: | |
844 | util.fromlocal("test") |
|
845 | util.fromlocal("test") | |
845 | except util.Abort, inst: |
|
846 | except util.Abort, inst: | |
846 | ui.write(" %s\n" % inst) |
|
847 | ui.write(" %s\n" % inst) | |
847 | ui.write(_(" (check that your locale is properly set)\n")) |
|
848 | ui.write(_(" (check that your locale is properly set)\n")) | |
848 | problems += 1 |
|
849 | problems += 1 | |
849 |
|
850 | |||
850 | # compiled modules |
|
851 | # compiled modules | |
851 | ui.status(_("Checking extensions...\n")) |
|
852 | ui.status(_("Checking extensions...\n")) | |
852 | try: |
|
853 | try: | |
853 | import bdiff, mpatch, base85 |
|
854 | import bdiff, mpatch, base85 | |
854 | except Exception, inst: |
|
855 | except Exception, inst: | |
855 | ui.write(" %s\n" % inst) |
|
856 | ui.write(" %s\n" % inst) | |
856 | ui.write(_(" One or more extensions could not be found")) |
|
857 | ui.write(_(" One or more extensions could not be found")) | |
857 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
858 | ui.write(_(" (check that you compiled the extensions)\n")) | |
858 | problems += 1 |
|
859 | problems += 1 | |
859 |
|
860 | |||
860 | # templates |
|
861 | # templates | |
861 | ui.status(_("Checking templates...\n")) |
|
862 | ui.status(_("Checking templates...\n")) | |
862 | try: |
|
863 | try: | |
863 | import templater |
|
864 | import templater | |
864 | t = templater.templater(templater.templatepath("map-cmdline.default")) |
|
865 | t = templater.templater(templater.templatepath("map-cmdline.default")) | |
865 | except Exception, inst: |
|
866 | except Exception, inst: | |
866 | ui.write(" %s\n" % inst) |
|
867 | ui.write(" %s\n" % inst) | |
867 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
868 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) | |
868 | problems += 1 |
|
869 | problems += 1 | |
869 |
|
870 | |||
870 | # patch |
|
871 | # patch | |
871 | ui.status(_("Checking patch...\n")) |
|
872 | ui.status(_("Checking patch...\n")) | |
872 | patchproblems = 0 |
|
873 | patchproblems = 0 | |
873 | a = "1\n2\n3\n4\n" |
|
874 | a = "1\n2\n3\n4\n" | |
874 | b = "1\n2\n3\ninsert\n4\n" |
|
875 | b = "1\n2\n3\ninsert\n4\n" | |
875 | fa = writetemp(a) |
|
876 | fa = writetemp(a) | |
876 | d = mdiff.unidiff(a, None, b, None, os.path.basename(fa), |
|
877 | d = mdiff.unidiff(a, None, b, None, os.path.basename(fa), | |
877 | os.path.basename(fa)) |
|
878 | os.path.basename(fa)) | |
878 | fd = writetemp(d) |
|
879 | fd = writetemp(d) | |
879 |
|
880 | |||
880 | files = {} |
|
881 | files = {} | |
881 | try: |
|
882 | try: | |
882 | patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files) |
|
883 | patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files) | |
883 | except util.Abort, e: |
|
884 | except util.Abort, e: | |
884 | ui.write(_(" patch call failed:\n")) |
|
885 | ui.write(_(" patch call failed:\n")) | |
885 | ui.write(" " + str(e) + "\n") |
|
886 | ui.write(" " + str(e) + "\n") | |
886 | patchproblems += 1 |
|
887 | patchproblems += 1 | |
887 | else: |
|
888 | else: | |
888 | if list(files) != [os.path.basename(fa)]: |
|
889 | if list(files) != [os.path.basename(fa)]: | |
889 | ui.write(_(" unexpected patch output!\n")) |
|
890 | ui.write(_(" unexpected patch output!\n")) | |
890 | patchproblems += 1 |
|
891 | patchproblems += 1 | |
891 | a = file(fa).read() |
|
892 | a = file(fa).read() | |
892 | if a != b: |
|
893 | if a != b: | |
893 | ui.write(_(" patch test failed!\n")) |
|
894 | ui.write(_(" patch test failed!\n")) | |
894 | patchproblems += 1 |
|
895 | patchproblems += 1 | |
895 |
|
896 | |||
896 | if patchproblems: |
|
897 | if patchproblems: | |
897 | if ui.config('ui', 'patch'): |
|
898 | if ui.config('ui', 'patch'): | |
898 | ui.write(_(" (Current patch tool may be incompatible with patch," |
|
899 | ui.write(_(" (Current patch tool may be incompatible with patch," | |
899 | " or misconfigured. Please check your .hgrc file)\n")) |
|
900 | " or misconfigured. Please check your .hgrc file)\n")) | |
900 | else: |
|
901 | else: | |
901 | ui.write(_(" Internal patcher failure, please report this error" |
|
902 | ui.write(_(" Internal patcher failure, please report this error" | |
902 | " to http://www.selenic.com/mercurial/bts\n")) |
|
903 | " to http://www.selenic.com/mercurial/bts\n")) | |
903 | problems += patchproblems |
|
904 | problems += patchproblems | |
904 |
|
905 | |||
905 | os.unlink(fa) |
|
906 | os.unlink(fa) | |
906 | os.unlink(fd) |
|
907 | os.unlink(fd) | |
907 |
|
908 | |||
908 | # merge helper |
|
909 | # merge helper | |
909 | ui.status(_("Checking merge helper...\n")) |
|
910 | ui.status(_("Checking merge helper...\n")) | |
910 | cmd = (os.environ.get("HGMERGE") or ui.config("ui", "merge") |
|
911 | cmd = (os.environ.get("HGMERGE") or ui.config("ui", "merge") | |
911 | or "hgmerge") |
|
912 | or "hgmerge") | |
912 | cmdpath = util.find_exe(cmd) or util.find_exe(cmd.split()[0]) |
|
913 | cmdpath = util.find_exe(cmd) or util.find_exe(cmd.split()[0]) | |
913 | if not cmdpath: |
|
914 | if not cmdpath: | |
914 | if cmd == 'hgmerge': |
|
915 | if cmd == 'hgmerge': | |
915 | ui.write(_(" No merge helper set and can't find default" |
|
916 | ui.write(_(" No merge helper set and can't find default" | |
916 | " hgmerge script in PATH\n")) |
|
917 | " hgmerge script in PATH\n")) | |
917 | ui.write(_(" (specify a merge helper in your .hgrc file)\n")) |
|
918 | ui.write(_(" (specify a merge helper in your .hgrc file)\n")) | |
918 | else: |
|
919 | else: | |
919 | ui.write(_(" Can't find merge helper '%s' in PATH\n") % cmd) |
|
920 | ui.write(_(" Can't find merge helper '%s' in PATH\n") % cmd) | |
920 | ui.write(_(" (specify a merge helper in your .hgrc file)\n")) |
|
921 | ui.write(_(" (specify a merge helper in your .hgrc file)\n")) | |
921 | problems += 1 |
|
922 | problems += 1 | |
922 | else: |
|
923 | else: | |
923 | # actually attempt a patch here |
|
924 | # actually attempt a patch here | |
924 | fa = writetemp("1\n2\n3\n4\n") |
|
925 | fa = writetemp("1\n2\n3\n4\n") | |
925 | fl = writetemp("1\n2\n3\ninsert\n4\n") |
|
926 | fl = writetemp("1\n2\n3\ninsert\n4\n") | |
926 | fr = writetemp("begin\n1\n2\n3\n4\n") |
|
927 | fr = writetemp("begin\n1\n2\n3\n4\n") | |
927 | r = util.system('%s "%s" "%s" "%s"' % (cmd, fl, fa, fr)) |
|
928 | r = util.system('%s "%s" "%s" "%s"' % (cmd, fl, fa, fr)) | |
928 | if r: |
|
929 | if r: | |
929 | ui.write(_(" Got unexpected merge error %d!\n") % r) |
|
930 | ui.write(_(" Got unexpected merge error %d!\n") % r) | |
930 | problems += 1 |
|
931 | problems += 1 | |
931 | m = file(fl).read() |
|
932 | m = file(fl).read() | |
932 | if m != "begin\n1\n2\n3\ninsert\n4\n": |
|
933 | if m != "begin\n1\n2\n3\ninsert\n4\n": | |
933 | ui.write(_(" Got unexpected merge results!\n")) |
|
934 | ui.write(_(" Got unexpected merge results!\n")) | |
934 | ui.write(_(" (your merge helper may have the" |
|
935 | ui.write(_(" (your merge helper may have the" | |
935 | " wrong argument order)\n")) |
|
936 | " wrong argument order)\n")) | |
936 | ui.write(_(" Result: %r\n") % m) |
|
937 | ui.write(_(" Result: %r\n") % m) | |
937 | problems += 1 |
|
938 | problems += 1 | |
938 | os.unlink(fa) |
|
939 | os.unlink(fa) | |
939 | os.unlink(fl) |
|
940 | os.unlink(fl) | |
940 | os.unlink(fr) |
|
941 | os.unlink(fr) | |
941 |
|
942 | |||
942 | # editor |
|
943 | # editor | |
943 | ui.status(_("Checking commit editor...\n")) |
|
944 | ui.status(_("Checking commit editor...\n")) | |
944 | editor = (os.environ.get("HGEDITOR") or |
|
945 | editor = (os.environ.get("HGEDITOR") or | |
945 | ui.config("ui", "editor") or |
|
946 | ui.config("ui", "editor") or | |
946 | os.environ.get("EDITOR", "vi")) |
|
947 | os.environ.get("EDITOR", "vi")) | |
947 | cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) |
|
948 | cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) | |
948 | if not cmdpath: |
|
949 | if not cmdpath: | |
949 | if editor == 'vi': |
|
950 | if editor == 'vi': | |
950 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
951 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
951 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
|
952 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) | |
952 | else: |
|
953 | else: | |
953 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
954 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
954 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
|
955 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) | |
955 | problems += 1 |
|
956 | problems += 1 | |
956 |
|
957 | |||
957 | # check username |
|
958 | # check username | |
958 | ui.status(_("Checking username...\n")) |
|
959 | ui.status(_("Checking username...\n")) | |
959 | user = os.environ.get("HGUSER") |
|
960 | user = os.environ.get("HGUSER") | |
960 | if user is None: |
|
961 | if user is None: | |
961 | user = ui.config("ui", "username") |
|
962 | user = ui.config("ui", "username") | |
962 | if user is None: |
|
963 | if user is None: | |
963 | user = os.environ.get("EMAIL") |
|
964 | user = os.environ.get("EMAIL") | |
964 | if not user: |
|
965 | if not user: | |
965 | ui.warn(" ") |
|
966 | ui.warn(" ") | |
966 | ui.username() |
|
967 | ui.username() | |
967 | ui.write(_(" (specify a username in your .hgrc file)\n")) |
|
968 | ui.write(_(" (specify a username in your .hgrc file)\n")) | |
968 |
|
969 | |||
969 | if not problems: |
|
970 | if not problems: | |
970 | ui.status(_("No problems detected\n")) |
|
971 | ui.status(_("No problems detected\n")) | |
971 | else: |
|
972 | else: | |
972 | ui.write(_("%s problems detected," |
|
973 | ui.write(_("%s problems detected," | |
973 | " please check your install!\n") % problems) |
|
974 | " please check your install!\n") % problems) | |
974 |
|
975 | |||
975 | return problems |
|
976 | return problems | |
976 |
|
977 | |||
977 | def debugrename(ui, repo, file1, *pats, **opts): |
|
978 | def debugrename(ui, repo, file1, *pats, **opts): | |
978 | """dump rename information""" |
|
979 | """dump rename information""" | |
979 |
|
980 | |||
980 | ctx = repo.changectx(opts.get('rev', 'tip')) |
|
981 | ctx = repo.changectx(opts.get('rev', 'tip')) | |
981 | for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts, |
|
982 | for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts, | |
982 | ctx.node()): |
|
983 | ctx.node()): | |
983 | m = ctx.filectx(abs).renamed() |
|
984 | m = ctx.filectx(abs).renamed() | |
984 | if m: |
|
985 | if m: | |
985 | ui.write(_("%s renamed from %s:%s\n") % (rel, m[0], hex(m[1]))) |
|
986 | ui.write(_("%s renamed from %s:%s\n") % (rel, m[0], hex(m[1]))) | |
986 | else: |
|
987 | else: | |
987 | ui.write(_("%s not renamed\n") % rel) |
|
988 | ui.write(_("%s not renamed\n") % rel) | |
988 |
|
989 | |||
989 | def debugwalk(ui, repo, *pats, **opts): |
|
990 | def debugwalk(ui, repo, *pats, **opts): | |
990 | """show how files match on given patterns""" |
|
991 | """show how files match on given patterns""" | |
991 | items = list(cmdutil.walk(repo, pats, opts)) |
|
992 | items = list(cmdutil.walk(repo, pats, opts)) | |
992 | if not items: |
|
993 | if not items: | |
993 | return |
|
994 | return | |
994 | fmt = '%%s %%-%ds %%-%ds %%s' % ( |
|
995 | fmt = '%%s %%-%ds %%-%ds %%s' % ( | |
995 | max([len(abs) for (src, abs, rel, exact) in items]), |
|
996 | max([len(abs) for (src, abs, rel, exact) in items]), | |
996 | max([len(rel) for (src, abs, rel, exact) in items])) |
|
997 | max([len(rel) for (src, abs, rel, exact) in items])) | |
997 | for src, abs, rel, exact in items: |
|
998 | for src, abs, rel, exact in items: | |
998 | line = fmt % (src, abs, rel, exact and 'exact' or '') |
|
999 | line = fmt % (src, abs, rel, exact and 'exact' or '') | |
999 | ui.write("%s\n" % line.rstrip()) |
|
1000 | ui.write("%s\n" % line.rstrip()) | |
1000 |
|
1001 | |||
1001 | def diff(ui, repo, *pats, **opts): |
|
1002 | def diff(ui, repo, *pats, **opts): | |
1002 | """diff repository (or selected files) |
|
1003 | """diff repository (or selected files) | |
1003 |
|
1004 | |||
1004 | Show differences between revisions for the specified files. |
|
1005 | Show differences between revisions for the specified files. | |
1005 |
|
1006 | |||
1006 | Differences between files are shown using the unified diff format. |
|
1007 | Differences between files are shown using the unified diff format. | |
1007 |
|
1008 | |||
1008 | NOTE: diff may generate unexpected results for merges, as it will |
|
1009 | NOTE: diff may generate unexpected results for merges, as it will | |
1009 | default to comparing against the working directory's first parent |
|
1010 | default to comparing against the working directory's first parent | |
1010 | changeset if no revisions are specified. |
|
1011 | changeset if no revisions are specified. | |
1011 |
|
1012 | |||
1012 | When two revision arguments are given, then changes are shown |
|
1013 | When two revision arguments are given, then changes are shown | |
1013 | between those revisions. If only one revision is specified then |
|
1014 | between those revisions. If only one revision is specified then | |
1014 | that revision is compared to the working directory, and, when no |
|
1015 | that revision is compared to the working directory, and, when no | |
1015 | revisions are specified, the working directory files are compared |
|
1016 | revisions are specified, the working directory files are compared | |
1016 | to its parent. |
|
1017 | to its parent. | |
1017 |
|
1018 | |||
1018 | Without the -a option, diff will avoid generating diffs of files |
|
1019 | Without the -a option, diff will avoid generating diffs of files | |
1019 | it detects as binary. With -a, diff will generate a diff anyway, |
|
1020 | it detects as binary. With -a, diff will generate a diff anyway, | |
1020 | probably with undesirable results. |
|
1021 | probably with undesirable results. | |
1021 | """ |
|
1022 | """ | |
1022 | node1, node2 = cmdutil.revpair(repo, opts['rev']) |
|
1023 | node1, node2 = cmdutil.revpair(repo, opts['rev']) | |
1023 |
|
1024 | |||
1024 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
|
1025 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | |
1025 |
|
1026 | |||
1026 | patch.diff(repo, node1, node2, fns, match=matchfn, |
|
1027 | patch.diff(repo, node1, node2, fns, match=matchfn, | |
1027 | opts=patch.diffopts(ui, opts)) |
|
1028 | opts=patch.diffopts(ui, opts)) | |
1028 |
|
1029 | |||
1029 | def export(ui, repo, *changesets, **opts): |
|
1030 | def export(ui, repo, *changesets, **opts): | |
1030 | """dump the header and diffs for one or more changesets |
|
1031 | """dump the header and diffs for one or more changesets | |
1031 |
|
1032 | |||
1032 | Print the changeset header and diffs for one or more revisions. |
|
1033 | Print the changeset header and diffs for one or more revisions. | |
1033 |
|
1034 | |||
1034 | The information shown in the changeset header is: author, |
|
1035 | The information shown in the changeset header is: author, | |
1035 | changeset hash, parent(s) and commit comment. |
|
1036 | changeset hash, parent(s) and commit comment. | |
1036 |
|
1037 | |||
1037 | NOTE: export may generate unexpected diff output for merge changesets, |
|
1038 | NOTE: export may generate unexpected diff output for merge changesets, | |
1038 | as it will compare the merge changeset against its first parent only. |
|
1039 | as it will compare the merge changeset against its first parent only. | |
1039 |
|
1040 | |||
1040 | Output may be to a file, in which case the name of the file is |
|
1041 | Output may be to a file, in which case the name of the file is | |
1041 | given using a format string. The formatting rules are as follows: |
|
1042 | given using a format string. The formatting rules are as follows: | |
1042 |
|
1043 | |||
1043 | %% literal "%" character |
|
1044 | %% literal "%" character | |
1044 | %H changeset hash (40 bytes of hexadecimal) |
|
1045 | %H changeset hash (40 bytes of hexadecimal) | |
1045 | %N number of patches being generated |
|
1046 | %N number of patches being generated | |
1046 | %R changeset revision number |
|
1047 | %R changeset revision number | |
1047 | %b basename of the exporting repository |
|
1048 | %b basename of the exporting repository | |
1048 | %h short-form changeset hash (12 bytes of hexadecimal) |
|
1049 | %h short-form changeset hash (12 bytes of hexadecimal) | |
1049 | %n zero-padded sequence number, starting at 1 |
|
1050 | %n zero-padded sequence number, starting at 1 | |
1050 | %r zero-padded changeset revision number |
|
1051 | %r zero-padded changeset revision number | |
1051 |
|
1052 | |||
1052 | Without the -a option, export will avoid generating diffs of files |
|
1053 | Without the -a option, export will avoid generating diffs of files | |
1053 | it detects as binary. With -a, export will generate a diff anyway, |
|
1054 | it detects as binary. With -a, export will generate a diff anyway, | |
1054 | probably with undesirable results. |
|
1055 | probably with undesirable results. | |
1055 |
|
1056 | |||
1056 | With the --switch-parent option, the diff will be against the second |
|
1057 | With the --switch-parent option, the diff will be against the second | |
1057 | parent. It can be useful to review a merge. |
|
1058 | parent. It can be useful to review a merge. | |
1058 | """ |
|
1059 | """ | |
1059 | if not changesets: |
|
1060 | if not changesets: | |
1060 | raise util.Abort(_("export requires at least one changeset")) |
|
1061 | raise util.Abort(_("export requires at least one changeset")) | |
1061 | revs = cmdutil.revrange(repo, changesets) |
|
1062 | revs = cmdutil.revrange(repo, changesets) | |
1062 | if len(revs) > 1: |
|
1063 | if len(revs) > 1: | |
1063 | ui.note(_('exporting patches:\n')) |
|
1064 | ui.note(_('exporting patches:\n')) | |
1064 | else: |
|
1065 | else: | |
1065 | ui.note(_('exporting patch:\n')) |
|
1066 | ui.note(_('exporting patch:\n')) | |
1066 | patch.export(repo, revs, template=opts['output'], |
|
1067 | patch.export(repo, revs, template=opts['output'], | |
1067 | switch_parent=opts['switch_parent'], |
|
1068 | switch_parent=opts['switch_parent'], | |
1068 | opts=patch.diffopts(ui, opts)) |
|
1069 | opts=patch.diffopts(ui, opts)) | |
1069 |
|
1070 | |||
1070 | def grep(ui, repo, pattern, *pats, **opts): |
|
1071 | def grep(ui, repo, pattern, *pats, **opts): | |
1071 | """search for a pattern in specified files and revisions |
|
1072 | """search for a pattern in specified files and revisions | |
1072 |
|
1073 | |||
1073 | Search revisions of files for a regular expression. |
|
1074 | Search revisions of files for a regular expression. | |
1074 |
|
1075 | |||
1075 | This command behaves differently than Unix grep. It only accepts |
|
1076 | This command behaves differently than Unix grep. It only accepts | |
1076 | Python/Perl regexps. It searches repository history, not the |
|
1077 | Python/Perl regexps. It searches repository history, not the | |
1077 | working directory. It always prints the revision number in which |
|
1078 | working directory. It always prints the revision number in which | |
1078 | a match appears. |
|
1079 | a match appears. | |
1079 |
|
1080 | |||
1080 | By default, grep only prints output for the first revision of a |
|
1081 | By default, grep only prints output for the first revision of a | |
1081 | file in which it finds a match. To get it to print every revision |
|
1082 | file in which it finds a match. To get it to print every revision | |
1082 | that contains a change in match status ("-" for a match that |
|
1083 | that contains a change in match status ("-" for a match that | |
1083 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
1084 | becomes a non-match, or "+" for a non-match that becomes a match), | |
1084 | use the --all flag. |
|
1085 | use the --all flag. | |
1085 | """ |
|
1086 | """ | |
1086 | reflags = 0 |
|
1087 | reflags = 0 | |
1087 | if opts['ignore_case']: |
|
1088 | if opts['ignore_case']: | |
1088 | reflags |= re.I |
|
1089 | reflags |= re.I | |
1089 | try: |
|
1090 | try: | |
1090 | regexp = re.compile(pattern, reflags) |
|
1091 | regexp = re.compile(pattern, reflags) | |
1091 | except Exception, inst: |
|
1092 | except Exception, inst: | |
1092 | ui.warn(_("grep: invalid match pattern: %s!\n") % inst) |
|
1093 | ui.warn(_("grep: invalid match pattern: %s!\n") % inst) | |
1093 | return None |
|
1094 | return None | |
1094 | sep, eol = ':', '\n' |
|
1095 | sep, eol = ':', '\n' | |
1095 | if opts['print0']: |
|
1096 | if opts['print0']: | |
1096 | sep = eol = '\0' |
|
1097 | sep = eol = '\0' | |
1097 |
|
1098 | |||
1098 | fcache = {} |
|
1099 | fcache = {} | |
1099 | def getfile(fn): |
|
1100 | def getfile(fn): | |
1100 | if fn not in fcache: |
|
1101 | if fn not in fcache: | |
1101 | fcache[fn] = repo.file(fn) |
|
1102 | fcache[fn] = repo.file(fn) | |
1102 | return fcache[fn] |
|
1103 | return fcache[fn] | |
1103 |
|
1104 | |||
1104 | def matchlines(body): |
|
1105 | def matchlines(body): | |
1105 | begin = 0 |
|
1106 | begin = 0 | |
1106 | linenum = 0 |
|
1107 | linenum = 0 | |
1107 | while True: |
|
1108 | while True: | |
1108 | match = regexp.search(body, begin) |
|
1109 | match = regexp.search(body, begin) | |
1109 | if not match: |
|
1110 | if not match: | |
1110 | break |
|
1111 | break | |
1111 | mstart, mend = match.span() |
|
1112 | mstart, mend = match.span() | |
1112 | linenum += body.count('\n', begin, mstart) + 1 |
|
1113 | linenum += body.count('\n', begin, mstart) + 1 | |
1113 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
1114 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
1114 | lend = body.find('\n', mend) |
|
1115 | lend = body.find('\n', mend) | |
1115 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
1116 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
1116 | begin = lend + 1 |
|
1117 | begin = lend + 1 | |
1117 |
|
1118 | |||
1118 | class linestate(object): |
|
1119 | class linestate(object): | |
1119 | def __init__(self, line, linenum, colstart, colend): |
|
1120 | def __init__(self, line, linenum, colstart, colend): | |
1120 | self.line = line |
|
1121 | self.line = line | |
1121 | self.linenum = linenum |
|
1122 | self.linenum = linenum | |
1122 | self.colstart = colstart |
|
1123 | self.colstart = colstart | |
1123 | self.colend = colend |
|
1124 | self.colend = colend | |
1124 |
|
1125 | |||
1125 | def __eq__(self, other): |
|
1126 | def __eq__(self, other): | |
1126 | return self.line == other.line |
|
1127 | return self.line == other.line | |
1127 |
|
1128 | |||
1128 | matches = {} |
|
1129 | matches = {} | |
1129 | copies = {} |
|
1130 | copies = {} | |
1130 | def grepbody(fn, rev, body): |
|
1131 | def grepbody(fn, rev, body): | |
1131 | matches[rev].setdefault(fn, []) |
|
1132 | matches[rev].setdefault(fn, []) | |
1132 | m = matches[rev][fn] |
|
1133 | m = matches[rev][fn] | |
1133 | for lnum, cstart, cend, line in matchlines(body): |
|
1134 | for lnum, cstart, cend, line in matchlines(body): | |
1134 | s = linestate(line, lnum, cstart, cend) |
|
1135 | s = linestate(line, lnum, cstart, cend) | |
1135 | m.append(s) |
|
1136 | m.append(s) | |
1136 |
|
1137 | |||
1137 | def difflinestates(a, b): |
|
1138 | def difflinestates(a, b): | |
1138 | sm = difflib.SequenceMatcher(None, a, b) |
|
1139 | sm = difflib.SequenceMatcher(None, a, b) | |
1139 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
1140 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
1140 | if tag == 'insert': |
|
1141 | if tag == 'insert': | |
1141 | for i in xrange(blo, bhi): |
|
1142 | for i in xrange(blo, bhi): | |
1142 | yield ('+', b[i]) |
|
1143 | yield ('+', b[i]) | |
1143 | elif tag == 'delete': |
|
1144 | elif tag == 'delete': | |
1144 | for i in xrange(alo, ahi): |
|
1145 | for i in xrange(alo, ahi): | |
1145 | yield ('-', a[i]) |
|
1146 | yield ('-', a[i]) | |
1146 | elif tag == 'replace': |
|
1147 | elif tag == 'replace': | |
1147 | for i in xrange(alo, ahi): |
|
1148 | for i in xrange(alo, ahi): | |
1148 | yield ('-', a[i]) |
|
1149 | yield ('-', a[i]) | |
1149 | for i in xrange(blo, bhi): |
|
1150 | for i in xrange(blo, bhi): | |
1150 | yield ('+', b[i]) |
|
1151 | yield ('+', b[i]) | |
1151 |
|
1152 | |||
1152 | prev = {} |
|
1153 | prev = {} | |
1153 | def display(fn, rev, states, prevstates): |
|
1154 | def display(fn, rev, states, prevstates): | |
1154 | found = False |
|
1155 | found = False | |
1155 | filerevmatches = {} |
|
1156 | filerevmatches = {} | |
1156 | r = prev.get(fn, -1) |
|
1157 | r = prev.get(fn, -1) | |
1157 | if opts['all']: |
|
1158 | if opts['all']: | |
1158 | iter = difflinestates(states, prevstates) |
|
1159 | iter = difflinestates(states, prevstates) | |
1159 | else: |
|
1160 | else: | |
1160 | iter = [('', l) for l in prevstates] |
|
1161 | iter = [('', l) for l in prevstates] | |
1161 | for change, l in iter: |
|
1162 | for change, l in iter: | |
1162 | cols = [fn, str(r)] |
|
1163 | cols = [fn, str(r)] | |
1163 | if opts['line_number']: |
|
1164 | if opts['line_number']: | |
1164 | cols.append(str(l.linenum)) |
|
1165 | cols.append(str(l.linenum)) | |
1165 | if opts['all']: |
|
1166 | if opts['all']: | |
1166 | cols.append(change) |
|
1167 | cols.append(change) | |
1167 | if opts['user']: |
|
1168 | if opts['user']: | |
1168 | cols.append(ui.shortuser(get(r)[1])) |
|
1169 | cols.append(ui.shortuser(get(r)[1])) | |
1169 | if opts['files_with_matches']: |
|
1170 | if opts['files_with_matches']: | |
1170 | c = (fn, r) |
|
1171 | c = (fn, r) | |
1171 | if c in filerevmatches: |
|
1172 | if c in filerevmatches: | |
1172 | continue |
|
1173 | continue | |
1173 | filerevmatches[c] = 1 |
|
1174 | filerevmatches[c] = 1 | |
1174 | else: |
|
1175 | else: | |
1175 | cols.append(l.line) |
|
1176 | cols.append(l.line) | |
1176 | ui.write(sep.join(cols), eol) |
|
1177 | ui.write(sep.join(cols), eol) | |
1177 | found = True |
|
1178 | found = True | |
1178 | return found |
|
1179 | return found | |
1179 |
|
1180 | |||
1180 | fstate = {} |
|
1181 | fstate = {} | |
1181 | skip = {} |
|
1182 | skip = {} | |
1182 | get = util.cachefunc(lambda r: repo.changectx(r).changeset()) |
|
1183 | get = util.cachefunc(lambda r: repo.changectx(r).changeset()) | |
1183 | changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts) |
|
1184 | changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts) | |
1184 | found = False |
|
1185 | found = False | |
1185 | follow = opts.get('follow') |
|
1186 | follow = opts.get('follow') | |
1186 | for st, rev, fns in changeiter: |
|
1187 | for st, rev, fns in changeiter: | |
1187 | if st == 'window': |
|
1188 | if st == 'window': | |
1188 | matches.clear() |
|
1189 | matches.clear() | |
1189 | elif st == 'add': |
|
1190 | elif st == 'add': | |
1190 | mf = repo.changectx(rev).manifest() |
|
1191 | mf = repo.changectx(rev).manifest() | |
1191 | matches[rev] = {} |
|
1192 | matches[rev] = {} | |
1192 | for fn in fns: |
|
1193 | for fn in fns: | |
1193 | if fn in skip: |
|
1194 | if fn in skip: | |
1194 | continue |
|
1195 | continue | |
1195 | try: |
|
1196 | try: | |
1196 | grepbody(fn, rev, getfile(fn).read(mf[fn])) |
|
1197 | grepbody(fn, rev, getfile(fn).read(mf[fn])) | |
1197 | fstate.setdefault(fn, []) |
|
1198 | fstate.setdefault(fn, []) | |
1198 | if follow: |
|
1199 | if follow: | |
1199 | copied = getfile(fn).renamed(mf[fn]) |
|
1200 | copied = getfile(fn).renamed(mf[fn]) | |
1200 | if copied: |
|
1201 | if copied: | |
1201 | copies.setdefault(rev, {})[fn] = copied[0] |
|
1202 | copies.setdefault(rev, {})[fn] = copied[0] | |
1202 | except KeyError: |
|
1203 | except KeyError: | |
1203 | pass |
|
1204 | pass | |
1204 | elif st == 'iter': |
|
1205 | elif st == 'iter': | |
1205 | states = matches[rev].items() |
|
1206 | states = matches[rev].items() | |
1206 | states.sort() |
|
1207 | states.sort() | |
1207 | for fn, m in states: |
|
1208 | for fn, m in states: | |
1208 | copy = copies.get(rev, {}).get(fn) |
|
1209 | copy = copies.get(rev, {}).get(fn) | |
1209 | if fn in skip: |
|
1210 | if fn in skip: | |
1210 | if copy: |
|
1211 | if copy: | |
1211 | skip[copy] = True |
|
1212 | skip[copy] = True | |
1212 | continue |
|
1213 | continue | |
1213 | if fn in prev or fstate[fn]: |
|
1214 | if fn in prev or fstate[fn]: | |
1214 | r = display(fn, rev, m, fstate[fn]) |
|
1215 | r = display(fn, rev, m, fstate[fn]) | |
1215 | found = found or r |
|
1216 | found = found or r | |
1216 | if r and not opts['all']: |
|
1217 | if r and not opts['all']: | |
1217 | skip[fn] = True |
|
1218 | skip[fn] = True | |
1218 | if copy: |
|
1219 | if copy: | |
1219 | skip[copy] = True |
|
1220 | skip[copy] = True | |
1220 | fstate[fn] = m |
|
1221 | fstate[fn] = m | |
1221 | if copy: |
|
1222 | if copy: | |
1222 | fstate[copy] = m |
|
1223 | fstate[copy] = m | |
1223 | prev[fn] = rev |
|
1224 | prev[fn] = rev | |
1224 |
|
1225 | |||
1225 | fstate = fstate.items() |
|
1226 | fstate = fstate.items() | |
1226 | fstate.sort() |
|
1227 | fstate.sort() | |
1227 | for fn, state in fstate: |
|
1228 | for fn, state in fstate: | |
1228 | if fn in skip: |
|
1229 | if fn in skip: | |
1229 | continue |
|
1230 | continue | |
1230 | if fn not in copies.get(prev[fn], {}): |
|
1231 | if fn not in copies.get(prev[fn], {}): | |
1231 | found = display(fn, rev, {}, state) or found |
|
1232 | found = display(fn, rev, {}, state) or found | |
1232 | return (not found and 1) or 0 |
|
1233 | return (not found and 1) or 0 | |
1233 |
|
1234 | |||
1234 | def heads(ui, repo, *branchrevs, **opts): |
|
1235 | def heads(ui, repo, *branchrevs, **opts): | |
1235 | """show current repository heads or show branch heads |
|
1236 | """show current repository heads or show branch heads | |
1236 |
|
1237 | |||
1237 | With no arguments, show all repository head changesets. |
|
1238 | With no arguments, show all repository head changesets. | |
1238 |
|
1239 | |||
1239 | If branch or revisions names are given this will show the heads of |
|
1240 | If branch or revisions names are given this will show the heads of | |
1240 | the specified branches or the branches those revisions are tagged |
|
1241 | the specified branches or the branches those revisions are tagged | |
1241 | with. |
|
1242 | with. | |
1242 |
|
1243 | |||
1243 | Repository "heads" are changesets that don't have child |
|
1244 | Repository "heads" are changesets that don't have child | |
1244 | changesets. They are where development generally takes place and |
|
1245 | changesets. They are where development generally takes place and | |
1245 | are the usual targets for update and merge operations. |
|
1246 | are the usual targets for update and merge operations. | |
1246 |
|
1247 | |||
1247 | Branch heads are changesets that have a given branch tag, but have |
|
1248 | Branch heads are changesets that have a given branch tag, but have | |
1248 | no child changesets with that tag. They are usually where |
|
1249 | no child changesets with that tag. They are usually where | |
1249 | development on the given branch takes place. |
|
1250 | development on the given branch takes place. | |
1250 | """ |
|
1251 | """ | |
1251 | if opts['rev']: |
|
1252 | if opts['rev']: | |
1252 | start = repo.lookup(opts['rev']) |
|
1253 | start = repo.lookup(opts['rev']) | |
1253 | else: |
|
1254 | else: | |
1254 | start = None |
|
1255 | start = None | |
1255 | if not branchrevs: |
|
1256 | if not branchrevs: | |
1256 | # Assume we're looking repo-wide heads if no revs were specified. |
|
1257 | # Assume we're looking repo-wide heads if no revs were specified. | |
1257 | heads = repo.heads(start) |
|
1258 | heads = repo.heads(start) | |
1258 | else: |
|
1259 | else: | |
1259 | heads = [] |
|
1260 | heads = [] | |
1260 | visitedset = util.set() |
|
1261 | visitedset = util.set() | |
1261 | for branchrev in branchrevs: |
|
1262 | for branchrev in branchrevs: | |
1262 | branch = repo.changectx(branchrev).branch() |
|
1263 | branch = repo.changectx(branchrev).branch() | |
1263 | if branch in visitedset: |
|
1264 | if branch in visitedset: | |
1264 | continue |
|
1265 | continue | |
1265 | visitedset.add(branch) |
|
1266 | visitedset.add(branch) | |
1266 | bheads = repo.branchheads(branch, start) |
|
1267 | bheads = repo.branchheads(branch, start) | |
1267 | if not bheads: |
|
1268 | if not bheads: | |
1268 | if branch != branchrev: |
|
1269 | if branch != branchrev: | |
1269 | ui.warn(_("no changes on branch %s containing %s are " |
|
1270 | ui.warn(_("no changes on branch %s containing %s are " | |
1270 | "reachable from %s\n") |
|
1271 | "reachable from %s\n") | |
1271 | % (branch, branchrev, opts['rev'])) |
|
1272 | % (branch, branchrev, opts['rev'])) | |
1272 | else: |
|
1273 | else: | |
1273 | ui.warn(_("no changes on branch %s are reachable from %s\n") |
|
1274 | ui.warn(_("no changes on branch %s are reachable from %s\n") | |
1274 | % (branch, opts['rev'])) |
|
1275 | % (branch, opts['rev'])) | |
1275 | heads.extend(bheads) |
|
1276 | heads.extend(bheads) | |
1276 | if not heads: |
|
1277 | if not heads: | |
1277 | return 1 |
|
1278 | return 1 | |
1278 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
1279 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
1279 | for n in heads: |
|
1280 | for n in heads: | |
1280 | displayer.show(changenode=n) |
|
1281 | displayer.show(changenode=n) | |
1281 |
|
1282 | |||
1282 | def help_(ui, name=None, with_version=False): |
|
1283 | def help_(ui, name=None, with_version=False): | |
1283 | """show help for a command, extension, or list of commands |
|
1284 | """show help for a command, extension, or list of commands | |
1284 |
|
1285 | |||
1285 | With no arguments, print a list of commands and short help. |
|
1286 | With no arguments, print a list of commands and short help. | |
1286 |
|
1287 | |||
1287 | Given a command name, print help for that command. |
|
1288 | Given a command name, print help for that command. | |
1288 |
|
1289 | |||
1289 | Given an extension name, print help for that extension, and the |
|
1290 | Given an extension name, print help for that extension, and the | |
1290 | commands it provides.""" |
|
1291 | commands it provides.""" | |
1291 | option_lists = [] |
|
1292 | option_lists = [] | |
1292 |
|
1293 | |||
1293 | def addglobalopts(aliases): |
|
1294 | def addglobalopts(aliases): | |
1294 | if ui.verbose: |
|
1295 | if ui.verbose: | |
1295 | option_lists.append((_("global options:"), globalopts)) |
|
1296 | option_lists.append((_("global options:"), globalopts)) | |
1296 | if name == 'shortlist': |
|
1297 | if name == 'shortlist': | |
1297 | option_lists.append((_('use "hg help" for the full list ' |
|
1298 | option_lists.append((_('use "hg help" for the full list ' | |
1298 | 'of commands'), ())) |
|
1299 | 'of commands'), ())) | |
1299 | else: |
|
1300 | else: | |
1300 | if name == 'shortlist': |
|
1301 | if name == 'shortlist': | |
1301 | msg = _('use "hg help" for the full list of commands ' |
|
1302 | msg = _('use "hg help" for the full list of commands ' | |
1302 | 'or "hg -v" for details') |
|
1303 | 'or "hg -v" for details') | |
1303 | elif aliases: |
|
1304 | elif aliases: | |
1304 | msg = _('use "hg -v help%s" to show aliases and ' |
|
1305 | msg = _('use "hg -v help%s" to show aliases and ' | |
1305 | 'global options') % (name and " " + name or "") |
|
1306 | 'global options') % (name and " " + name or "") | |
1306 | else: |
|
1307 | else: | |
1307 | msg = _('use "hg -v help %s" to show global options') % name |
|
1308 | msg = _('use "hg -v help %s" to show global options') % name | |
1308 | option_lists.append((msg, ())) |
|
1309 | option_lists.append((msg, ())) | |
1309 |
|
1310 | |||
1310 | def helpcmd(name): |
|
1311 | def helpcmd(name): | |
1311 | if with_version: |
|
1312 | if with_version: | |
1312 | version_(ui) |
|
1313 | version_(ui) | |
1313 | ui.write('\n') |
|
1314 | ui.write('\n') | |
1314 | aliases, i = cmdutil.findcmd(ui, name, table) |
|
1315 | aliases, i = cmdutil.findcmd(ui, name, table) | |
1315 | # synopsis |
|
1316 | # synopsis | |
1316 | ui.write("%s\n\n" % i[2]) |
|
1317 | ui.write("%s\n\n" % i[2]) | |
1317 |
|
1318 | |||
1318 | # description |
|
1319 | # description | |
1319 | doc = i[0].__doc__ |
|
1320 | doc = i[0].__doc__ | |
1320 | if not doc: |
|
1321 | if not doc: | |
1321 | doc = _("(No help text available)") |
|
1322 | doc = _("(No help text available)") | |
1322 | if ui.quiet: |
|
1323 | if ui.quiet: | |
1323 | doc = doc.splitlines(0)[0] |
|
1324 | doc = doc.splitlines(0)[0] | |
1324 | ui.write("%s\n" % doc.rstrip()) |
|
1325 | ui.write("%s\n" % doc.rstrip()) | |
1325 |
|
1326 | |||
1326 | if not ui.quiet: |
|
1327 | if not ui.quiet: | |
1327 | # aliases |
|
1328 | # aliases | |
1328 | if len(aliases) > 1: |
|
1329 | if len(aliases) > 1: | |
1329 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) |
|
1330 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) | |
1330 |
|
1331 | |||
1331 | # options |
|
1332 | # options | |
1332 | if i[1]: |
|
1333 | if i[1]: | |
1333 | option_lists.append((_("options:\n"), i[1])) |
|
1334 | option_lists.append((_("options:\n"), i[1])) | |
1334 |
|
1335 | |||
1335 | addglobalopts(False) |
|
1336 | addglobalopts(False) | |
1336 |
|
1337 | |||
1337 | def helplist(header, select=None): |
|
1338 | def helplist(header, select=None): | |
1338 | h = {} |
|
1339 | h = {} | |
1339 | cmds = {} |
|
1340 | cmds = {} | |
1340 | for c, e in table.items(): |
|
1341 | for c, e in table.items(): | |
1341 | f = c.split("|", 1)[0] |
|
1342 | f = c.split("|", 1)[0] | |
1342 | if select and not select(f): |
|
1343 | if select and not select(f): | |
1343 | continue |
|
1344 | continue | |
1344 | if name == "shortlist" and not f.startswith("^"): |
|
1345 | if name == "shortlist" and not f.startswith("^"): | |
1345 | continue |
|
1346 | continue | |
1346 | f = f.lstrip("^") |
|
1347 | f = f.lstrip("^") | |
1347 | if not ui.debugflag and f.startswith("debug"): |
|
1348 | if not ui.debugflag and f.startswith("debug"): | |
1348 | continue |
|
1349 | continue | |
1349 | doc = e[0].__doc__ |
|
1350 | doc = e[0].__doc__ | |
1350 | if not doc: |
|
1351 | if not doc: | |
1351 | doc = _("(No help text available)") |
|
1352 | doc = _("(No help text available)") | |
1352 | h[f] = doc.splitlines(0)[0].rstrip() |
|
1353 | h[f] = doc.splitlines(0)[0].rstrip() | |
1353 | cmds[f] = c.lstrip("^") |
|
1354 | cmds[f] = c.lstrip("^") | |
1354 |
|
1355 | |||
1355 | if not h: |
|
1356 | if not h: | |
1356 | ui.status(_('no commands defined\n')) |
|
1357 | ui.status(_('no commands defined\n')) | |
1357 | return |
|
1358 | return | |
1358 |
|
1359 | |||
1359 | ui.status(header) |
|
1360 | ui.status(header) | |
1360 | fns = h.keys() |
|
1361 | fns = h.keys() | |
1361 | fns.sort() |
|
1362 | fns.sort() | |
1362 | m = max(map(len, fns)) |
|
1363 | m = max(map(len, fns)) | |
1363 | for f in fns: |
|
1364 | for f in fns: | |
1364 | if ui.verbose: |
|
1365 | if ui.verbose: | |
1365 | commands = cmds[f].replace("|",", ") |
|
1366 | commands = cmds[f].replace("|",", ") | |
1366 | ui.write(" %s:\n %s\n"%(commands, h[f])) |
|
1367 | ui.write(" %s:\n %s\n"%(commands, h[f])) | |
1367 | else: |
|
1368 | else: | |
1368 | ui.write(' %-*s %s\n' % (m, f, h[f])) |
|
1369 | ui.write(' %-*s %s\n' % (m, f, h[f])) | |
1369 |
|
1370 | |||
1370 | if not ui.quiet: |
|
1371 | if not ui.quiet: | |
1371 | addglobalopts(True) |
|
1372 | addglobalopts(True) | |
1372 |
|
1373 | |||
1373 | def helptopic(name): |
|
1374 | def helptopic(name): | |
1374 | v = None |
|
1375 | v = None | |
1375 | for i in help.helptable: |
|
1376 | for i in help.helptable: | |
1376 | l = i.split('|') |
|
1377 | l = i.split('|') | |
1377 | if name in l: |
|
1378 | if name in l: | |
1378 | v = i |
|
1379 | v = i | |
1379 | header = l[-1] |
|
1380 | header = l[-1] | |
1380 | if not v: |
|
1381 | if not v: | |
1381 | raise cmdutil.UnknownCommand(name) |
|
1382 | raise cmdutil.UnknownCommand(name) | |
1382 |
|
1383 | |||
1383 | # description |
|
1384 | # description | |
1384 | doc = help.helptable[v] |
|
1385 | doc = help.helptable[v] | |
1385 | if not doc: |
|
1386 | if not doc: | |
1386 | doc = _("(No help text available)") |
|
1387 | doc = _("(No help text available)") | |
1387 | if callable(doc): |
|
1388 | if callable(doc): | |
1388 | doc = doc() |
|
1389 | doc = doc() | |
1389 |
|
1390 | |||
1390 | ui.write("%s\n" % header) |
|
1391 | ui.write("%s\n" % header) | |
1391 | ui.write("%s\n" % doc.rstrip()) |
|
1392 | ui.write("%s\n" % doc.rstrip()) | |
1392 |
|
1393 | |||
1393 | def helpext(name): |
|
1394 | def helpext(name): | |
1394 | try: |
|
1395 | try: | |
1395 | mod = extensions.find(name) |
|
1396 | mod = extensions.find(name) | |
1396 | except KeyError: |
|
1397 | except KeyError: | |
1397 | raise cmdutil.UnknownCommand(name) |
|
1398 | raise cmdutil.UnknownCommand(name) | |
1398 |
|
1399 | |||
1399 | doc = (mod.__doc__ or _('No help text available')).splitlines(0) |
|
1400 | doc = (mod.__doc__ or _('No help text available')).splitlines(0) | |
1400 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) |
|
1401 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) | |
1401 | for d in doc[1:]: |
|
1402 | for d in doc[1:]: | |
1402 | ui.write(d, '\n') |
|
1403 | ui.write(d, '\n') | |
1403 |
|
1404 | |||
1404 | ui.status('\n') |
|
1405 | ui.status('\n') | |
1405 |
|
1406 | |||
1406 | try: |
|
1407 | try: | |
1407 | ct = mod.cmdtable |
|
1408 | ct = mod.cmdtable | |
1408 | except AttributeError: |
|
1409 | except AttributeError: | |
1409 | ct = {} |
|
1410 | ct = {} | |
1410 |
|
1411 | |||
1411 | modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct]) |
|
1412 | modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct]) | |
1412 | helplist(_('list of commands:\n\n'), modcmds.has_key) |
|
1413 | helplist(_('list of commands:\n\n'), modcmds.has_key) | |
1413 |
|
1414 | |||
1414 | if name and name != 'shortlist': |
|
1415 | if name and name != 'shortlist': | |
1415 | i = None |
|
1416 | i = None | |
1416 | for f in (helpcmd, helptopic, helpext): |
|
1417 | for f in (helpcmd, helptopic, helpext): | |
1417 | try: |
|
1418 | try: | |
1418 | f(name) |
|
1419 | f(name) | |
1419 | i = None |
|
1420 | i = None | |
1420 | break |
|
1421 | break | |
1421 | except cmdutil.UnknownCommand, inst: |
|
1422 | except cmdutil.UnknownCommand, inst: | |
1422 | i = inst |
|
1423 | i = inst | |
1423 | if i: |
|
1424 | if i: | |
1424 | raise i |
|
1425 | raise i | |
1425 |
|
1426 | |||
1426 | else: |
|
1427 | else: | |
1427 | # program name |
|
1428 | # program name | |
1428 | if ui.verbose or with_version: |
|
1429 | if ui.verbose or with_version: | |
1429 | version_(ui) |
|
1430 | version_(ui) | |
1430 | else: |
|
1431 | else: | |
1431 | ui.status(_("Mercurial Distributed SCM\n")) |
|
1432 | ui.status(_("Mercurial Distributed SCM\n")) | |
1432 | ui.status('\n') |
|
1433 | ui.status('\n') | |
1433 |
|
1434 | |||
1434 | # list of commands |
|
1435 | # list of commands | |
1435 | if name == "shortlist": |
|
1436 | if name == "shortlist": | |
1436 | header = _('basic commands:\n\n') |
|
1437 | header = _('basic commands:\n\n') | |
1437 | else: |
|
1438 | else: | |
1438 | header = _('list of commands:\n\n') |
|
1439 | header = _('list of commands:\n\n') | |
1439 |
|
1440 | |||
1440 | helplist(header) |
|
1441 | helplist(header) | |
1441 |
|
1442 | |||
1442 | # list all option lists |
|
1443 | # list all option lists | |
1443 | opt_output = [] |
|
1444 | opt_output = [] | |
1444 | for title, options in option_lists: |
|
1445 | for title, options in option_lists: | |
1445 | opt_output.append(("\n%s" % title, None)) |
|
1446 | opt_output.append(("\n%s" % title, None)) | |
1446 | for shortopt, longopt, default, desc in options: |
|
1447 | for shortopt, longopt, default, desc in options: | |
1447 | if "DEPRECATED" in desc and not ui.verbose: continue |
|
1448 | if "DEPRECATED" in desc and not ui.verbose: continue | |
1448 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, |
|
1449 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, | |
1449 | longopt and " --%s" % longopt), |
|
1450 | longopt and " --%s" % longopt), | |
1450 | "%s%s" % (desc, |
|
1451 | "%s%s" % (desc, | |
1451 | default |
|
1452 | default | |
1452 | and _(" (default: %s)") % default |
|
1453 | and _(" (default: %s)") % default | |
1453 | or ""))) |
|
1454 | or ""))) | |
1454 |
|
1455 | |||
1455 | if opt_output: |
|
1456 | if opt_output: | |
1456 | opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0]) |
|
1457 | opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0]) | |
1457 | for first, second in opt_output: |
|
1458 | for first, second in opt_output: | |
1458 | if second: |
|
1459 | if second: | |
1459 | ui.write(" %-*s %s\n" % (opts_len, first, second)) |
|
1460 | ui.write(" %-*s %s\n" % (opts_len, first, second)) | |
1460 | else: |
|
1461 | else: | |
1461 | ui.write("%s\n" % first) |
|
1462 | ui.write("%s\n" % first) | |
1462 |
|
1463 | |||
1463 | def identify(ui, repo, source=None, |
|
1464 | def identify(ui, repo, source=None, | |
1464 | rev=None, num=None, id=None, branch=None, tags=None): |
|
1465 | rev=None, num=None, id=None, branch=None, tags=None): | |
1465 | """identify the working copy or specified revision |
|
1466 | """identify the working copy or specified revision | |
1466 |
|
1467 | |||
1467 | With no revision, print a summary of the current state of the repo. |
|
1468 | With no revision, print a summary of the current state of the repo. | |
1468 |
|
1469 | |||
1469 | With a path, do a lookup in another repository. |
|
1470 | With a path, do a lookup in another repository. | |
1470 |
|
1471 | |||
1471 | This summary identifies the repository state using one or two parent |
|
1472 | This summary identifies the repository state using one or two parent | |
1472 | hash identifiers, followed by a "+" if there are uncommitted changes |
|
1473 | hash identifiers, followed by a "+" if there are uncommitted changes | |
1473 | in the working directory, a list of tags for this revision and a branch |
|
1474 | in the working directory, a list of tags for this revision and a branch | |
1474 | name for non-default branches. |
|
1475 | name for non-default branches. | |
1475 | """ |
|
1476 | """ | |
1476 |
|
1477 | |||
1477 | if not repo and not source: |
|
1478 | if not repo and not source: | |
1478 | raise util.Abort(_("There is no Mercurial repository here " |
|
1479 | raise util.Abort(_("There is no Mercurial repository here " | |
1479 | "(.hg not found)")) |
|
1480 | "(.hg not found)")) | |
1480 |
|
1481 | |||
1481 | hexfunc = ui.debugflag and hex or short |
|
1482 | hexfunc = ui.debugflag and hex or short | |
1482 | default = not (num or id or branch or tags) |
|
1483 | default = not (num or id or branch or tags) | |
1483 | output = [] |
|
1484 | output = [] | |
1484 |
|
1485 | |||
1485 | if source: |
|
1486 | if source: | |
1486 | source, revs, checkout = hg.parseurl(ui.expandpath(source), []) |
|
1487 | source, revs, checkout = hg.parseurl(ui.expandpath(source), []) | |
1487 | srepo = hg.repository(ui, source) |
|
1488 | srepo = hg.repository(ui, source) | |
1488 | if not rev and revs: |
|
1489 | if not rev and revs: | |
1489 | rev = revs[0] |
|
1490 | rev = revs[0] | |
1490 | if not rev: |
|
1491 | if not rev: | |
1491 | rev = "tip" |
|
1492 | rev = "tip" | |
1492 | if num or branch or tags: |
|
1493 | if num or branch or tags: | |
1493 | raise util.Abort( |
|
1494 | raise util.Abort( | |
1494 | "can't query remote revision number, branch, or tags") |
|
1495 | "can't query remote revision number, branch, or tags") | |
1495 | output = [hexfunc(srepo.lookup(rev))] |
|
1496 | output = [hexfunc(srepo.lookup(rev))] | |
1496 | elif not rev: |
|
1497 | elif not rev: | |
1497 | ctx = repo.workingctx() |
|
1498 | ctx = repo.workingctx() | |
1498 | parents = ctx.parents() |
|
1499 | parents = ctx.parents() | |
1499 | changed = False |
|
1500 | changed = False | |
1500 | if default or id or num: |
|
1501 | if default or id or num: | |
1501 | changed = ctx.files() + ctx.deleted() |
|
1502 | changed = ctx.files() + ctx.deleted() | |
1502 | if default or id: |
|
1503 | if default or id: | |
1503 | output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]), |
|
1504 | output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]), | |
1504 | (changed) and "+" or "")] |
|
1505 | (changed) and "+" or "")] | |
1505 | if num: |
|
1506 | if num: | |
1506 | output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]), |
|
1507 | output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]), | |
1507 | (changed) and "+" or "")) |
|
1508 | (changed) and "+" or "")) | |
1508 | else: |
|
1509 | else: | |
1509 | ctx = repo.changectx(rev) |
|
1510 | ctx = repo.changectx(rev) | |
1510 | if default or id: |
|
1511 | if default or id: | |
1511 | output = [hexfunc(ctx.node())] |
|
1512 | output = [hexfunc(ctx.node())] | |
1512 | if num: |
|
1513 | if num: | |
1513 | output.append(str(ctx.rev())) |
|
1514 | output.append(str(ctx.rev())) | |
1514 |
|
1515 | |||
1515 | if not source and default and not ui.quiet: |
|
1516 | if not source and default and not ui.quiet: | |
1516 | b = util.tolocal(ctx.branch()) |
|
1517 | b = util.tolocal(ctx.branch()) | |
1517 | if b != 'default': |
|
1518 | if b != 'default': | |
1518 | output.append("(%s)" % b) |
|
1519 | output.append("(%s)" % b) | |
1519 |
|
1520 | |||
1520 | # multiple tags for a single parent separated by '/' |
|
1521 | # multiple tags for a single parent separated by '/' | |
1521 | t = "/".join(ctx.tags()) |
|
1522 | t = "/".join(ctx.tags()) | |
1522 | if t: |
|
1523 | if t: | |
1523 | output.append(t) |
|
1524 | output.append(t) | |
1524 |
|
1525 | |||
1525 | if branch: |
|
1526 | if branch: | |
1526 | output.append(util.tolocal(ctx.branch())) |
|
1527 | output.append(util.tolocal(ctx.branch())) | |
1527 |
|
1528 | |||
1528 | if tags: |
|
1529 | if tags: | |
1529 | output.extend(ctx.tags()) |
|
1530 | output.extend(ctx.tags()) | |
1530 |
|
1531 | |||
1531 | ui.write("%s\n" % ' '.join(output)) |
|
1532 | ui.write("%s\n" % ' '.join(output)) | |
1532 |
|
1533 | |||
1533 | def import_(ui, repo, patch1, *patches, **opts): |
|
1534 | def import_(ui, repo, patch1, *patches, **opts): | |
1534 | """import an ordered set of patches |
|
1535 | """import an ordered set of patches | |
1535 |
|
1536 | |||
1536 | Import a list of patches and commit them individually. |
|
1537 | Import a list of patches and commit them individually. | |
1537 |
|
1538 | |||
1538 | If there are outstanding changes in the working directory, import |
|
1539 | If there are outstanding changes in the working directory, import | |
1539 | will abort unless given the -f flag. |
|
1540 | will abort unless given the -f flag. | |
1540 |
|
1541 | |||
1541 | You can import a patch straight from a mail message. Even patches |
|
1542 | You can import a patch straight from a mail message. Even patches | |
1542 | as attachments work (body part must be type text/plain or |
|
1543 | as attachments work (body part must be type text/plain or | |
1543 | text/x-patch to be used). From and Subject headers of email |
|
1544 | text/x-patch to be used). From and Subject headers of email | |
1544 | message are used as default committer and commit message. All |
|
1545 | message are used as default committer and commit message. All | |
1545 | text/plain body parts before first diff are added to commit |
|
1546 | text/plain body parts before first diff are added to commit | |
1546 | message. |
|
1547 | message. | |
1547 |
|
1548 | |||
1548 | If the imported patch was generated by hg export, user and description |
|
1549 | If the imported patch was generated by hg export, user and description | |
1549 | from patch override values from message headers and body. Values |
|
1550 | from patch override values from message headers and body. Values | |
1550 | given on command line with -m and -u override these. |
|
1551 | given on command line with -m and -u override these. | |
1551 |
|
1552 | |||
1552 | If --exact is specified, import will set the working directory |
|
1553 | If --exact is specified, import will set the working directory | |
1553 | to the parent of each patch before applying it, and will abort |
|
1554 | to the parent of each patch before applying it, and will abort | |
1554 | if the resulting changeset has a different ID than the one |
|
1555 | if the resulting changeset has a different ID than the one | |
1555 | recorded in the patch. This may happen due to character set |
|
1556 | recorded in the patch. This may happen due to character set | |
1556 | problems or other deficiencies in the text patch format. |
|
1557 | problems or other deficiencies in the text patch format. | |
1557 |
|
1558 | |||
1558 | To read a patch from standard input, use patch name "-". |
|
1559 | To read a patch from standard input, use patch name "-". | |
1559 | """ |
|
1560 | """ | |
1560 | patches = (patch1,) + patches |
|
1561 | patches = (patch1,) + patches | |
1561 |
|
1562 | |||
1562 | if opts.get('exact') or not opts['force']: |
|
1563 | if opts.get('exact') or not opts['force']: | |
1563 | cmdutil.bail_if_changed(repo) |
|
1564 | cmdutil.bail_if_changed(repo) | |
1564 |
|
1565 | |||
1565 | d = opts["base"] |
|
1566 | d = opts["base"] | |
1566 | strip = opts["strip"] |
|
1567 | strip = opts["strip"] | |
1567 | wlock = lock = None |
|
1568 | wlock = lock = None | |
1568 | try: |
|
1569 | try: | |
1569 | wlock = repo.wlock() |
|
1570 | wlock = repo.wlock() | |
1570 | lock = repo.lock() |
|
1571 | lock = repo.lock() | |
1571 | for p in patches: |
|
1572 | for p in patches: | |
1572 | pf = os.path.join(d, p) |
|
1573 | pf = os.path.join(d, p) | |
1573 |
|
1574 | |||
1574 | if pf == '-': |
|
1575 | if pf == '-': | |
1575 | ui.status(_("applying patch from stdin\n")) |
|
1576 | ui.status(_("applying patch from stdin\n")) | |
1576 | data = patch.extract(ui, sys.stdin) |
|
1577 | data = patch.extract(ui, sys.stdin) | |
1577 | else: |
|
1578 | else: | |
1578 | ui.status(_("applying %s\n") % p) |
|
1579 | ui.status(_("applying %s\n") % p) | |
1579 | if os.path.exists(pf): |
|
1580 | if os.path.exists(pf): | |
1580 | data = patch.extract(ui, file(pf, 'rb')) |
|
1581 | data = patch.extract(ui, file(pf, 'rb')) | |
1581 | else: |
|
1582 | else: | |
1582 | data = patch.extract(ui, urllib.urlopen(pf)) |
|
1583 | data = patch.extract(ui, urllib.urlopen(pf)) | |
1583 | tmpname, message, user, date, branch, nodeid, p1, p2 = data |
|
1584 | tmpname, message, user, date, branch, nodeid, p1, p2 = data | |
1584 |
|
1585 | |||
1585 | if tmpname is None: |
|
1586 | if tmpname is None: | |
1586 | raise util.Abort(_('no diffs found')) |
|
1587 | raise util.Abort(_('no diffs found')) | |
1587 |
|
1588 | |||
1588 | try: |
|
1589 | try: | |
1589 | cmdline_message = cmdutil.logmessage(opts) |
|
1590 | cmdline_message = cmdutil.logmessage(opts) | |
1590 | if cmdline_message: |
|
1591 | if cmdline_message: | |
1591 | # pickup the cmdline msg |
|
1592 | # pickup the cmdline msg | |
1592 | message = cmdline_message |
|
1593 | message = cmdline_message | |
1593 | elif message: |
|
1594 | elif message: | |
1594 | # pickup the patch msg |
|
1595 | # pickup the patch msg | |
1595 | message = message.strip() |
|
1596 | message = message.strip() | |
1596 | else: |
|
1597 | else: | |
1597 | # launch the editor |
|
1598 | # launch the editor | |
1598 | message = None |
|
1599 | message = None | |
1599 | ui.debug(_('message:\n%s\n') % message) |
|
1600 | ui.debug(_('message:\n%s\n') % message) | |
1600 |
|
1601 | |||
1601 | wp = repo.workingctx().parents() |
|
1602 | wp = repo.workingctx().parents() | |
1602 | if opts.get('exact'): |
|
1603 | if opts.get('exact'): | |
1603 | if not nodeid or not p1: |
|
1604 | if not nodeid or not p1: | |
1604 | raise util.Abort(_('not a mercurial patch')) |
|
1605 | raise util.Abort(_('not a mercurial patch')) | |
1605 | p1 = repo.lookup(p1) |
|
1606 | p1 = repo.lookup(p1) | |
1606 | p2 = repo.lookup(p2 or hex(nullid)) |
|
1607 | p2 = repo.lookup(p2 or hex(nullid)) | |
1607 |
|
1608 | |||
1608 | if p1 != wp[0].node(): |
|
1609 | if p1 != wp[0].node(): | |
1609 | hg.clean(repo, p1) |
|
1610 | hg.clean(repo, p1) | |
1610 | repo.dirstate.setparents(p1, p2) |
|
1611 | repo.dirstate.setparents(p1, p2) | |
1611 | elif p2: |
|
1612 | elif p2: | |
1612 | try: |
|
1613 | try: | |
1613 | p1 = repo.lookup(p1) |
|
1614 | p1 = repo.lookup(p1) | |
1614 | p2 = repo.lookup(p2) |
|
1615 | p2 = repo.lookup(p2) | |
1615 | if p1 == wp[0].node(): |
|
1616 | if p1 == wp[0].node(): | |
1616 | repo.dirstate.setparents(p1, p2) |
|
1617 | repo.dirstate.setparents(p1, p2) | |
1617 | except hg.RepoError: |
|
1618 | except hg.RepoError: | |
1618 | pass |
|
1619 | pass | |
1619 | if opts.get('exact') or opts.get('import_branch'): |
|
1620 | if opts.get('exact') or opts.get('import_branch'): | |
1620 | repo.dirstate.setbranch(branch or 'default') |
|
1621 | repo.dirstate.setbranch(branch or 'default') | |
1621 |
|
1622 | |||
1622 | files = {} |
|
1623 | files = {} | |
1623 | try: |
|
1624 | try: | |
1624 | fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
|
1625 | fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, | |
1625 | files=files) |
|
1626 | files=files) | |
1626 | finally: |
|
1627 | finally: | |
1627 | files = patch.updatedir(ui, repo, files) |
|
1628 | files = patch.updatedir(ui, repo, files) | |
1628 | n = repo.commit(files, message, user, date) |
|
1629 | n = repo.commit(files, message, user, date) | |
1629 | if opts.get('exact'): |
|
1630 | if opts.get('exact'): | |
1630 | if hex(n) != nodeid: |
|
1631 | if hex(n) != nodeid: | |
1631 | repo.rollback() |
|
1632 | repo.rollback() | |
1632 | raise util.Abort(_('patch is damaged' + |
|
1633 | raise util.Abort(_('patch is damaged' + | |
1633 | ' or loses information')) |
|
1634 | ' or loses information')) | |
1634 | finally: |
|
1635 | finally: | |
1635 | os.unlink(tmpname) |
|
1636 | os.unlink(tmpname) | |
1636 | finally: |
|
1637 | finally: | |
1637 | del lock, wlock |
|
1638 | del lock, wlock | |
1638 |
|
1639 | |||
1639 | def incoming(ui, repo, source="default", **opts): |
|
1640 | def incoming(ui, repo, source="default", **opts): | |
1640 | """show new changesets found in source |
|
1641 | """show new changesets found in source | |
1641 |
|
1642 | |||
1642 | Show new changesets found in the specified path/URL or the default |
|
1643 | Show new changesets found in the specified path/URL or the default | |
1643 | pull location. These are the changesets that would be pulled if a pull |
|
1644 | pull location. These are the changesets that would be pulled if a pull | |
1644 | was requested. |
|
1645 | was requested. | |
1645 |
|
1646 | |||
1646 | For remote repository, using --bundle avoids downloading the changesets |
|
1647 | For remote repository, using --bundle avoids downloading the changesets | |
1647 | twice if the incoming is followed by a pull. |
|
1648 | twice if the incoming is followed by a pull. | |
1648 |
|
1649 | |||
1649 | See pull for valid source format details. |
|
1650 | See pull for valid source format details. | |
1650 | """ |
|
1651 | """ | |
1651 | source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev']) |
|
1652 | source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev']) | |
1652 | cmdutil.setremoteconfig(ui, opts) |
|
1653 | cmdutil.setremoteconfig(ui, opts) | |
1653 |
|
1654 | |||
1654 | other = hg.repository(ui, source) |
|
1655 | other = hg.repository(ui, source) | |
1655 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
1656 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
1656 | if revs: |
|
1657 | if revs: | |
1657 | revs = [other.lookup(rev) for rev in revs] |
|
1658 | revs = [other.lookup(rev) for rev in revs] | |
1658 | incoming = repo.findincoming(other, heads=revs, force=opts["force"]) |
|
1659 | incoming = repo.findincoming(other, heads=revs, force=opts["force"]) | |
1659 | if not incoming: |
|
1660 | if not incoming: | |
1660 | try: |
|
1661 | try: | |
1661 | os.unlink(opts["bundle"]) |
|
1662 | os.unlink(opts["bundle"]) | |
1662 | except: |
|
1663 | except: | |
1663 | pass |
|
1664 | pass | |
1664 | ui.status(_("no changes found\n")) |
|
1665 | ui.status(_("no changes found\n")) | |
1665 | return 1 |
|
1666 | return 1 | |
1666 |
|
1667 | |||
1667 | cleanup = None |
|
1668 | cleanup = None | |
1668 | try: |
|
1669 | try: | |
1669 | fname = opts["bundle"] |
|
1670 | fname = opts["bundle"] | |
1670 | if fname or not other.local(): |
|
1671 | if fname or not other.local(): | |
1671 | # create a bundle (uncompressed if other repo is not local) |
|
1672 | # create a bundle (uncompressed if other repo is not local) | |
1672 | if revs is None: |
|
1673 | if revs is None: | |
1673 | cg = other.changegroup(incoming, "incoming") |
|
1674 | cg = other.changegroup(incoming, "incoming") | |
1674 | else: |
|
1675 | else: | |
1675 | cg = other.changegroupsubset(incoming, revs, 'incoming') |
|
1676 | cg = other.changegroupsubset(incoming, revs, 'incoming') | |
1676 | bundletype = other.local() and "HG10BZ" or "HG10UN" |
|
1677 | bundletype = other.local() and "HG10BZ" or "HG10UN" | |
1677 | fname = cleanup = changegroup.writebundle(cg, fname, bundletype) |
|
1678 | fname = cleanup = changegroup.writebundle(cg, fname, bundletype) | |
1678 | # keep written bundle? |
|
1679 | # keep written bundle? | |
1679 | if opts["bundle"]: |
|
1680 | if opts["bundle"]: | |
1680 | cleanup = None |
|
1681 | cleanup = None | |
1681 | if not other.local(): |
|
1682 | if not other.local(): | |
1682 | # use the created uncompressed bundlerepo |
|
1683 | # use the created uncompressed bundlerepo | |
1683 | other = bundlerepo.bundlerepository(ui, repo.root, fname) |
|
1684 | other = bundlerepo.bundlerepository(ui, repo.root, fname) | |
1684 |
|
1685 | |||
1685 | o = other.changelog.nodesbetween(incoming, revs)[0] |
|
1686 | o = other.changelog.nodesbetween(incoming, revs)[0] | |
1686 | if opts['newest_first']: |
|
1687 | if opts['newest_first']: | |
1687 | o.reverse() |
|
1688 | o.reverse() | |
1688 | displayer = cmdutil.show_changeset(ui, other, opts) |
|
1689 | displayer = cmdutil.show_changeset(ui, other, opts) | |
1689 | for n in o: |
|
1690 | for n in o: | |
1690 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
1691 | parents = [p for p in other.changelog.parents(n) if p != nullid] | |
1691 | if opts['no_merges'] and len(parents) == 2: |
|
1692 | if opts['no_merges'] and len(parents) == 2: | |
1692 | continue |
|
1693 | continue | |
1693 | displayer.show(changenode=n) |
|
1694 | displayer.show(changenode=n) | |
1694 | finally: |
|
1695 | finally: | |
1695 | if hasattr(other, 'close'): |
|
1696 | if hasattr(other, 'close'): | |
1696 | other.close() |
|
1697 | other.close() | |
1697 | if cleanup: |
|
1698 | if cleanup: | |
1698 | os.unlink(cleanup) |
|
1699 | os.unlink(cleanup) | |
1699 |
|
1700 | |||
1700 | def init(ui, dest=".", **opts): |
|
1701 | def init(ui, dest=".", **opts): | |
1701 | """create a new repository in the given directory |
|
1702 | """create a new repository in the given directory | |
1702 |
|
1703 | |||
1703 | Initialize a new repository in the given directory. If the given |
|
1704 | Initialize a new repository in the given directory. If the given | |
1704 | directory does not exist, it is created. |
|
1705 | directory does not exist, it is created. | |
1705 |
|
1706 | |||
1706 | If no directory is given, the current directory is used. |
|
1707 | If no directory is given, the current directory is used. | |
1707 |
|
1708 | |||
1708 | It is possible to specify an ssh:// URL as the destination. |
|
1709 | It is possible to specify an ssh:// URL as the destination. | |
1709 | Look at the help text for the pull command for important details |
|
1710 | Look at the help text for the pull command for important details | |
1710 | about ssh:// URLs. |
|
1711 | about ssh:// URLs. | |
1711 | """ |
|
1712 | """ | |
1712 | cmdutil.setremoteconfig(ui, opts) |
|
1713 | cmdutil.setremoteconfig(ui, opts) | |
1713 | hg.repository(ui, dest, create=1) |
|
1714 | hg.repository(ui, dest, create=1) | |
1714 |
|
1715 | |||
1715 | def locate(ui, repo, *pats, **opts): |
|
1716 | def locate(ui, repo, *pats, **opts): | |
1716 | """locate files matching specific patterns |
|
1717 | """locate files matching specific patterns | |
1717 |
|
1718 | |||
1718 | Print all files under Mercurial control whose names match the |
|
1719 | Print all files under Mercurial control whose names match the | |
1719 | given patterns. |
|
1720 | given patterns. | |
1720 |
|
1721 | |||
1721 | This command searches the entire repository by default. To search |
|
1722 | This command searches the entire repository by default. To search | |
1722 | just the current directory and its subdirectories, use |
|
1723 | just the current directory and its subdirectories, use | |
1723 | "--include .". |
|
1724 | "--include .". | |
1724 |
|
1725 | |||
1725 | If no patterns are given to match, this command prints all file |
|
1726 | If no patterns are given to match, this command prints all file | |
1726 | names. |
|
1727 | names. | |
1727 |
|
1728 | |||
1728 | If you want to feed the output of this command into the "xargs" |
|
1729 | If you want to feed the output of this command into the "xargs" | |
1729 | command, use the "-0" option to both this command and "xargs". |
|
1730 | command, use the "-0" option to both this command and "xargs". | |
1730 | This will avoid the problem of "xargs" treating single filenames |
|
1731 | This will avoid the problem of "xargs" treating single filenames | |
1731 | that contain white space as multiple filenames. |
|
1732 | that contain white space as multiple filenames. | |
1732 | """ |
|
1733 | """ | |
1733 | end = opts['print0'] and '\0' or '\n' |
|
1734 | end = opts['print0'] and '\0' or '\n' | |
1734 | rev = opts['rev'] |
|
1735 | rev = opts['rev'] | |
1735 | if rev: |
|
1736 | if rev: | |
1736 | node = repo.lookup(rev) |
|
1737 | node = repo.lookup(rev) | |
1737 | else: |
|
1738 | else: | |
1738 | node = None |
|
1739 | node = None | |
1739 |
|
1740 | |||
1740 | ret = 1 |
|
1741 | ret = 1 | |
1741 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, |
|
1742 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, | |
1742 | badmatch=util.always, |
|
1743 | badmatch=util.always, | |
1743 | default='relglob'): |
|
1744 | default='relglob'): | |
1744 | if src == 'b': |
|
1745 | if src == 'b': | |
1745 | continue |
|
1746 | continue | |
1746 | if not node and abs not in repo.dirstate: |
|
1747 | if not node and abs not in repo.dirstate: | |
1747 | continue |
|
1748 | continue | |
1748 | if opts['fullpath']: |
|
1749 | if opts['fullpath']: | |
1749 | ui.write(os.path.join(repo.root, abs), end) |
|
1750 | ui.write(os.path.join(repo.root, abs), end) | |
1750 | else: |
|
1751 | else: | |
1751 | ui.write(((pats and rel) or abs), end) |
|
1752 | ui.write(((pats and rel) or abs), end) | |
1752 | ret = 0 |
|
1753 | ret = 0 | |
1753 |
|
1754 | |||
1754 | return ret |
|
1755 | return ret | |
1755 |
|
1756 | |||
1756 | def log(ui, repo, *pats, **opts): |
|
1757 | def log(ui, repo, *pats, **opts): | |
1757 | """show revision history of entire repository or files |
|
1758 | """show revision history of entire repository or files | |
1758 |
|
1759 | |||
1759 | Print the revision history of the specified files or the entire |
|
1760 | Print the revision history of the specified files or the entire | |
1760 | project. |
|
1761 | project. | |
1761 |
|
1762 | |||
1762 | File history is shown without following rename or copy history of |
|
1763 | File history is shown without following rename or copy history of | |
1763 | files. Use -f/--follow with a file name to follow history across |
|
1764 | files. Use -f/--follow with a file name to follow history across | |
1764 | renames and copies. --follow without a file name will only show |
|
1765 | renames and copies. --follow without a file name will only show | |
1765 | ancestors or descendants of the starting revision. --follow-first |
|
1766 | ancestors or descendants of the starting revision. --follow-first | |
1766 | only follows the first parent of merge revisions. |
|
1767 | only follows the first parent of merge revisions. | |
1767 |
|
1768 | |||
1768 | If no revision range is specified, the default is tip:0 unless |
|
1769 | If no revision range is specified, the default is tip:0 unless | |
1769 | --follow is set, in which case the working directory parent is |
|
1770 | --follow is set, in which case the working directory parent is | |
1770 | used as the starting revision. |
|
1771 | used as the starting revision. | |
1771 |
|
1772 | |||
1772 | By default this command outputs: changeset id and hash, tags, |
|
1773 | By default this command outputs: changeset id and hash, tags, | |
1773 | non-trivial parents, user, date and time, and a summary for each |
|
1774 | non-trivial parents, user, date and time, and a summary for each | |
1774 | commit. When the -v/--verbose switch is used, the list of changed |
|
1775 | commit. When the -v/--verbose switch is used, the list of changed | |
1775 | files and full commit message is shown. |
|
1776 | files and full commit message is shown. | |
1776 |
|
1777 | |||
1777 | NOTE: log -p may generate unexpected diff output for merge |
|
1778 | NOTE: log -p may generate unexpected diff output for merge | |
1778 | changesets, as it will compare the merge changeset against its |
|
1779 | changesets, as it will compare the merge changeset against its | |
1779 | first parent only. Also, the files: list will only reflect files |
|
1780 | first parent only. Also, the files: list will only reflect files | |
1780 | that are different from BOTH parents. |
|
1781 | that are different from BOTH parents. | |
1781 |
|
1782 | |||
1782 | """ |
|
1783 | """ | |
1783 |
|
1784 | |||
1784 | get = util.cachefunc(lambda r: repo.changectx(r).changeset()) |
|
1785 | get = util.cachefunc(lambda r: repo.changectx(r).changeset()) | |
1785 | changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts) |
|
1786 | changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts) | |
1786 |
|
1787 | |||
1787 | if opts['limit']: |
|
1788 | if opts['limit']: | |
1788 | try: |
|
1789 | try: | |
1789 | limit = int(opts['limit']) |
|
1790 | limit = int(opts['limit']) | |
1790 | except ValueError: |
|
1791 | except ValueError: | |
1791 | raise util.Abort(_('limit must be a positive integer')) |
|
1792 | raise util.Abort(_('limit must be a positive integer')) | |
1792 | if limit <= 0: raise util.Abort(_('limit must be positive')) |
|
1793 | if limit <= 0: raise util.Abort(_('limit must be positive')) | |
1793 | else: |
|
1794 | else: | |
1794 | limit = sys.maxint |
|
1795 | limit = sys.maxint | |
1795 | count = 0 |
|
1796 | count = 0 | |
1796 |
|
1797 | |||
1797 | if opts['copies'] and opts['rev']: |
|
1798 | if opts['copies'] and opts['rev']: | |
1798 | endrev = max(cmdutil.revrange(repo, opts['rev'])) + 1 |
|
1799 | endrev = max(cmdutil.revrange(repo, opts['rev'])) + 1 | |
1799 | else: |
|
1800 | else: | |
1800 | endrev = repo.changelog.count() |
|
1801 | endrev = repo.changelog.count() | |
1801 | rcache = {} |
|
1802 | rcache = {} | |
1802 | ncache = {} |
|
1803 | ncache = {} | |
1803 | dcache = [] |
|
1804 | dcache = [] | |
1804 | def getrenamed(fn, rev, man): |
|
1805 | def getrenamed(fn, rev, man): | |
1805 | '''looks up all renames for a file (up to endrev) the first |
|
1806 | '''looks up all renames for a file (up to endrev) the first | |
1806 | time the file is given. It indexes on the changerev and only |
|
1807 | time the file is given. It indexes on the changerev and only | |
1807 | parses the manifest if linkrev != changerev. |
|
1808 | parses the manifest if linkrev != changerev. | |
1808 | Returns rename info for fn at changerev rev.''' |
|
1809 | Returns rename info for fn at changerev rev.''' | |
1809 | if fn not in rcache: |
|
1810 | if fn not in rcache: | |
1810 | rcache[fn] = {} |
|
1811 | rcache[fn] = {} | |
1811 | ncache[fn] = {} |
|
1812 | ncache[fn] = {} | |
1812 | fl = repo.file(fn) |
|
1813 | fl = repo.file(fn) | |
1813 | for i in xrange(fl.count()): |
|
1814 | for i in xrange(fl.count()): | |
1814 | node = fl.node(i) |
|
1815 | node = fl.node(i) | |
1815 | lr = fl.linkrev(node) |
|
1816 | lr = fl.linkrev(node) | |
1816 | renamed = fl.renamed(node) |
|
1817 | renamed = fl.renamed(node) | |
1817 | rcache[fn][lr] = renamed |
|
1818 | rcache[fn][lr] = renamed | |
1818 | if renamed: |
|
1819 | if renamed: | |
1819 | ncache[fn][node] = renamed |
|
1820 | ncache[fn][node] = renamed | |
1820 | if lr >= endrev: |
|
1821 | if lr >= endrev: | |
1821 | break |
|
1822 | break | |
1822 | if rev in rcache[fn]: |
|
1823 | if rev in rcache[fn]: | |
1823 | return rcache[fn][rev] |
|
1824 | return rcache[fn][rev] | |
1824 | mr = repo.manifest.rev(man) |
|
1825 | mr = repo.manifest.rev(man) | |
1825 | if repo.manifest.parentrevs(mr) != (mr - 1, nullrev): |
|
1826 | if repo.manifest.parentrevs(mr) != (mr - 1, nullrev): | |
1826 | return ncache[fn].get(repo.manifest.find(man, fn)[0]) |
|
1827 | return ncache[fn].get(repo.manifest.find(man, fn)[0]) | |
1827 | if not dcache or dcache[0] != man: |
|
1828 | if not dcache or dcache[0] != man: | |
1828 | dcache[:] = [man, repo.manifest.readdelta(man)] |
|
1829 | dcache[:] = [man, repo.manifest.readdelta(man)] | |
1829 | if fn in dcache[1]: |
|
1830 | if fn in dcache[1]: | |
1830 | return ncache[fn].get(dcache[1][fn]) |
|
1831 | return ncache[fn].get(dcache[1][fn]) | |
1831 | return None |
|
1832 | return None | |
1832 |
|
1833 | |||
1833 | df = False |
|
1834 | df = False | |
1834 | if opts["date"]: |
|
1835 | if opts["date"]: | |
1835 | df = util.matchdate(opts["date"]) |
|
1836 | df = util.matchdate(opts["date"]) | |
1836 |
|
1837 | |||
1837 | displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) |
|
1838 | displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) | |
1838 | for st, rev, fns in changeiter: |
|
1839 | for st, rev, fns in changeiter: | |
1839 | if st == 'add': |
|
1840 | if st == 'add': | |
1840 | changenode = repo.changelog.node(rev) |
|
1841 | changenode = repo.changelog.node(rev) | |
1841 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
1842 | parents = [p for p in repo.changelog.parentrevs(rev) | |
1842 | if p != nullrev] |
|
1843 | if p != nullrev] | |
1843 | if opts['no_merges'] and len(parents) == 2: |
|
1844 | if opts['no_merges'] and len(parents) == 2: | |
1844 | continue |
|
1845 | continue | |
1845 | if opts['only_merges'] and len(parents) != 2: |
|
1846 | if opts['only_merges'] and len(parents) != 2: | |
1846 | continue |
|
1847 | continue | |
1847 |
|
1848 | |||
1848 | if df: |
|
1849 | if df: | |
1849 | changes = get(rev) |
|
1850 | changes = get(rev) | |
1850 | if not df(changes[2][0]): |
|
1851 | if not df(changes[2][0]): | |
1851 | continue |
|
1852 | continue | |
1852 |
|
1853 | |||
1853 | if opts['keyword']: |
|
1854 | if opts['keyword']: | |
1854 | changes = get(rev) |
|
1855 | changes = get(rev) | |
1855 | miss = 0 |
|
1856 | miss = 0 | |
1856 | for k in [kw.lower() for kw in opts['keyword']]: |
|
1857 | for k in [kw.lower() for kw in opts['keyword']]: | |
1857 | if not (k in changes[1].lower() or |
|
1858 | if not (k in changes[1].lower() or | |
1858 | k in changes[4].lower() or |
|
1859 | k in changes[4].lower() or | |
1859 | k in " ".join(changes[3]).lower()): |
|
1860 | k in " ".join(changes[3]).lower()): | |
1860 | miss = 1 |
|
1861 | miss = 1 | |
1861 | break |
|
1862 | break | |
1862 | if miss: |
|
1863 | if miss: | |
1863 | continue |
|
1864 | continue | |
1864 |
|
1865 | |||
1865 | copies = [] |
|
1866 | copies = [] | |
1866 | if opts.get('copies') and rev: |
|
1867 | if opts.get('copies') and rev: | |
1867 | mf = get(rev)[0] |
|
1868 | mf = get(rev)[0] | |
1868 | for fn in get(rev)[3]: |
|
1869 | for fn in get(rev)[3]: | |
1869 | rename = getrenamed(fn, rev, mf) |
|
1870 | rename = getrenamed(fn, rev, mf) | |
1870 | if rename: |
|
1871 | if rename: | |
1871 | copies.append((fn, rename[0])) |
|
1872 | copies.append((fn, rename[0])) | |
1872 | displayer.show(rev, changenode, copies=copies) |
|
1873 | displayer.show(rev, changenode, copies=copies) | |
1873 | elif st == 'iter': |
|
1874 | elif st == 'iter': | |
1874 | if count == limit: break |
|
1875 | if count == limit: break | |
1875 | if displayer.flush(rev): |
|
1876 | if displayer.flush(rev): | |
1876 | count += 1 |
|
1877 | count += 1 | |
1877 |
|
1878 | |||
1878 | def manifest(ui, repo, node=None, rev=None): |
|
1879 | def manifest(ui, repo, node=None, rev=None): | |
1879 | """output the current or given revision of the project manifest |
|
1880 | """output the current or given revision of the project manifest | |
1880 |
|
1881 | |||
1881 | Print a list of version controlled files for the given revision. |
|
1882 | Print a list of version controlled files for the given revision. | |
1882 | If no revision is given, the parent of the working directory is used, |
|
1883 | If no revision is given, the parent of the working directory is used, | |
1883 | or tip if no revision is checked out. |
|
1884 | or tip if no revision is checked out. | |
1884 |
|
1885 | |||
1885 | The manifest is the list of files being version controlled. If no revision |
|
1886 | The manifest is the list of files being version controlled. If no revision | |
1886 | is given then the first parent of the working directory is used. |
|
1887 | is given then the first parent of the working directory is used. | |
1887 |
|
1888 | |||
1888 | With -v flag, print file permissions, symlink and executable bits. With |
|
1889 | With -v flag, print file permissions, symlink and executable bits. With | |
1889 | --debug flag, print file revision hashes. |
|
1890 | --debug flag, print file revision hashes. | |
1890 | """ |
|
1891 | """ | |
1891 |
|
1892 | |||
1892 | if rev and node: |
|
1893 | if rev and node: | |
1893 | raise util.Abort(_("please specify just one revision")) |
|
1894 | raise util.Abort(_("please specify just one revision")) | |
1894 |
|
1895 | |||
1895 | if not node: |
|
1896 | if not node: | |
1896 | node = rev |
|
1897 | node = rev | |
1897 |
|
1898 | |||
1898 | m = repo.changectx(node).manifest() |
|
1899 | m = repo.changectx(node).manifest() | |
1899 | files = m.keys() |
|
1900 | files = m.keys() | |
1900 | files.sort() |
|
1901 | files.sort() | |
1901 |
|
1902 | |||
1902 | for f in files: |
|
1903 | for f in files: | |
1903 | if ui.debugflag: |
|
1904 | if ui.debugflag: | |
1904 | ui.write("%40s " % hex(m[f])) |
|
1905 | ui.write("%40s " % hex(m[f])) | |
1905 | if ui.verbose: |
|
1906 | if ui.verbose: | |
1906 | type = m.execf(f) and "*" or m.linkf(f) and "@" or " " |
|
1907 | type = m.execf(f) and "*" or m.linkf(f) and "@" or " " | |
1907 | perm = m.execf(f) and "755" or "644" |
|
1908 | perm = m.execf(f) and "755" or "644" | |
1908 | ui.write("%3s %1s " % (perm, type)) |
|
1909 | ui.write("%3s %1s " % (perm, type)) | |
1909 | ui.write("%s\n" % f) |
|
1910 | ui.write("%s\n" % f) | |
1910 |
|
1911 | |||
1911 | def merge(ui, repo, node=None, force=None, rev=None): |
|
1912 | def merge(ui, repo, node=None, force=None, rev=None): | |
1912 | """merge working directory with another revision |
|
1913 | """merge working directory with another revision | |
1913 |
|
1914 | |||
1914 | Merge the contents of the current working directory and the |
|
1915 | Merge the contents of the current working directory and the | |
1915 | requested revision. Files that changed between either parent are |
|
1916 | requested revision. Files that changed between either parent are | |
1916 | marked as changed for the next commit and a commit must be |
|
1917 | marked as changed for the next commit and a commit must be | |
1917 | performed before any further updates are allowed. |
|
1918 | performed before any further updates are allowed. | |
1918 |
|
1919 | |||
1919 | If no revision is specified, the working directory's parent is a |
|
1920 | If no revision is specified, the working directory's parent is a | |
1920 | head revision, and the repository contains exactly one other head, |
|
1921 | head revision, and the repository contains exactly one other head, | |
1921 | the other head is merged with by default. Otherwise, an explicit |
|
1922 | the other head is merged with by default. Otherwise, an explicit | |
1922 | revision to merge with must be provided. |
|
1923 | revision to merge with must be provided. | |
1923 | """ |
|
1924 | """ | |
1924 |
|
1925 | |||
1925 | if rev and node: |
|
1926 | if rev and node: | |
1926 | raise util.Abort(_("please specify just one revision")) |
|
1927 | raise util.Abort(_("please specify just one revision")) | |
1927 | if not node: |
|
1928 | if not node: | |
1928 | node = rev |
|
1929 | node = rev | |
1929 |
|
1930 | |||
1930 | if not node: |
|
1931 | if not node: | |
1931 | heads = repo.heads() |
|
1932 | heads = repo.heads() | |
1932 | if len(heads) > 2: |
|
1933 | if len(heads) > 2: | |
1933 | raise util.Abort(_('repo has %d heads - ' |
|
1934 | raise util.Abort(_('repo has %d heads - ' | |
1934 | 'please merge with an explicit rev') % |
|
1935 | 'please merge with an explicit rev') % | |
1935 | len(heads)) |
|
1936 | len(heads)) | |
1936 | parent = repo.dirstate.parents()[0] |
|
1937 | parent = repo.dirstate.parents()[0] | |
1937 | if len(heads) == 1: |
|
1938 | if len(heads) == 1: | |
1938 | msg = _('there is nothing to merge') |
|
1939 | msg = _('there is nothing to merge') | |
1939 | if parent != repo.lookup(repo.workingctx().branch()): |
|
1940 | if parent != repo.lookup(repo.workingctx().branch()): | |
1940 | msg = _('%s - use "hg update" instead' % msg) |
|
1941 | msg = _('%s - use "hg update" instead' % msg) | |
1941 | raise util.Abort(msg) |
|
1942 | raise util.Abort(msg) | |
1942 |
|
1943 | |||
1943 | if parent not in heads: |
|
1944 | if parent not in heads: | |
1944 | raise util.Abort(_('working dir not at a head rev - ' |
|
1945 | raise util.Abort(_('working dir not at a head rev - ' | |
1945 | 'use "hg update" or merge with an explicit rev')) |
|
1946 | 'use "hg update" or merge with an explicit rev')) | |
1946 | node = parent == heads[0] and heads[-1] or heads[0] |
|
1947 | node = parent == heads[0] and heads[-1] or heads[0] | |
1947 | return hg.merge(repo, node, force=force) |
|
1948 | return hg.merge(repo, node, force=force) | |
1948 |
|
1949 | |||
1949 | def outgoing(ui, repo, dest=None, **opts): |
|
1950 | def outgoing(ui, repo, dest=None, **opts): | |
1950 | """show changesets not found in destination |
|
1951 | """show changesets not found in destination | |
1951 |
|
1952 | |||
1952 | Show changesets not found in the specified destination repository or |
|
1953 | Show changesets not found in the specified destination repository or | |
1953 | the default push location. These are the changesets that would be pushed |
|
1954 | the default push location. These are the changesets that would be pushed | |
1954 | if a push was requested. |
|
1955 | if a push was requested. | |
1955 |
|
1956 | |||
1956 | See pull for valid destination format details. |
|
1957 | See pull for valid destination format details. | |
1957 | """ |
|
1958 | """ | |
1958 | dest, revs, checkout = hg.parseurl( |
|
1959 | dest, revs, checkout = hg.parseurl( | |
1959 | ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev']) |
|
1960 | ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev']) | |
1960 | cmdutil.setremoteconfig(ui, opts) |
|
1961 | cmdutil.setremoteconfig(ui, opts) | |
1961 | if revs: |
|
1962 | if revs: | |
1962 | revs = [repo.lookup(rev) for rev in revs] |
|
1963 | revs = [repo.lookup(rev) for rev in revs] | |
1963 |
|
1964 | |||
1964 | other = hg.repository(ui, dest) |
|
1965 | other = hg.repository(ui, dest) | |
1965 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
1966 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
1966 | o = repo.findoutgoing(other, force=opts['force']) |
|
1967 | o = repo.findoutgoing(other, force=opts['force']) | |
1967 | if not o: |
|
1968 | if not o: | |
1968 | ui.status(_("no changes found\n")) |
|
1969 | ui.status(_("no changes found\n")) | |
1969 | return 1 |
|
1970 | return 1 | |
1970 | o = repo.changelog.nodesbetween(o, revs)[0] |
|
1971 | o = repo.changelog.nodesbetween(o, revs)[0] | |
1971 | if opts['newest_first']: |
|
1972 | if opts['newest_first']: | |
1972 | o.reverse() |
|
1973 | o.reverse() | |
1973 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
1974 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
1974 | for n in o: |
|
1975 | for n in o: | |
1975 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
1976 | parents = [p for p in repo.changelog.parents(n) if p != nullid] | |
1976 | if opts['no_merges'] and len(parents) == 2: |
|
1977 | if opts['no_merges'] and len(parents) == 2: | |
1977 | continue |
|
1978 | continue | |
1978 | displayer.show(changenode=n) |
|
1979 | displayer.show(changenode=n) | |
1979 |
|
1980 | |||
1980 | def parents(ui, repo, file_=None, **opts): |
|
1981 | def parents(ui, repo, file_=None, **opts): | |
1981 | """show the parents of the working dir or revision |
|
1982 | """show the parents of the working dir or revision | |
1982 |
|
1983 | |||
1983 | Print the working directory's parent revisions. If a |
|
1984 | Print the working directory's parent revisions. If a | |
1984 | revision is given via --rev, the parent of that revision |
|
1985 | revision is given via --rev, the parent of that revision | |
1985 | will be printed. If a file argument is given, revision in |
|
1986 | will be printed. If a file argument is given, revision in | |
1986 | which the file was last changed (before the working directory |
|
1987 | which the file was last changed (before the working directory | |
1987 | revision or the argument to --rev if given) is printed. |
|
1988 | revision or the argument to --rev if given) is printed. | |
1988 | """ |
|
1989 | """ | |
1989 | rev = opts.get('rev') |
|
1990 | rev = opts.get('rev') | |
1990 | if rev: |
|
1991 | if rev: | |
1991 | ctx = repo.changectx(rev) |
|
1992 | ctx = repo.changectx(rev) | |
1992 | else: |
|
1993 | else: | |
1993 | ctx = repo.workingctx() |
|
1994 | ctx = repo.workingctx() | |
1994 |
|
1995 | |||
1995 | if file_: |
|
1996 | if file_: | |
1996 | files, match, anypats = cmdutil.matchpats(repo, (file_,), opts) |
|
1997 | files, match, anypats = cmdutil.matchpats(repo, (file_,), opts) | |
1997 | if anypats or len(files) != 1: |
|
1998 | if anypats or len(files) != 1: | |
1998 | raise util.Abort(_('can only specify an explicit file name')) |
|
1999 | raise util.Abort(_('can only specify an explicit file name')) | |
1999 | file_ = files[0] |
|
2000 | file_ = files[0] | |
2000 | filenodes = [] |
|
2001 | filenodes = [] | |
2001 | for cp in ctx.parents(): |
|
2002 | for cp in ctx.parents(): | |
2002 | if not cp: |
|
2003 | if not cp: | |
2003 | continue |
|
2004 | continue | |
2004 | try: |
|
2005 | try: | |
2005 | filenodes.append(cp.filenode(file_)) |
|
2006 | filenodes.append(cp.filenode(file_)) | |
2006 | except revlog.LookupError: |
|
2007 | except revlog.LookupError: | |
2007 | pass |
|
2008 | pass | |
2008 | if not filenodes: |
|
2009 | if not filenodes: | |
2009 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
2010 | raise util.Abort(_("'%s' not found in manifest!") % file_) | |
2010 | fl = repo.file(file_) |
|
2011 | fl = repo.file(file_) | |
2011 | p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes] |
|
2012 | p = [repo.lookup(fl.linkrev(fn)) for fn in filenodes] | |
2012 | else: |
|
2013 | else: | |
2013 | p = [cp.node() for cp in ctx.parents()] |
|
2014 | p = [cp.node() for cp in ctx.parents()] | |
2014 |
|
2015 | |||
2015 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2016 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
2016 | for n in p: |
|
2017 | for n in p: | |
2017 | if n != nullid: |
|
2018 | if n != nullid: | |
2018 | displayer.show(changenode=n) |
|
2019 | displayer.show(changenode=n) | |
2019 |
|
2020 | |||
2020 | def paths(ui, repo, search=None): |
|
2021 | def paths(ui, repo, search=None): | |
2021 | """show definition of symbolic path names |
|
2022 | """show definition of symbolic path names | |
2022 |
|
2023 | |||
2023 | Show definition of symbolic path name NAME. If no name is given, show |
|
2024 | Show definition of symbolic path name NAME. If no name is given, show | |
2024 | definition of available names. |
|
2025 | definition of available names. | |
2025 |
|
2026 | |||
2026 | Path names are defined in the [paths] section of /etc/mercurial/hgrc |
|
2027 | Path names are defined in the [paths] section of /etc/mercurial/hgrc | |
2027 | and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. |
|
2028 | and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. | |
2028 | """ |
|
2029 | """ | |
2029 | if search: |
|
2030 | if search: | |
2030 | for name, path in ui.configitems("paths"): |
|
2031 | for name, path in ui.configitems("paths"): | |
2031 | if name == search: |
|
2032 | if name == search: | |
2032 | ui.write("%s\n" % path) |
|
2033 | ui.write("%s\n" % path) | |
2033 | return |
|
2034 | return | |
2034 | ui.warn(_("not found!\n")) |
|
2035 | ui.warn(_("not found!\n")) | |
2035 | return 1 |
|
2036 | return 1 | |
2036 | else: |
|
2037 | else: | |
2037 | for name, path in ui.configitems("paths"): |
|
2038 | for name, path in ui.configitems("paths"): | |
2038 | ui.write("%s = %s\n" % (name, path)) |
|
2039 | ui.write("%s = %s\n" % (name, path)) | |
2039 |
|
2040 | |||
2040 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
2041 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
2041 | if modheads == 0: |
|
2042 | if modheads == 0: | |
2042 | return |
|
2043 | return | |
2043 | if optupdate: |
|
2044 | if optupdate: | |
2044 | if modheads <= 1 or checkout: |
|
2045 | if modheads <= 1 or checkout: | |
2045 | return hg.update(repo, checkout) |
|
2046 | return hg.update(repo, checkout) | |
2046 | else: |
|
2047 | else: | |
2047 | ui.status(_("not updating, since new heads added\n")) |
|
2048 | ui.status(_("not updating, since new heads added\n")) | |
2048 | if modheads > 1: |
|
2049 | if modheads > 1: | |
2049 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
2050 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
2050 | else: |
|
2051 | else: | |
2051 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
2052 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
2052 |
|
2053 | |||
2053 | def pull(ui, repo, source="default", **opts): |
|
2054 | def pull(ui, repo, source="default", **opts): | |
2054 | """pull changes from the specified source |
|
2055 | """pull changes from the specified source | |
2055 |
|
2056 | |||
2056 | Pull changes from a remote repository to a local one. |
|
2057 | Pull changes from a remote repository to a local one. | |
2057 |
|
2058 | |||
2058 | This finds all changes from the repository at the specified path |
|
2059 | This finds all changes from the repository at the specified path | |
2059 | or URL and adds them to the local repository. By default, this |
|
2060 | or URL and adds them to the local repository. By default, this | |
2060 | does not update the copy of the project in the working directory. |
|
2061 | does not update the copy of the project in the working directory. | |
2061 |
|
2062 | |||
2062 | Valid URLs are of the form: |
|
2063 | Valid URLs are of the form: | |
2063 |
|
2064 | |||
2064 | local/filesystem/path (or file://local/filesystem/path) |
|
2065 | local/filesystem/path (or file://local/filesystem/path) | |
2065 | http://[user@]host[:port]/[path] |
|
2066 | http://[user@]host[:port]/[path] | |
2066 | https://[user@]host[:port]/[path] |
|
2067 | https://[user@]host[:port]/[path] | |
2067 | ssh://[user@]host[:port]/[path] |
|
2068 | ssh://[user@]host[:port]/[path] | |
2068 | static-http://host[:port]/[path] |
|
2069 | static-http://host[:port]/[path] | |
2069 |
|
2070 | |||
2070 | Paths in the local filesystem can either point to Mercurial |
|
2071 | Paths in the local filesystem can either point to Mercurial | |
2071 | repositories or to bundle files (as created by 'hg bundle' or |
|
2072 | repositories or to bundle files (as created by 'hg bundle' or | |
2072 | 'hg incoming --bundle'). The static-http:// protocol, albeit slow, |
|
2073 | 'hg incoming --bundle'). The static-http:// protocol, albeit slow, | |
2073 | allows access to a Mercurial repository where you simply use a web |
|
2074 | allows access to a Mercurial repository where you simply use a web | |
2074 | server to publish the .hg directory as static content. |
|
2075 | server to publish the .hg directory as static content. | |
2075 |
|
2076 | |||
2076 | An optional identifier after # indicates a particular branch, tag, |
|
2077 | An optional identifier after # indicates a particular branch, tag, | |
2077 | or changeset to pull. |
|
2078 | or changeset to pull. | |
2078 |
|
2079 | |||
2079 | Some notes about using SSH with Mercurial: |
|
2080 | Some notes about using SSH with Mercurial: | |
2080 | - SSH requires an accessible shell account on the destination machine |
|
2081 | - SSH requires an accessible shell account on the destination machine | |
2081 | and a copy of hg in the remote path or specified with as remotecmd. |
|
2082 | and a copy of hg in the remote path or specified with as remotecmd. | |
2082 | - path is relative to the remote user's home directory by default. |
|
2083 | - path is relative to the remote user's home directory by default. | |
2083 | Use an extra slash at the start of a path to specify an absolute path: |
|
2084 | Use an extra slash at the start of a path to specify an absolute path: | |
2084 | ssh://example.com//tmp/repository |
|
2085 | ssh://example.com//tmp/repository | |
2085 | - Mercurial doesn't use its own compression via SSH; the right thing |
|
2086 | - Mercurial doesn't use its own compression via SSH; the right thing | |
2086 | to do is to configure it in your ~/.ssh/config, e.g.: |
|
2087 | to do is to configure it in your ~/.ssh/config, e.g.: | |
2087 | Host *.mylocalnetwork.example.com |
|
2088 | Host *.mylocalnetwork.example.com | |
2088 | Compression no |
|
2089 | Compression no | |
2089 | Host * |
|
2090 | Host * | |
2090 | Compression yes |
|
2091 | Compression yes | |
2091 | Alternatively specify "ssh -C" as your ssh command in your hgrc or |
|
2092 | Alternatively specify "ssh -C" as your ssh command in your hgrc or | |
2092 | with the --ssh command line option. |
|
2093 | with the --ssh command line option. | |
2093 | """ |
|
2094 | """ | |
2094 | source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev']) |
|
2095 | source, revs, checkout = hg.parseurl(ui.expandpath(source), opts['rev']) | |
2095 | cmdutil.setremoteconfig(ui, opts) |
|
2096 | cmdutil.setremoteconfig(ui, opts) | |
2096 |
|
2097 | |||
2097 | other = hg.repository(ui, source) |
|
2098 | other = hg.repository(ui, source) | |
2098 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
2099 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
2099 | if revs: |
|
2100 | if revs: | |
2100 | try: |
|
2101 | try: | |
2101 | revs = [other.lookup(rev) for rev in revs] |
|
2102 | revs = [other.lookup(rev) for rev in revs] | |
2102 | except repo.NoCapability: |
|
2103 | except repo.NoCapability: | |
2103 | error = _("Other repository doesn't support revision lookup, " |
|
2104 | error = _("Other repository doesn't support revision lookup, " | |
2104 | "so a rev cannot be specified.") |
|
2105 | "so a rev cannot be specified.") | |
2105 | raise util.Abort(error) |
|
2106 | raise util.Abort(error) | |
2106 |
|
2107 | |||
2107 | modheads = repo.pull(other, heads=revs, force=opts['force']) |
|
2108 | modheads = repo.pull(other, heads=revs, force=opts['force']) | |
2108 | return postincoming(ui, repo, modheads, opts['update'], checkout) |
|
2109 | return postincoming(ui, repo, modheads, opts['update'], checkout) | |
2109 |
|
2110 | |||
2110 | def push(ui, repo, dest=None, **opts): |
|
2111 | def push(ui, repo, dest=None, **opts): | |
2111 | """push changes to the specified destination |
|
2112 | """push changes to the specified destination | |
2112 |
|
2113 | |||
2113 | Push changes from the local repository to the given destination. |
|
2114 | Push changes from the local repository to the given destination. | |
2114 |
|
2115 | |||
2115 | This is the symmetrical operation for pull. It helps to move |
|
2116 | This is the symmetrical operation for pull. It helps to move | |
2116 | changes from the current repository to a different one. If the |
|
2117 | changes from the current repository to a different one. If the | |
2117 | destination is local this is identical to a pull in that directory |
|
2118 | destination is local this is identical to a pull in that directory | |
2118 | from the current one. |
|
2119 | from the current one. | |
2119 |
|
2120 | |||
2120 | By default, push will refuse to run if it detects the result would |
|
2121 | By default, push will refuse to run if it detects the result would | |
2121 | increase the number of remote heads. This generally indicates the |
|
2122 | increase the number of remote heads. This generally indicates the | |
2122 | the client has forgotten to sync and merge before pushing. |
|
2123 | the client has forgotten to sync and merge before pushing. | |
2123 |
|
2124 | |||
2124 | Valid URLs are of the form: |
|
2125 | Valid URLs are of the form: | |
2125 |
|
2126 | |||
2126 | local/filesystem/path (or file://local/filesystem/path) |
|
2127 | local/filesystem/path (or file://local/filesystem/path) | |
2127 | ssh://[user@]host[:port]/[path] |
|
2128 | ssh://[user@]host[:port]/[path] | |
2128 | http://[user@]host[:port]/[path] |
|
2129 | http://[user@]host[:port]/[path] | |
2129 | https://[user@]host[:port]/[path] |
|
2130 | https://[user@]host[:port]/[path] | |
2130 |
|
2131 | |||
2131 | An optional identifier after # indicates a particular branch, tag, |
|
2132 | An optional identifier after # indicates a particular branch, tag, | |
2132 | or changeset to push. |
|
2133 | or changeset to push. | |
2133 |
|
2134 | |||
2134 | Look at the help text for the pull command for important details |
|
2135 | Look at the help text for the pull command for important details | |
2135 | about ssh:// URLs. |
|
2136 | about ssh:// URLs. | |
2136 |
|
2137 | |||
2137 | Pushing to http:// and https:// URLs is only possible, if this |
|
2138 | Pushing to http:// and https:// URLs is only possible, if this | |
2138 | feature is explicitly enabled on the remote Mercurial server. |
|
2139 | feature is explicitly enabled on the remote Mercurial server. | |
2139 | """ |
|
2140 | """ | |
2140 | dest, revs, checkout = hg.parseurl( |
|
2141 | dest, revs, checkout = hg.parseurl( | |
2141 | ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev']) |
|
2142 | ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev']) | |
2142 | cmdutil.setremoteconfig(ui, opts) |
|
2143 | cmdutil.setremoteconfig(ui, opts) | |
2143 |
|
2144 | |||
2144 | other = hg.repository(ui, dest) |
|
2145 | other = hg.repository(ui, dest) | |
2145 | ui.status('pushing to %s\n' % util.hidepassword(dest)) |
|
2146 | ui.status('pushing to %s\n' % util.hidepassword(dest)) | |
2146 | if revs: |
|
2147 | if revs: | |
2147 | revs = [repo.lookup(rev) for rev in revs] |
|
2148 | revs = [repo.lookup(rev) for rev in revs] | |
2148 | r = repo.push(other, opts['force'], revs=revs) |
|
2149 | r = repo.push(other, opts['force'], revs=revs) | |
2149 | return r == 0 |
|
2150 | return r == 0 | |
2150 |
|
2151 | |||
2151 | def rawcommit(ui, repo, *pats, **opts): |
|
2152 | def rawcommit(ui, repo, *pats, **opts): | |
2152 | """raw commit interface (DEPRECATED) |
|
2153 | """raw commit interface (DEPRECATED) | |
2153 |
|
2154 | |||
2154 | (DEPRECATED) |
|
2155 | (DEPRECATED) | |
2155 | Lowlevel commit, for use in helper scripts. |
|
2156 | Lowlevel commit, for use in helper scripts. | |
2156 |
|
2157 | |||
2157 | This command is not intended to be used by normal users, as it is |
|
2158 | This command is not intended to be used by normal users, as it is | |
2158 | primarily useful for importing from other SCMs. |
|
2159 | primarily useful for importing from other SCMs. | |
2159 |
|
2160 | |||
2160 | This command is now deprecated and will be removed in a future |
|
2161 | This command is now deprecated and will be removed in a future | |
2161 | release, please use debugsetparents and commit instead. |
|
2162 | release, please use debugsetparents and commit instead. | |
2162 | """ |
|
2163 | """ | |
2163 |
|
2164 | |||
2164 | ui.warn(_("(the rawcommit command is deprecated)\n")) |
|
2165 | ui.warn(_("(the rawcommit command is deprecated)\n")) | |
2165 |
|
2166 | |||
2166 | message = cmdutil.logmessage(opts) |
|
2167 | message = cmdutil.logmessage(opts) | |
2167 |
|
2168 | |||
2168 | files, match, anypats = cmdutil.matchpats(repo, pats, opts) |
|
2169 | files, match, anypats = cmdutil.matchpats(repo, pats, opts) | |
2169 | if opts['files']: |
|
2170 | if opts['files']: | |
2170 | files += open(opts['files']).read().splitlines() |
|
2171 | files += open(opts['files']).read().splitlines() | |
2171 |
|
2172 | |||
2172 | parents = [repo.lookup(p) for p in opts['parent']] |
|
2173 | parents = [repo.lookup(p) for p in opts['parent']] | |
2173 |
|
2174 | |||
2174 | try: |
|
2175 | try: | |
2175 | repo.rawcommit(files, message, opts['user'], opts['date'], *parents) |
|
2176 | repo.rawcommit(files, message, opts['user'], opts['date'], *parents) | |
2176 | except ValueError, inst: |
|
2177 | except ValueError, inst: | |
2177 | raise util.Abort(str(inst)) |
|
2178 | raise util.Abort(str(inst)) | |
2178 |
|
2179 | |||
2179 | def recover(ui, repo): |
|
2180 | def recover(ui, repo): | |
2180 | """roll back an interrupted transaction |
|
2181 | """roll back an interrupted transaction | |
2181 |
|
2182 | |||
2182 | Recover from an interrupted commit or pull. |
|
2183 | Recover from an interrupted commit or pull. | |
2183 |
|
2184 | |||
2184 | This command tries to fix the repository status after an interrupted |
|
2185 | This command tries to fix the repository status after an interrupted | |
2185 | operation. It should only be necessary when Mercurial suggests it. |
|
2186 | operation. It should only be necessary when Mercurial suggests it. | |
2186 | """ |
|
2187 | """ | |
2187 | if repo.recover(): |
|
2188 | if repo.recover(): | |
2188 | return hg.verify(repo) |
|
2189 | return hg.verify(repo) | |
2189 | return 1 |
|
2190 | return 1 | |
2190 |
|
2191 | |||
2191 | def remove(ui, repo, *pats, **opts): |
|
2192 | def remove(ui, repo, *pats, **opts): | |
2192 | """remove the specified files on the next commit |
|
2193 | """remove the specified files on the next commit | |
2193 |
|
2194 | |||
2194 | Schedule the indicated files for removal from the repository. |
|
2195 | Schedule the indicated files for removal from the repository. | |
2195 |
|
2196 | |||
2196 | This only removes files from the current branch, not from the |
|
2197 | This only removes files from the current branch, not from the | |
2197 | entire project history. If the files still exist in the working |
|
2198 | entire project history. If the files still exist in the working | |
2198 | directory, they will be deleted from it. If invoked with --after, |
|
2199 | directory, they will be deleted from it. If invoked with --after, | |
2199 | files are marked as removed, but not actually unlinked unless --force |
|
2200 | files are marked as removed, but not actually unlinked unless --force | |
2200 | is also given. Without exact file names, --after will only mark |
|
2201 | is also given. Without exact file names, --after will only mark | |
2201 | files as removed if they are no longer in the working directory. |
|
2202 | files as removed if they are no longer in the working directory. | |
2202 |
|
2203 | |||
2203 | This command schedules the files to be removed at the next commit. |
|
2204 | This command schedules the files to be removed at the next commit. | |
2204 | To undo a remove before that, see hg revert. |
|
2205 | To undo a remove before that, see hg revert. | |
2205 |
|
2206 | |||
2206 | Modified files and added files are not removed by default. To |
|
2207 | Modified files and added files are not removed by default. To | |
2207 | remove them, use the -f/--force option. |
|
2208 | remove them, use the -f/--force option. | |
2208 | """ |
|
2209 | """ | |
2209 | if not opts['after'] and not pats: |
|
2210 | if not opts['after'] and not pats: | |
2210 | raise util.Abort(_('no files specified')) |
|
2211 | raise util.Abort(_('no files specified')) | |
2211 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
|
2212 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | |
2212 | exact = dict.fromkeys(files) |
|
2213 | exact = dict.fromkeys(files) | |
2213 | mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5] |
|
2214 | mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5] | |
2214 | modified, added, removed, deleted, unknown = mardu |
|
2215 | modified, added, removed, deleted, unknown = mardu | |
2215 | remove, forget = [], [] |
|
2216 | remove, forget = [], [] | |
2216 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): |
|
2217 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): | |
2217 | reason = None |
|
2218 | reason = None | |
2218 | if abs in modified and not opts['force']: |
|
2219 | if abs in modified and not opts['force']: | |
2219 | reason = _('is modified (use -f to force removal)') |
|
2220 | reason = _('is modified (use -f to force removal)') | |
2220 | elif abs in added: |
|
2221 | elif abs in added: | |
2221 | if opts['force']: |
|
2222 | if opts['force']: | |
2222 | forget.append(abs) |
|
2223 | forget.append(abs) | |
2223 | continue |
|
2224 | continue | |
2224 | reason = _('has been marked for add (use -f to force removal)') |
|
2225 | reason = _('has been marked for add (use -f to force removal)') | |
2225 | elif abs not in repo.dirstate: |
|
2226 | elif abs not in repo.dirstate: | |
2226 | reason = _('is not managed') |
|
2227 | reason = _('is not managed') | |
2227 | elif opts['after'] and not exact and abs not in deleted: |
|
2228 | elif opts['after'] and not exact and abs not in deleted: | |
2228 | continue |
|
2229 | continue | |
2229 | elif abs in removed: |
|
2230 | elif abs in removed: | |
2230 | continue |
|
2231 | continue | |
2231 | if reason: |
|
2232 | if reason: | |
2232 | if exact: |
|
2233 | if exact: | |
2233 | ui.warn(_('not removing %s: file %s\n') % (rel, reason)) |
|
2234 | ui.warn(_('not removing %s: file %s\n') % (rel, reason)) | |
2234 | else: |
|
2235 | else: | |
2235 | if ui.verbose or not exact: |
|
2236 | if ui.verbose or not exact: | |
2236 | ui.status(_('removing %s\n') % rel) |
|
2237 | ui.status(_('removing %s\n') % rel) | |
2237 | remove.append(abs) |
|
2238 | remove.append(abs) | |
2238 | repo.forget(forget) |
|
2239 | repo.forget(forget) | |
2239 | repo.remove(remove, unlink=opts['force'] or not opts['after']) |
|
2240 | repo.remove(remove, unlink=opts['force'] or not opts['after']) | |
2240 |
|
2241 | |||
2241 | def rename(ui, repo, *pats, **opts): |
|
2242 | def rename(ui, repo, *pats, **opts): | |
2242 | """rename files; equivalent of copy + remove |
|
2243 | """rename files; equivalent of copy + remove | |
2243 |
|
2244 | |||
2244 | Mark dest as copies of sources; mark sources for deletion. If |
|
2245 | Mark dest as copies of sources; mark sources for deletion. If | |
2245 | dest is a directory, copies are put in that directory. If dest is |
|
2246 | dest is a directory, copies are put in that directory. If dest is | |
2246 | a file, there can only be one source. |
|
2247 | a file, there can only be one source. | |
2247 |
|
2248 | |||
2248 | By default, this command copies the contents of files as they |
|
2249 | By default, this command copies the contents of files as they | |
2249 | stand in the working directory. If invoked with --after, the |
|
2250 | stand in the working directory. If invoked with --after, the | |
2250 | operation is recorded, but no copying is performed. |
|
2251 | operation is recorded, but no copying is performed. | |
2251 |
|
2252 | |||
2252 | This command takes effect in the next commit. To undo a rename |
|
2253 | This command takes effect in the next commit. To undo a rename | |
2253 | before that, see hg revert. |
|
2254 | before that, see hg revert. | |
2254 | """ |
|
2255 | """ | |
2255 | wlock = repo.wlock(False) |
|
2256 | wlock = repo.wlock(False) | |
2256 | try: |
|
2257 | try: | |
2257 | errs, copied = docopy(ui, repo, pats, opts) |
|
2258 | errs, copied = docopy(ui, repo, pats, opts) | |
2258 | names = [] |
|
2259 | names = [] | |
2259 | for abs, rel, exact in copied: |
|
2260 | for abs, rel, exact in copied: | |
2260 | if ui.verbose or not exact: |
|
2261 | if ui.verbose or not exact: | |
2261 | ui.status(_('removing %s\n') % rel) |
|
2262 | ui.status(_('removing %s\n') % rel) | |
2262 | names.append(abs) |
|
2263 | names.append(abs) | |
2263 | if not opts.get('dry_run'): |
|
2264 | if not opts.get('dry_run'): | |
2264 | repo.remove(names, True) |
|
2265 | repo.remove(names, True) | |
2265 | return errs |
|
2266 | return errs | |
2266 | finally: |
|
2267 | finally: | |
2267 | del wlock |
|
2268 | del wlock | |
2268 |
|
2269 | |||
2269 | def revert(ui, repo, *pats, **opts): |
|
2270 | def revert(ui, repo, *pats, **opts): | |
2270 | """revert files or dirs to their states as of some revision |
|
2271 | """revert files or dirs to their states as of some revision | |
2271 |
|
2272 | |||
2272 | With no revision specified, revert the named files or directories |
|
2273 | With no revision specified, revert the named files or directories | |
2273 | to the contents they had in the parent of the working directory. |
|
2274 | to the contents they had in the parent of the working directory. | |
2274 | This restores the contents of the affected files to an unmodified |
|
2275 | This restores the contents of the affected files to an unmodified | |
2275 | state and unschedules adds, removes, copies, and renames. If the |
|
2276 | state and unschedules adds, removes, copies, and renames. If the | |
2276 | working directory has two parents, you must explicitly specify the |
|
2277 | working directory has two parents, you must explicitly specify the | |
2277 | revision to revert to. |
|
2278 | revision to revert to. | |
2278 |
|
2279 | |||
2279 | Modified files are saved with a .orig suffix before reverting. |
|
2280 | Modified files are saved with a .orig suffix before reverting. | |
2280 | To disable these backups, use --no-backup. |
|
2281 | To disable these backups, use --no-backup. | |
2281 |
|
2282 | |||
2282 | Using the -r option, revert the given files or directories to their |
|
2283 | Using the -r option, revert the given files or directories to their | |
2283 | contents as of a specific revision. This can be helpful to "roll |
|
2284 | contents as of a specific revision. This can be helpful to "roll | |
2284 | back" some or all of a change that should not have been committed. |
|
2285 | back" some or all of a change that should not have been committed. | |
2285 |
|
2286 | |||
2286 | Revert modifies the working directory. It does not commit any |
|
2287 | Revert modifies the working directory. It does not commit any | |
2287 | changes, or change the parent of the working directory. If you |
|
2288 | changes, or change the parent of the working directory. If you | |
2288 | revert to a revision other than the parent of the working |
|
2289 | revert to a revision other than the parent of the working | |
2289 | directory, the reverted files will thus appear modified |
|
2290 | directory, the reverted files will thus appear modified | |
2290 | afterwards. |
|
2291 | afterwards. | |
2291 |
|
2292 | |||
2292 | If a file has been deleted, it is restored. If the executable |
|
2293 | If a file has been deleted, it is restored. If the executable | |
2293 | mode of a file was changed, it is reset. |
|
2294 | mode of a file was changed, it is reset. | |
2294 |
|
2295 | |||
2295 | If names are given, all files matching the names are reverted. |
|
2296 | If names are given, all files matching the names are reverted. | |
2296 |
|
2297 | |||
2297 | If no arguments are given, no files are reverted. |
|
2298 | If no arguments are given, no files are reverted. | |
2298 | """ |
|
2299 | """ | |
2299 |
|
2300 | |||
2300 | if opts["date"]: |
|
2301 | if opts["date"]: | |
2301 | if opts["rev"]: |
|
2302 | if opts["rev"]: | |
2302 | raise util.Abort(_("you can't specify a revision and a date")) |
|
2303 | raise util.Abort(_("you can't specify a revision and a date")) | |
2303 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
2304 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
2304 |
|
2305 | |||
2305 | if not pats and not opts['all']: |
|
2306 | if not pats and not opts['all']: | |
2306 | raise util.Abort(_('no files or directories specified; ' |
|
2307 | raise util.Abort(_('no files or directories specified; ' | |
2307 | 'use --all to revert the whole repo')) |
|
2308 | 'use --all to revert the whole repo')) | |
2308 |
|
2309 | |||
2309 | parent, p2 = repo.dirstate.parents() |
|
2310 | parent, p2 = repo.dirstate.parents() | |
2310 | if not opts['rev'] and p2 != nullid: |
|
2311 | if not opts['rev'] and p2 != nullid: | |
2311 | raise util.Abort(_('uncommitted merge - please provide a ' |
|
2312 | raise util.Abort(_('uncommitted merge - please provide a ' | |
2312 | 'specific revision')) |
|
2313 | 'specific revision')) | |
2313 | ctx = repo.changectx(opts['rev']) |
|
2314 | ctx = repo.changectx(opts['rev']) | |
2314 | node = ctx.node() |
|
2315 | node = ctx.node() | |
2315 | mf = ctx.manifest() |
|
2316 | mf = ctx.manifest() | |
2316 | if node == parent: |
|
2317 | if node == parent: | |
2317 | pmf = mf |
|
2318 | pmf = mf | |
2318 | else: |
|
2319 | else: | |
2319 | pmf = None |
|
2320 | pmf = None | |
2320 |
|
2321 | |||
2321 | # need all matching names in dirstate and manifest of target rev, |
|
2322 | # need all matching names in dirstate and manifest of target rev, | |
2322 | # so have to walk both. do not print errors if files exist in one |
|
2323 | # so have to walk both. do not print errors if files exist in one | |
2323 | # but not other. |
|
2324 | # but not other. | |
2324 |
|
2325 | |||
2325 | names = {} |
|
2326 | names = {} | |
2326 | target_only = {} |
|
2327 | target_only = {} | |
2327 |
|
2328 | |||
2328 | wlock = repo.wlock() |
|
2329 | wlock = repo.wlock() | |
2329 | try: |
|
2330 | try: | |
2330 | # walk dirstate. |
|
2331 | # walk dirstate. | |
2331 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, |
|
2332 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, | |
2332 | badmatch=mf.has_key): |
|
2333 | badmatch=mf.has_key): | |
2333 | names[abs] = (rel, exact) |
|
2334 | names[abs] = (rel, exact) | |
2334 | if src == 'b': |
|
2335 | if src == 'b': | |
2335 | target_only[abs] = True |
|
2336 | target_only[abs] = True | |
2336 |
|
2337 | |||
2337 | # walk target manifest. |
|
2338 | # walk target manifest. | |
2338 |
|
2339 | |||
2339 | def badmatch(path): |
|
2340 | def badmatch(path): | |
2340 | if path in names: |
|
2341 | if path in names: | |
2341 | return True |
|
2342 | return True | |
2342 | path_ = path + '/' |
|
2343 | path_ = path + '/' | |
2343 | for f in names: |
|
2344 | for f in names: | |
2344 | if f.startswith(path_): |
|
2345 | if f.startswith(path_): | |
2345 | return True |
|
2346 | return True | |
2346 | return False |
|
2347 | return False | |
2347 |
|
2348 | |||
2348 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, |
|
2349 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node, | |
2349 | badmatch=badmatch): |
|
2350 | badmatch=badmatch): | |
2350 | if abs in names or src == 'b': |
|
2351 | if abs in names or src == 'b': | |
2351 | continue |
|
2352 | continue | |
2352 | names[abs] = (rel, exact) |
|
2353 | names[abs] = (rel, exact) | |
2353 | target_only[abs] = True |
|
2354 | target_only[abs] = True | |
2354 |
|
2355 | |||
2355 | changes = repo.status(match=names.has_key)[:5] |
|
2356 | changes = repo.status(match=names.has_key)[:5] | |
2356 | modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) |
|
2357 | modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) | |
2357 |
|
2358 | |||
2358 | # if f is a rename, also revert the source |
|
2359 | # if f is a rename, also revert the source | |
2359 | cwd = repo.getcwd() |
|
2360 | cwd = repo.getcwd() | |
2360 | for f in added: |
|
2361 | for f in added: | |
2361 | src = repo.dirstate.copied(f) |
|
2362 | src = repo.dirstate.copied(f) | |
2362 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2363 | if src and src not in names and repo.dirstate[src] == 'r': | |
2363 | removed[src] = None |
|
2364 | removed[src] = None | |
2364 | names[src] = (repo.pathto(src, cwd), True) |
|
2365 | names[src] = (repo.pathto(src, cwd), True) | |
2365 |
|
2366 | |||
2366 | revert = ([], _('reverting %s\n')) |
|
2367 | revert = ([], _('reverting %s\n')) | |
2367 | add = ([], _('adding %s\n')) |
|
2368 | add = ([], _('adding %s\n')) | |
2368 | remove = ([], _('removing %s\n')) |
|
2369 | remove = ([], _('removing %s\n')) | |
2369 | forget = ([], _('forgetting %s\n')) |
|
2370 | forget = ([], _('forgetting %s\n')) | |
2370 | undelete = ([], _('undeleting %s\n')) |
|
2371 | undelete = ([], _('undeleting %s\n')) | |
2371 | update = {} |
|
2372 | update = {} | |
2372 |
|
2373 | |||
2373 | disptable = ( |
|
2374 | disptable = ( | |
2374 | # dispatch table: |
|
2375 | # dispatch table: | |
2375 | # file state |
|
2376 | # file state | |
2376 | # action if in target manifest |
|
2377 | # action if in target manifest | |
2377 | # action if not in target manifest |
|
2378 | # action if not in target manifest | |
2378 | # make backup if in target manifest |
|
2379 | # make backup if in target manifest | |
2379 | # make backup if not in target manifest |
|
2380 | # make backup if not in target manifest | |
2380 | (modified, revert, remove, True, True), |
|
2381 | (modified, revert, remove, True, True), | |
2381 | (added, revert, forget, True, False), |
|
2382 | (added, revert, forget, True, False), | |
2382 | (removed, undelete, None, False, False), |
|
2383 | (removed, undelete, None, False, False), | |
2383 | (deleted, revert, remove, False, False), |
|
2384 | (deleted, revert, remove, False, False), | |
2384 | (unknown, add, None, True, False), |
|
2385 | (unknown, add, None, True, False), | |
2385 | (target_only, add, None, False, False), |
|
2386 | (target_only, add, None, False, False), | |
2386 | ) |
|
2387 | ) | |
2387 |
|
2388 | |||
2388 | entries = names.items() |
|
2389 | entries = names.items() | |
2389 | entries.sort() |
|
2390 | entries.sort() | |
2390 |
|
2391 | |||
2391 | for abs, (rel, exact) in entries: |
|
2392 | for abs, (rel, exact) in entries: | |
2392 | mfentry = mf.get(abs) |
|
2393 | mfentry = mf.get(abs) | |
2393 | target = repo.wjoin(abs) |
|
2394 | target = repo.wjoin(abs) | |
2394 | def handle(xlist, dobackup): |
|
2395 | def handle(xlist, dobackup): | |
2395 | xlist[0].append(abs) |
|
2396 | xlist[0].append(abs) | |
2396 | update[abs] = 1 |
|
2397 | update[abs] = 1 | |
2397 | if dobackup and not opts['no_backup'] and util.lexists(target): |
|
2398 | if dobackup and not opts['no_backup'] and util.lexists(target): | |
2398 | bakname = "%s.orig" % rel |
|
2399 | bakname = "%s.orig" % rel | |
2399 | ui.note(_('saving current version of %s as %s\n') % |
|
2400 | ui.note(_('saving current version of %s as %s\n') % | |
2400 | (rel, bakname)) |
|
2401 | (rel, bakname)) | |
2401 | if not opts.get('dry_run'): |
|
2402 | if not opts.get('dry_run'): | |
2402 | util.copyfile(target, bakname) |
|
2403 | util.copyfile(target, bakname) | |
2403 | if ui.verbose or not exact: |
|
2404 | if ui.verbose or not exact: | |
2404 | ui.status(xlist[1] % rel) |
|
2405 | ui.status(xlist[1] % rel) | |
2405 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
2406 | for table, hitlist, misslist, backuphit, backupmiss in disptable: | |
2406 | if abs not in table: continue |
|
2407 | if abs not in table: continue | |
2407 | # file has changed in dirstate |
|
2408 | # file has changed in dirstate | |
2408 | if mfentry: |
|
2409 | if mfentry: | |
2409 | handle(hitlist, backuphit) |
|
2410 | handle(hitlist, backuphit) | |
2410 | elif misslist is not None: |
|
2411 | elif misslist is not None: | |
2411 | handle(misslist, backupmiss) |
|
2412 | handle(misslist, backupmiss) | |
2412 | else: |
|
2413 | else: | |
2413 | if exact: ui.warn(_('file not managed: %s\n') % rel) |
|
2414 | if exact: ui.warn(_('file not managed: %s\n') % rel) | |
2414 | break |
|
2415 | break | |
2415 | else: |
|
2416 | else: | |
2416 | # file has not changed in dirstate |
|
2417 | # file has not changed in dirstate | |
2417 | if node == parent: |
|
2418 | if node == parent: | |
2418 | if exact: ui.warn(_('no changes needed to %s\n') % rel) |
|
2419 | if exact: ui.warn(_('no changes needed to %s\n') % rel) | |
2419 | continue |
|
2420 | continue | |
2420 | if pmf is None: |
|
2421 | if pmf is None: | |
2421 | # only need parent manifest in this unlikely case, |
|
2422 | # only need parent manifest in this unlikely case, | |
2422 | # so do not read by default |
|
2423 | # so do not read by default | |
2423 | pmf = repo.changectx(parent).manifest() |
|
2424 | pmf = repo.changectx(parent).manifest() | |
2424 | if abs in pmf: |
|
2425 | if abs in pmf: | |
2425 | if mfentry: |
|
2426 | if mfentry: | |
2426 | # if version of file is same in parent and target |
|
2427 | # if version of file is same in parent and target | |
2427 | # manifests, do nothing |
|
2428 | # manifests, do nothing | |
2428 | if pmf[abs] != mfentry: |
|
2429 | if pmf[abs] != mfentry: | |
2429 | handle(revert, False) |
|
2430 | handle(revert, False) | |
2430 | else: |
|
2431 | else: | |
2431 | handle(remove, False) |
|
2432 | handle(remove, False) | |
2432 |
|
2433 | |||
2433 | if not opts.get('dry_run'): |
|
2434 | if not opts.get('dry_run'): | |
2434 | for f in forget[0]: |
|
2435 | for f in forget[0]: | |
2435 | repo.dirstate.forget(f) |
|
2436 | repo.dirstate.forget(f) | |
2436 | r = hg.revert(repo, node, update.has_key) |
|
2437 | r = hg.revert(repo, node, update.has_key) | |
2437 | for f in add[0]: |
|
2438 | for f in add[0]: | |
2438 | repo.dirstate.add(f) |
|
2439 | repo.dirstate.add(f) | |
2439 | for f in undelete[0]: |
|
2440 | for f in undelete[0]: | |
2440 | repo.dirstate.normal(f) |
|
2441 | repo.dirstate.normal(f) | |
2441 | for f in remove[0]: |
|
2442 | for f in remove[0]: | |
2442 | repo.dirstate.remove(f) |
|
2443 | repo.dirstate.remove(f) | |
2443 | return r |
|
2444 | return r | |
2444 | finally: |
|
2445 | finally: | |
2445 | del wlock |
|
2446 | del wlock | |
2446 |
|
2447 | |||
2447 | def rollback(ui, repo): |
|
2448 | def rollback(ui, repo): | |
2448 | """roll back the last transaction in this repository |
|
2449 | """roll back the last transaction in this repository | |
2449 |
|
2450 | |||
2450 | Roll back the last transaction in this repository, restoring the |
|
2451 | Roll back the last transaction in this repository, restoring the | |
2451 | project to its state prior to the transaction. |
|
2452 | project to its state prior to the transaction. | |
2452 |
|
2453 | |||
2453 | Transactions are used to encapsulate the effects of all commands |
|
2454 | Transactions are used to encapsulate the effects of all commands | |
2454 | that create new changesets or propagate existing changesets into a |
|
2455 | that create new changesets or propagate existing changesets into a | |
2455 | repository. For example, the following commands are transactional, |
|
2456 | repository. For example, the following commands are transactional, | |
2456 | and their effects can be rolled back: |
|
2457 | and their effects can be rolled back: | |
2457 |
|
2458 | |||
2458 | commit |
|
2459 | commit | |
2459 | import |
|
2460 | import | |
2460 | pull |
|
2461 | pull | |
2461 | push (with this repository as destination) |
|
2462 | push (with this repository as destination) | |
2462 | unbundle |
|
2463 | unbundle | |
2463 |
|
2464 | |||
2464 | This command should be used with care. There is only one level of |
|
2465 | This command should be used with care. There is only one level of | |
2465 | rollback, and there is no way to undo a rollback. It will also |
|
2466 | rollback, and there is no way to undo a rollback. It will also | |
2466 | restore the dirstate at the time of the last transaction, which |
|
2467 | restore the dirstate at the time of the last transaction, which | |
2467 | may lose subsequent dirstate changes. |
|
2468 | may lose subsequent dirstate changes. | |
2468 |
|
2469 | |||
2469 | This command is not intended for use on public repositories. Once |
|
2470 | This command is not intended for use on public repositories. Once | |
2470 | changes are visible for pull by other users, rolling a transaction |
|
2471 | changes are visible for pull by other users, rolling a transaction | |
2471 | back locally is ineffective (someone else may already have pulled |
|
2472 | back locally is ineffective (someone else may already have pulled | |
2472 | the changes). Furthermore, a race is possible with readers of the |
|
2473 | the changes). Furthermore, a race is possible with readers of the | |
2473 | repository; for example an in-progress pull from the repository |
|
2474 | repository; for example an in-progress pull from the repository | |
2474 | may fail if a rollback is performed. |
|
2475 | may fail if a rollback is performed. | |
2475 | """ |
|
2476 | """ | |
2476 | repo.rollback() |
|
2477 | repo.rollback() | |
2477 |
|
2478 | |||
2478 | def root(ui, repo): |
|
2479 | def root(ui, repo): | |
2479 | """print the root (top) of the current working dir |
|
2480 | """print the root (top) of the current working dir | |
2480 |
|
2481 | |||
2481 | Print the root directory of the current repository. |
|
2482 | Print the root directory of the current repository. | |
2482 | """ |
|
2483 | """ | |
2483 | ui.write(repo.root + "\n") |
|
2484 | ui.write(repo.root + "\n") | |
2484 |
|
2485 | |||
2485 | def serve(ui, repo, **opts): |
|
2486 | def serve(ui, repo, **opts): | |
2486 | """export the repository via HTTP |
|
2487 | """export the repository via HTTP | |
2487 |
|
2488 | |||
2488 | Start a local HTTP repository browser and pull server. |
|
2489 | Start a local HTTP repository browser and pull server. | |
2489 |
|
2490 | |||
2490 | By default, the server logs accesses to stdout and errors to |
|
2491 | By default, the server logs accesses to stdout and errors to | |
2491 | stderr. Use the "-A" and "-E" options to log to files. |
|
2492 | stderr. Use the "-A" and "-E" options to log to files. | |
2492 | """ |
|
2493 | """ | |
2493 |
|
2494 | |||
2494 | if opts["stdio"]: |
|
2495 | if opts["stdio"]: | |
2495 | if repo is None: |
|
2496 | if repo is None: | |
2496 | raise hg.RepoError(_("There is no Mercurial repository here" |
|
2497 | raise hg.RepoError(_("There is no Mercurial repository here" | |
2497 | " (.hg not found)")) |
|
2498 | " (.hg not found)")) | |
2498 | s = sshserver.sshserver(ui, repo) |
|
2499 | s = sshserver.sshserver(ui, repo) | |
2499 | s.serve_forever() |
|
2500 | s.serve_forever() | |
2500 |
|
2501 | |||
2501 | parentui = ui.parentui or ui |
|
2502 | parentui = ui.parentui or ui | |
2502 | optlist = ("name templates style address port ipv6" |
|
2503 | optlist = ("name templates style address port ipv6" | |
2503 | " accesslog errorlog webdir_conf certificate") |
|
2504 | " accesslog errorlog webdir_conf certificate") | |
2504 | for o in optlist.split(): |
|
2505 | for o in optlist.split(): | |
2505 | if opts[o]: |
|
2506 | if opts[o]: | |
2506 | parentui.setconfig("web", o, str(opts[o])) |
|
2507 | parentui.setconfig("web", o, str(opts[o])) | |
2507 | if (repo is not None) and (repo.ui != parentui): |
|
2508 | if (repo is not None) and (repo.ui != parentui): | |
2508 | repo.ui.setconfig("web", o, str(opts[o])) |
|
2509 | repo.ui.setconfig("web", o, str(opts[o])) | |
2509 |
|
2510 | |||
2510 | if repo is None and not ui.config("web", "webdir_conf"): |
|
2511 | if repo is None and not ui.config("web", "webdir_conf"): | |
2511 | raise hg.RepoError(_("There is no Mercurial repository here" |
|
2512 | raise hg.RepoError(_("There is no Mercurial repository here" | |
2512 | " (.hg not found)")) |
|
2513 | " (.hg not found)")) | |
2513 |
|
2514 | |||
2514 | class service: |
|
2515 | class service: | |
2515 | def init(self): |
|
2516 | def init(self): | |
2516 | util.set_signal_handler() |
|
2517 | util.set_signal_handler() | |
2517 | try: |
|
2518 | try: | |
2518 | self.httpd = hgweb.server.create_server(parentui, repo) |
|
2519 | self.httpd = hgweb.server.create_server(parentui, repo) | |
2519 | except socket.error, inst: |
|
2520 | except socket.error, inst: | |
2520 | raise util.Abort(_('cannot start server: ') + inst.args[1]) |
|
2521 | raise util.Abort(_('cannot start server: ') + inst.args[1]) | |
2521 |
|
2522 | |||
2522 | if not ui.verbose: return |
|
2523 | if not ui.verbose: return | |
2523 |
|
2524 | |||
2524 | if self.httpd.port != 80: |
|
2525 | if self.httpd.port != 80: | |
2525 | ui.status(_('listening at http://%s:%d/\n') % |
|
2526 | ui.status(_('listening at http://%s:%d/\n') % | |
2526 | (self.httpd.addr, self.httpd.port)) |
|
2527 | (self.httpd.addr, self.httpd.port)) | |
2527 | else: |
|
2528 | else: | |
2528 | ui.status(_('listening at http://%s/\n') % self.httpd.addr) |
|
2529 | ui.status(_('listening at http://%s/\n') % self.httpd.addr) | |
2529 |
|
2530 | |||
2530 | def run(self): |
|
2531 | def run(self): | |
2531 | self.httpd.serve_forever() |
|
2532 | self.httpd.serve_forever() | |
2532 |
|
2533 | |||
2533 | service = service() |
|
2534 | service = service() | |
2534 |
|
2535 | |||
2535 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
2536 | cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
2536 |
|
2537 | |||
2537 | def status(ui, repo, *pats, **opts): |
|
2538 | def status(ui, repo, *pats, **opts): | |
2538 | """show changed files in the working directory |
|
2539 | """show changed files in the working directory | |
2539 |
|
2540 | |||
2540 | Show status of files in the repository. If names are given, only |
|
2541 | Show status of files in the repository. If names are given, only | |
2541 | files that match are shown. Files that are clean or ignored, are |
|
2542 | files that match are shown. Files that are clean or ignored, are | |
2542 | not listed unless -c (clean), -i (ignored) or -A is given. |
|
2543 | not listed unless -c (clean), -i (ignored) or -A is given. | |
2543 |
|
2544 | |||
2544 | NOTE: status may appear to disagree with diff if permissions have |
|
2545 | NOTE: status may appear to disagree with diff if permissions have | |
2545 | changed or a merge has occurred. The standard diff format does not |
|
2546 | changed or a merge has occurred. The standard diff format does not | |
2546 | report permission changes and diff only reports changes relative |
|
2547 | report permission changes and diff only reports changes relative | |
2547 | to one merge parent. |
|
2548 | to one merge parent. | |
2548 |
|
2549 | |||
2549 | If one revision is given, it is used as the base revision. |
|
2550 | If one revision is given, it is used as the base revision. | |
2550 | If two revisions are given, the difference between them is shown. |
|
2551 | If two revisions are given, the difference between them is shown. | |
2551 |
|
2552 | |||
2552 | The codes used to show the status of files are: |
|
2553 | The codes used to show the status of files are: | |
2553 | M = modified |
|
2554 | M = modified | |
2554 | A = added |
|
2555 | A = added | |
2555 | R = removed |
|
2556 | R = removed | |
2556 | C = clean |
|
2557 | C = clean | |
2557 | ! = deleted, but still tracked |
|
2558 | ! = deleted, but still tracked | |
2558 | ? = not tracked |
|
2559 | ? = not tracked | |
2559 | I = ignored (not shown by default) |
|
2560 | I = ignored (not shown by default) | |
2560 | = the previous added file was copied from here |
|
2561 | = the previous added file was copied from here | |
2561 | """ |
|
2562 | """ | |
2562 |
|
2563 | |||
2563 | all = opts['all'] |
|
2564 | all = opts['all'] | |
2564 | node1, node2 = cmdutil.revpair(repo, opts.get('rev')) |
|
2565 | node1, node2 = cmdutil.revpair(repo, opts.get('rev')) | |
2565 |
|
2566 | |||
2566 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
|
2567 | files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | |
2567 | cwd = (pats and repo.getcwd()) or '' |
|
2568 | cwd = (pats and repo.getcwd()) or '' | |
2568 | modified, added, removed, deleted, unknown, ignored, clean = [ |
|
2569 | modified, added, removed, deleted, unknown, ignored, clean = [ | |
2569 | n for n in repo.status(node1=node1, node2=node2, files=files, |
|
2570 | n for n in repo.status(node1=node1, node2=node2, files=files, | |
2570 | match=matchfn, |
|
2571 | match=matchfn, | |
2571 | list_ignored=all or opts['ignored'], |
|
2572 | list_ignored=all or opts['ignored'], | |
2572 | list_clean=all or opts['clean'])] |
|
2573 | list_clean=all or opts['clean'])] | |
2573 |
|
2574 | |||
2574 | changetypes = (('modified', 'M', modified), |
|
2575 | changetypes = (('modified', 'M', modified), | |
2575 | ('added', 'A', added), |
|
2576 | ('added', 'A', added), | |
2576 | ('removed', 'R', removed), |
|
2577 | ('removed', 'R', removed), | |
2577 | ('deleted', '!', deleted), |
|
2578 | ('deleted', '!', deleted), | |
2578 | ('unknown', '?', unknown), |
|
2579 | ('unknown', '?', unknown), | |
2579 | ('ignored', 'I', ignored)) |
|
2580 | ('ignored', 'I', ignored)) | |
2580 |
|
2581 | |||
2581 | explicit_changetypes = changetypes + (('clean', 'C', clean),) |
|
2582 | explicit_changetypes = changetypes + (('clean', 'C', clean),) | |
2582 |
|
2583 | |||
2583 | end = opts['print0'] and '\0' or '\n' |
|
2584 | end = opts['print0'] and '\0' or '\n' | |
2584 |
|
2585 | |||
2585 | for opt, char, changes in ([ct for ct in explicit_changetypes |
|
2586 | for opt, char, changes in ([ct for ct in explicit_changetypes | |
2586 | if all or opts[ct[0]]] |
|
2587 | if all or opts[ct[0]]] | |
2587 | or changetypes): |
|
2588 | or changetypes): | |
2588 | if opts['no_status']: |
|
2589 | if opts['no_status']: | |
2589 | format = "%%s%s" % end |
|
2590 | format = "%%s%s" % end | |
2590 | else: |
|
2591 | else: | |
2591 | format = "%s %%s%s" % (char, end) |
|
2592 | format = "%s %%s%s" % (char, end) | |
2592 |
|
2593 | |||
2593 | for f in changes: |
|
2594 | for f in changes: | |
2594 | ui.write(format % repo.pathto(f, cwd)) |
|
2595 | ui.write(format % repo.pathto(f, cwd)) | |
2595 | if ((all or opts.get('copies')) and not opts.get('no_status')): |
|
2596 | if ((all or opts.get('copies')) and not opts.get('no_status')): | |
2596 | copied = repo.dirstate.copied(f) |
|
2597 | copied = repo.dirstate.copied(f) | |
2597 | if copied: |
|
2598 | if copied: | |
2598 | ui.write(' %s%s' % (repo.pathto(copied, cwd), end)) |
|
2599 | ui.write(' %s%s' % (repo.pathto(copied, cwd), end)) | |
2599 |
|
2600 | |||
2600 | def tag(ui, repo, name, rev_=None, **opts): |
|
2601 | def tag(ui, repo, name, rev_=None, **opts): | |
2601 | """add a tag for the current or given revision |
|
2602 | """add a tag for the current or given revision | |
2602 |
|
2603 | |||
2603 | Name a particular revision using <name>. |
|
2604 | Name a particular revision using <name>. | |
2604 |
|
2605 | |||
2605 | Tags are used to name particular revisions of the repository and are |
|
2606 | Tags are used to name particular revisions of the repository and are | |
2606 | very useful to compare different revision, to go back to significant |
|
2607 | very useful to compare different revision, to go back to significant | |
2607 | earlier versions or to mark branch points as releases, etc. |
|
2608 | earlier versions or to mark branch points as releases, etc. | |
2608 |
|
2609 | |||
2609 | If no revision is given, the parent of the working directory is used, |
|
2610 | If no revision is given, the parent of the working directory is used, | |
2610 | or tip if no revision is checked out. |
|
2611 | or tip if no revision is checked out. | |
2611 |
|
2612 | |||
2612 | To facilitate version control, distribution, and merging of tags, |
|
2613 | To facilitate version control, distribution, and merging of tags, | |
2613 | they are stored as a file named ".hgtags" which is managed |
|
2614 | they are stored as a file named ".hgtags" which is managed | |
2614 | similarly to other project files and can be hand-edited if |
|
2615 | similarly to other project files and can be hand-edited if | |
2615 | necessary. The file '.hg/localtags' is used for local tags (not |
|
2616 | necessary. The file '.hg/localtags' is used for local tags (not | |
2616 | shared among repositories). |
|
2617 | shared among repositories). | |
2617 | """ |
|
2618 | """ | |
2618 | if name in ['tip', '.', 'null']: |
|
2619 | if name in ['tip', '.', 'null']: | |
2619 | raise util.Abort(_("the name '%s' is reserved") % name) |
|
2620 | raise util.Abort(_("the name '%s' is reserved") % name) | |
2620 | if rev_ is not None: |
|
2621 | if rev_ is not None: | |
2621 | ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " |
|
2622 | ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " | |
2622 | "please use 'hg tag [-r REV] NAME' instead\n")) |
|
2623 | "please use 'hg tag [-r REV] NAME' instead\n")) | |
2623 | if opts['rev']: |
|
2624 | if opts['rev']: | |
2624 | raise util.Abort(_("use only one form to specify the revision")) |
|
2625 | raise util.Abort(_("use only one form to specify the revision")) | |
2625 | if opts['rev'] and opts['remove']: |
|
2626 | if opts['rev'] and opts['remove']: | |
2626 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
2627 | raise util.Abort(_("--rev and --remove are incompatible")) | |
2627 | if opts['rev']: |
|
2628 | if opts['rev']: | |
2628 | rev_ = opts['rev'] |
|
2629 | rev_ = opts['rev'] | |
2629 | message = opts['message'] |
|
2630 | message = opts['message'] | |
2630 | if opts['remove']: |
|
2631 | if opts['remove']: | |
2631 | if not name in repo.tags(): |
|
2632 | if not name in repo.tags(): | |
2632 | raise util.Abort(_('tag %s does not exist') % name) |
|
2633 | raise util.Abort(_('tag %s does not exist') % name) | |
2633 | rev_ = nullid |
|
2634 | rev_ = nullid | |
2634 | if not message: |
|
2635 | if not message: | |
2635 | message = _('Removed tag %s') % name |
|
2636 | message = _('Removed tag %s') % name | |
2636 | elif name in repo.tags() and not opts['force']: |
|
2637 | elif name in repo.tags() and not opts['force']: | |
2637 | raise util.Abort(_('a tag named %s already exists (use -f to force)') |
|
2638 | raise util.Abort(_('a tag named %s already exists (use -f to force)') | |
2638 | % name) |
|
2639 | % name) | |
2639 | if not rev_ and repo.dirstate.parents()[1] != nullid: |
|
2640 | if not rev_ and repo.dirstate.parents()[1] != nullid: | |
2640 | raise util.Abort(_('uncommitted merge - please provide a ' |
|
2641 | raise util.Abort(_('uncommitted merge - please provide a ' | |
2641 | 'specific revision')) |
|
2642 | 'specific revision')) | |
2642 | r = repo.changectx(rev_).node() |
|
2643 | r = repo.changectx(rev_).node() | |
2643 |
|
2644 | |||
2644 | if not message: |
|
2645 | if not message: | |
2645 | message = _('Added tag %s for changeset %s') % (name, short(r)) |
|
2646 | message = _('Added tag %s for changeset %s') % (name, short(r)) | |
2646 |
|
2647 | |||
2647 | repo.tag(name, r, message, opts['local'], opts['user'], opts['date']) |
|
2648 | repo.tag(name, r, message, opts['local'], opts['user'], opts['date']) | |
2648 |
|
2649 | |||
2649 | def tags(ui, repo): |
|
2650 | def tags(ui, repo): | |
2650 | """list repository tags |
|
2651 | """list repository tags | |
2651 |
|
2652 | |||
2652 | List the repository tags. |
|
2653 | List the repository tags. | |
2653 |
|
2654 | |||
2654 | This lists both regular and local tags. |
|
2655 | This lists both regular and local tags. | |
2655 | """ |
|
2656 | """ | |
2656 |
|
2657 | |||
2657 | l = repo.tagslist() |
|
2658 | l = repo.tagslist() | |
2658 | l.reverse() |
|
2659 | l.reverse() | |
2659 | hexfunc = ui.debugflag and hex or short |
|
2660 | hexfunc = ui.debugflag and hex or short | |
2660 | for t, n in l: |
|
2661 | for t, n in l: | |
2661 | try: |
|
2662 | try: | |
2662 | hn = hexfunc(n) |
|
2663 | hn = hexfunc(n) | |
2663 | r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n)) |
|
2664 | r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n)) | |
2664 | except revlog.LookupError: |
|
2665 | except revlog.LookupError: | |
2665 | r = " ?:%s" % hn |
|
2666 | r = " ?:%s" % hn | |
2666 | if ui.quiet: |
|
2667 | if ui.quiet: | |
2667 | ui.write("%s\n" % t) |
|
2668 | ui.write("%s\n" % t) | |
2668 | else: |
|
2669 | else: | |
2669 | spaces = " " * (30 - util.locallen(t)) |
|
2670 | spaces = " " * (30 - util.locallen(t)) | |
2670 | ui.write("%s%s %s\n" % (t, spaces, r)) |
|
2671 | ui.write("%s%s %s\n" % (t, spaces, r)) | |
2671 |
|
2672 | |||
2672 | def tip(ui, repo, **opts): |
|
2673 | def tip(ui, repo, **opts): | |
2673 | """show the tip revision |
|
2674 | """show the tip revision | |
2674 |
|
2675 | |||
2675 | Show the tip revision. |
|
2676 | Show the tip revision. | |
2676 | """ |
|
2677 | """ | |
2677 | cmdutil.show_changeset(ui, repo, opts).show(nullrev+repo.changelog.count()) |
|
2678 | cmdutil.show_changeset(ui, repo, opts).show(nullrev+repo.changelog.count()) | |
2678 |
|
2679 | |||
2679 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
2680 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
2680 | """apply one or more changegroup files |
|
2681 | """apply one or more changegroup files | |
2681 |
|
2682 | |||
2682 | Apply one or more compressed changegroup files generated by the |
|
2683 | Apply one or more compressed changegroup files generated by the | |
2683 | bundle command. |
|
2684 | bundle command. | |
2684 | """ |
|
2685 | """ | |
2685 | fnames = (fname1,) + fnames |
|
2686 | fnames = (fname1,) + fnames | |
2686 | for fname in fnames: |
|
2687 | for fname in fnames: | |
2687 | if os.path.exists(fname): |
|
2688 | if os.path.exists(fname): | |
2688 | f = open(fname, "rb") |
|
2689 | f = open(fname, "rb") | |
2689 | else: |
|
2690 | else: | |
2690 | f = urllib.urlopen(fname) |
|
2691 | f = urllib.urlopen(fname) | |
2691 | gen = changegroup.readbundle(f, fname) |
|
2692 | gen = changegroup.readbundle(f, fname) | |
2692 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
|
2693 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) | |
2693 |
|
2694 | |||
2694 | return postincoming(ui, repo, modheads, opts['update'], None) |
|
2695 | return postincoming(ui, repo, modheads, opts['update'], None) | |
2695 |
|
2696 | |||
2696 | def update(ui, repo, node=None, rev=None, clean=False, date=None): |
|
2697 | def update(ui, repo, node=None, rev=None, clean=False, date=None): | |
2697 | """update working directory |
|
2698 | """update working directory | |
2698 |
|
2699 | |||
2699 | Update the working directory to the specified revision, or the |
|
2700 | Update the working directory to the specified revision, or the | |
2700 | tip of the current branch if none is specified. |
|
2701 | tip of the current branch if none is specified. | |
2701 |
|
2702 | |||
2702 | If there are no outstanding changes in the working directory and |
|
2703 | If there are no outstanding changes in the working directory and | |
2703 | there is a linear relationship between the current version and the |
|
2704 | there is a linear relationship between the current version and the | |
2704 | requested version, the result is the requested version. |
|
2705 | requested version, the result is the requested version. | |
2705 |
|
2706 | |||
2706 | To merge the working directory with another revision, use the |
|
2707 | To merge the working directory with another revision, use the | |
2707 | merge command. |
|
2708 | merge command. | |
2708 |
|
2709 | |||
2709 | By default, update will refuse to run if doing so would require |
|
2710 | By default, update will refuse to run if doing so would require | |
2710 | discarding local changes. |
|
2711 | discarding local changes. | |
2711 | """ |
|
2712 | """ | |
2712 | if rev and node: |
|
2713 | if rev and node: | |
2713 | raise util.Abort(_("please specify just one revision")) |
|
2714 | raise util.Abort(_("please specify just one revision")) | |
2714 |
|
2715 | |||
2715 | if not rev: |
|
2716 | if not rev: | |
2716 | rev = node |
|
2717 | rev = node | |
2717 |
|
2718 | |||
2718 | if date: |
|
2719 | if date: | |
2719 | if rev: |
|
2720 | if rev: | |
2720 | raise util.Abort(_("you can't specify a revision and a date")) |
|
2721 | raise util.Abort(_("you can't specify a revision and a date")) | |
2721 | rev = cmdutil.finddate(ui, repo, date) |
|
2722 | rev = cmdutil.finddate(ui, repo, date) | |
2722 |
|
2723 | |||
2723 | if clean: |
|
2724 | if clean: | |
2724 | return hg.clean(repo, rev) |
|
2725 | return hg.clean(repo, rev) | |
2725 | else: |
|
2726 | else: | |
2726 | return hg.update(repo, rev) |
|
2727 | return hg.update(repo, rev) | |
2727 |
|
2728 | |||
2728 | def verify(ui, repo): |
|
2729 | def verify(ui, repo): | |
2729 | """verify the integrity of the repository |
|
2730 | """verify the integrity of the repository | |
2730 |
|
2731 | |||
2731 | Verify the integrity of the current repository. |
|
2732 | Verify the integrity of the current repository. | |
2732 |
|
2733 | |||
2733 | This will perform an extensive check of the repository's |
|
2734 | This will perform an extensive check of the repository's | |
2734 | integrity, validating the hashes and checksums of each entry in |
|
2735 | integrity, validating the hashes and checksums of each entry in | |
2735 | the changelog, manifest, and tracked files, as well as the |
|
2736 | the changelog, manifest, and tracked files, as well as the | |
2736 | integrity of their crosslinks and indices. |
|
2737 | integrity of their crosslinks and indices. | |
2737 | """ |
|
2738 | """ | |
2738 | return hg.verify(repo) |
|
2739 | return hg.verify(repo) | |
2739 |
|
2740 | |||
2740 | def version_(ui): |
|
2741 | def version_(ui): | |
2741 | """output version and copyright information""" |
|
2742 | """output version and copyright information""" | |
2742 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
2743 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
2743 | % version.get_version()) |
|
2744 | % version.get_version()) | |
2744 | ui.status(_( |
|
2745 | ui.status(_( | |
2745 | "\nCopyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others\n" |
|
2746 | "\nCopyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others\n" | |
2746 | "This is free software; see the source for copying conditions. " |
|
2747 | "This is free software; see the source for copying conditions. " | |
2747 | "There is NO\nwarranty; " |
|
2748 | "There is NO\nwarranty; " | |
2748 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
2749 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
2749 | )) |
|
2750 | )) | |
2750 |
|
2751 | |||
2751 | # Command options and aliases are listed here, alphabetically |
|
2752 | # Command options and aliases are listed here, alphabetically | |
2752 |
|
2753 | |||
2753 | globalopts = [ |
|
2754 | globalopts = [ | |
2754 | ('R', 'repository', '', |
|
2755 | ('R', 'repository', '', | |
2755 | _('repository root directory or symbolic path name')), |
|
2756 | _('repository root directory or symbolic path name')), | |
2756 | ('', 'cwd', '', _('change working directory')), |
|
2757 | ('', 'cwd', '', _('change working directory')), | |
2757 | ('y', 'noninteractive', None, |
|
2758 | ('y', 'noninteractive', None, | |
2758 | _('do not prompt, assume \'yes\' for any required answers')), |
|
2759 | _('do not prompt, assume \'yes\' for any required answers')), | |
2759 | ('q', 'quiet', None, _('suppress output')), |
|
2760 | ('q', 'quiet', None, _('suppress output')), | |
2760 | ('v', 'verbose', None, _('enable additional output')), |
|
2761 | ('v', 'verbose', None, _('enable additional output')), | |
2761 | ('', 'config', [], _('set/override config option')), |
|
2762 | ('', 'config', [], _('set/override config option')), | |
2762 | ('', 'debug', None, _('enable debugging output')), |
|
2763 | ('', 'debug', None, _('enable debugging output')), | |
2763 | ('', 'debugger', None, _('start debugger')), |
|
2764 | ('', 'debugger', None, _('start debugger')), | |
2764 | ('', 'encoding', util._encoding, _('set the charset encoding')), |
|
2765 | ('', 'encoding', util._encoding, _('set the charset encoding')), | |
2765 | ('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')), |
|
2766 | ('', 'encodingmode', util._encodingmode, _('set the charset encoding mode')), | |
2766 | ('', 'lsprof', None, _('print improved command execution profile')), |
|
2767 | ('', 'lsprof', None, _('print improved command execution profile')), | |
2767 | ('', 'traceback', None, _('print traceback on exception')), |
|
2768 | ('', 'traceback', None, _('print traceback on exception')), | |
2768 | ('', 'time', None, _('time how long the command takes')), |
|
2769 | ('', 'time', None, _('time how long the command takes')), | |
2769 | ('', 'profile', None, _('print command execution profile')), |
|
2770 | ('', 'profile', None, _('print command execution profile')), | |
2770 | ('', 'version', None, _('output version information and exit')), |
|
2771 | ('', 'version', None, _('output version information and exit')), | |
2771 | ('h', 'help', None, _('display help and exit')), |
|
2772 | ('h', 'help', None, _('display help and exit')), | |
2772 | ] |
|
2773 | ] | |
2773 |
|
2774 | |||
2774 | dryrunopts = [('n', 'dry-run', None, |
|
2775 | dryrunopts = [('n', 'dry-run', None, | |
2775 | _('do not perform actions, just print output'))] |
|
2776 | _('do not perform actions, just print output'))] | |
2776 |
|
2777 | |||
2777 | remoteopts = [ |
|
2778 | remoteopts = [ | |
2778 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
2779 | ('e', 'ssh', '', _('specify ssh command to use')), | |
2779 | ('', 'remotecmd', '', _('specify hg command to run on the remote side')), |
|
2780 | ('', 'remotecmd', '', _('specify hg command to run on the remote side')), | |
2780 | ] |
|
2781 | ] | |
2781 |
|
2782 | |||
2782 | walkopts = [ |
|
2783 | walkopts = [ | |
2783 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2784 | ('I', 'include', [], _('include names matching the given patterns')), | |
2784 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2785 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2785 | ] |
|
2786 | ] | |
2786 |
|
2787 | |||
2787 | commitopts = [ |
|
2788 | commitopts = [ | |
2788 | ('m', 'message', '', _('use <text> as commit message')), |
|
2789 | ('m', 'message', '', _('use <text> as commit message')), | |
2789 | ('l', 'logfile', '', _('read commit message from <file>')), |
|
2790 | ('l', 'logfile', '', _('read commit message from <file>')), | |
2790 | ] |
|
2791 | ] | |
2791 |
|
2792 | |||
2792 | commitopts2 = [ |
|
2793 | commitopts2 = [ | |
2793 | ('d', 'date', '', _('record datecode as commit date')), |
|
2794 | ('d', 'date', '', _('record datecode as commit date')), | |
2794 | ('u', 'user', '', _('record user as committer')), |
|
2795 | ('u', 'user', '', _('record user as committer')), | |
2795 | ] |
|
2796 | ] | |
2796 |
|
2797 | |||
2797 | table = { |
|
2798 | table = { | |
2798 | "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')), |
|
2799 | "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')), | |
2799 | "addremove": |
|
2800 | "addremove": | |
2800 | (addremove, |
|
2801 | (addremove, | |
2801 | [('s', 'similarity', '', |
|
2802 | [('s', 'similarity', '', | |
2802 | _('guess renamed files by similarity (0<=s<=100)')), |
|
2803 | _('guess renamed files by similarity (0<=s<=100)')), | |
2803 | ] + walkopts + dryrunopts, |
|
2804 | ] + walkopts + dryrunopts, | |
2804 | _('hg addremove [OPTION]... [FILE]...')), |
|
2805 | _('hg addremove [OPTION]... [FILE]...')), | |
2805 | "^annotate": |
|
2806 | "^annotate": | |
2806 | (annotate, |
|
2807 | (annotate, | |
2807 | [('r', 'rev', '', _('annotate the specified revision')), |
|
2808 | [('r', 'rev', '', _('annotate the specified revision')), | |
2808 | ('f', 'follow', None, _('follow file copies and renames')), |
|
2809 | ('f', 'follow', None, _('follow file copies and renames')), | |
2809 | ('a', 'text', None, _('treat all files as text')), |
|
2810 | ('a', 'text', None, _('treat all files as text')), | |
2810 | ('u', 'user', None, _('list the author')), |
|
2811 | ('u', 'user', None, _('list the author')), | |
2811 | ('d', 'date', None, _('list the date')), |
|
2812 | ('d', 'date', None, _('list the date')), | |
2812 | ('n', 'number', None, _('list the revision number (default)')), |
|
2813 | ('n', 'number', None, _('list the revision number (default)')), | |
2813 | ('c', 'changeset', None, _('list the changeset')), |
|
2814 | ('c', 'changeset', None, _('list the changeset')), | |
2814 | ('l', 'line-number', None, |
|
2815 | ('l', 'line-number', None, | |
2815 | _('show line number at the first appearance')) |
|
2816 | _('show line number at the first appearance')) | |
2816 | ] + walkopts, |
|
2817 | ] + walkopts, | |
2817 | _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')), |
|
2818 | _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')), | |
2818 | "archive": |
|
2819 | "archive": | |
2819 | (archive, |
|
2820 | (archive, | |
2820 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
2821 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
2821 | ('p', 'prefix', '', _('directory prefix for files in archive')), |
|
2822 | ('p', 'prefix', '', _('directory prefix for files in archive')), | |
2822 | ('r', 'rev', '', _('revision to distribute')), |
|
2823 | ('r', 'rev', '', _('revision to distribute')), | |
2823 | ('t', 'type', '', _('type of distribution to create')), |
|
2824 | ('t', 'type', '', _('type of distribution to create')), | |
2824 | ] + walkopts, |
|
2825 | ] + walkopts, | |
2825 | _('hg archive [OPTION]... DEST')), |
|
2826 | _('hg archive [OPTION]... DEST')), | |
2826 | "backout": |
|
2827 | "backout": | |
2827 | (backout, |
|
2828 | (backout, | |
2828 | [('', 'merge', None, |
|
2829 | [('', 'merge', None, | |
2829 | _('merge with old dirstate parent after backout')), |
|
2830 | _('merge with old dirstate parent after backout')), | |
2830 | ('', 'parent', '', _('parent to choose when backing out merge')), |
|
2831 | ('', 'parent', '', _('parent to choose when backing out merge')), | |
2831 | ('r', 'rev', '', _('revision to backout')), |
|
2832 | ('r', 'rev', '', _('revision to backout')), | |
2832 | ] + walkopts + commitopts + commitopts2, |
|
2833 | ] + walkopts + commitopts + commitopts2, | |
2833 | _('hg backout [OPTION]... [-r] REV')), |
|
2834 | _('hg backout [OPTION]... [-r] REV')), | |
2834 | "branch": |
|
2835 | "branch": | |
2835 | (branch, |
|
2836 | (branch, | |
2836 | [('f', 'force', None, |
|
2837 | [('f', 'force', None, | |
2837 | _('set branch name even if it shadows an existing branch'))], |
|
2838 | _('set branch name even if it shadows an existing branch'))], | |
2838 | _('hg branch [NAME]')), |
|
2839 | _('hg branch [NAME]')), | |
2839 | "branches": |
|
2840 | "branches": | |
2840 | (branches, |
|
2841 | (branches, | |
2841 | [('a', 'active', False, |
|
2842 | [('a', 'active', False, | |
2842 | _('show only branches that have unmerged heads'))], |
|
2843 | _('show only branches that have unmerged heads'))], | |
2843 | _('hg branches [-a]')), |
|
2844 | _('hg branches [-a]')), | |
2844 | "bundle": |
|
2845 | "bundle": | |
2845 | (bundle, |
|
2846 | (bundle, | |
2846 | [('f', 'force', None, |
|
2847 | [('f', 'force', None, | |
2847 | _('run even when remote repository is unrelated')), |
|
2848 | _('run even when remote repository is unrelated')), | |
2848 | ('r', 'rev', [], |
|
2849 | ('r', 'rev', [], | |
2849 | _('a changeset you would like to bundle')), |
|
2850 | _('a changeset you would like to bundle')), | |
2850 | ('', 'base', [], |
|
2851 | ('', 'base', [], | |
2851 | _('a base changeset to specify instead of a destination')), |
|
2852 | _('a base changeset to specify instead of a destination')), | |
2852 | ] + remoteopts, |
|
2853 | ] + remoteopts, | |
2853 | _('hg bundle [-f] [-r REV]... [--base REV]... FILE [DEST]')), |
|
2854 | _('hg bundle [-f] [-r REV]... [--base REV]... FILE [DEST]')), | |
2854 | "cat": |
|
2855 | "cat": | |
2855 | (cat, |
|
2856 | (cat, | |
2856 | [('o', 'output', '', _('print output to file with formatted name')), |
|
2857 | [('o', 'output', '', _('print output to file with formatted name')), | |
2857 | ('r', 'rev', '', _('print the given revision')), |
|
2858 | ('r', 'rev', '', _('print the given revision')), | |
2858 | ] + walkopts, |
|
2859 | ] + walkopts, | |
2859 | _('hg cat [OPTION]... FILE...')), |
|
2860 | _('hg cat [OPTION]... FILE...')), | |
2860 | "^clone": |
|
2861 | "^clone": | |
2861 | (clone, |
|
2862 | (clone, | |
2862 | [('U', 'noupdate', None, _('do not update the new working directory')), |
|
2863 | [('U', 'noupdate', None, _('do not update the new working directory')), | |
2863 | ('r', 'rev', [], |
|
2864 | ('r', 'rev', [], | |
2864 | _('a changeset you would like to have after cloning')), |
|
2865 | _('a changeset you would like to have after cloning')), | |
2865 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2866 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
2866 | ('', 'uncompressed', None, |
|
2867 | ('', 'uncompressed', None, | |
2867 | _('use uncompressed transfer (fast over LAN)')), |
|
2868 | _('use uncompressed transfer (fast over LAN)')), | |
2868 | ] + remoteopts, |
|
2869 | ] + remoteopts, | |
2869 | _('hg clone [OPTION]... SOURCE [DEST]')), |
|
2870 | _('hg clone [OPTION]... SOURCE [DEST]')), | |
2870 | "^commit|ci": |
|
2871 | "^commit|ci": | |
2871 | (commit, |
|
2872 | (commit, | |
2872 | [('A', 'addremove', None, |
|
2873 | [('A', 'addremove', None, | |
2873 | _('mark new/missing files as added/removed before committing')), |
|
2874 | _('mark new/missing files as added/removed before committing')), | |
2874 | ] + walkopts + commitopts + commitopts2, |
|
2875 | ] + walkopts + commitopts + commitopts2, | |
2875 | _('hg commit [OPTION]... [FILE]...')), |
|
2876 | _('hg commit [OPTION]... [FILE]...')), | |
2876 | "copy|cp": |
|
2877 | "copy|cp": | |
2877 | (copy, |
|
2878 | (copy, | |
2878 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
2879 | [('A', 'after', None, _('record a copy that has already occurred')), | |
2879 | ('f', 'force', None, |
|
2880 | ('f', 'force', None, | |
2880 | _('forcibly copy over an existing managed file')), |
|
2881 | _('forcibly copy over an existing managed file')), | |
2881 | ] + walkopts + dryrunopts, |
|
2882 | ] + walkopts + dryrunopts, | |
2882 | _('hg copy [OPTION]... [SOURCE]... DEST')), |
|
2883 | _('hg copy [OPTION]... [SOURCE]... DEST')), | |
2883 | "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), |
|
2884 | "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), | |
2884 | "debugcomplete": |
|
2885 | "debugcomplete": | |
2885 | (debugcomplete, |
|
2886 | (debugcomplete, | |
2886 | [('o', 'options', None, _('show the command options'))], |
|
2887 | [('o', 'options', None, _('show the command options'))], | |
2887 | _('debugcomplete [-o] CMD')), |
|
2888 | _('debugcomplete [-o] CMD')), | |
2888 | "debuginstall": (debuginstall, [], _('debuginstall')), |
|
2889 | "debuginstall": (debuginstall, [], _('debuginstall')), | |
2889 | "debugrebuildstate": |
|
2890 | "debugrebuildstate": | |
2890 | (debugrebuildstate, |
|
2891 | (debugrebuildstate, | |
2891 | [('r', 'rev', '', _('revision to rebuild to'))], |
|
2892 | [('r', 'rev', '', _('revision to rebuild to'))], | |
2892 | _('debugrebuildstate [-r REV] [REV]')), |
|
2893 | _('debugrebuildstate [-r REV] [REV]')), | |
2893 | "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), |
|
2894 | "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), | |
2894 | "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), |
|
2895 | "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), | |
2895 | "debugstate": (debugstate, [], _('debugstate')), |
|
2896 | "debugstate": (debugstate, [], _('debugstate')), | |
2896 | "debugdate": |
|
2897 | "debugdate": | |
2897 | (debugdate, |
|
2898 | (debugdate, | |
2898 | [('e', 'extended', None, _('try extended date formats'))], |
|
2899 | [('e', 'extended', None, _('try extended date formats'))], | |
2899 | _('debugdate [-e] DATE [RANGE]')), |
|
2900 | _('debugdate [-e] DATE [RANGE]')), | |
2900 | "debugdata": (debugdata, [], _('debugdata FILE REV')), |
|
2901 | "debugdata": (debugdata, [], _('debugdata FILE REV')), | |
2901 | "debugindex": (debugindex, [], _('debugindex FILE')), |
|
2902 | "debugindex": (debugindex, [], _('debugindex FILE')), | |
2902 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), |
|
2903 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), | |
2903 | "debugrename": |
|
2904 | "debugrename": | |
2904 | (debugrename, |
|
2905 | (debugrename, | |
2905 | [('r', 'rev', '', _('revision to debug'))], |
|
2906 | [('r', 'rev', '', _('revision to debug'))], | |
2906 | _('debugrename [-r REV] FILE')), |
|
2907 | _('debugrename [-r REV] FILE')), | |
2907 | "debugwalk": (debugwalk, walkopts, _('debugwalk [OPTION]... [FILE]...')), |
|
2908 | "debugwalk": (debugwalk, walkopts, _('debugwalk [OPTION]... [FILE]...')), | |
2908 | "^diff": |
|
2909 | "^diff": | |
2909 | (diff, |
|
2910 | (diff, | |
2910 | [('r', 'rev', [], _('revision')), |
|
2911 | [('r', 'rev', [], _('revision')), | |
2911 | ('a', 'text', None, _('treat all files as text')), |
|
2912 | ('a', 'text', None, _('treat all files as text')), | |
2912 | ('p', 'show-function', None, |
|
2913 | ('p', 'show-function', None, | |
2913 | _('show which function each change is in')), |
|
2914 | _('show which function each change is in')), | |
2914 | ('g', 'git', None, _('use git extended diff format')), |
|
2915 | ('g', 'git', None, _('use git extended diff format')), | |
2915 | ('', 'nodates', None, _("don't include dates in diff headers")), |
|
2916 | ('', 'nodates', None, _("don't include dates in diff headers")), | |
2916 | ('w', 'ignore-all-space', None, |
|
2917 | ('w', 'ignore-all-space', None, | |
2917 | _('ignore white space when comparing lines')), |
|
2918 | _('ignore white space when comparing lines')), | |
2918 | ('b', 'ignore-space-change', None, |
|
2919 | ('b', 'ignore-space-change', None, | |
2919 | _('ignore changes in the amount of white space')), |
|
2920 | _('ignore changes in the amount of white space')), | |
2920 | ('B', 'ignore-blank-lines', None, |
|
2921 | ('B', 'ignore-blank-lines', None, | |
2921 | _('ignore changes whose lines are all blank')), |
|
2922 | _('ignore changes whose lines are all blank')), | |
2922 | ] + walkopts, |
|
2923 | ] + walkopts, | |
2923 | _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), |
|
2924 | _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), | |
2924 | "^export": |
|
2925 | "^export": | |
2925 | (export, |
|
2926 | (export, | |
2926 | [('o', 'output', '', _('print output to file with formatted name')), |
|
2927 | [('o', 'output', '', _('print output to file with formatted name')), | |
2927 | ('a', 'text', None, _('treat all files as text')), |
|
2928 | ('a', 'text', None, _('treat all files as text')), | |
2928 | ('g', 'git', None, _('use git extended diff format')), |
|
2929 | ('g', 'git', None, _('use git extended diff format')), | |
2929 | ('', 'nodates', None, _("don't include dates in diff headers")), |
|
2930 | ('', 'nodates', None, _("don't include dates in diff headers")), | |
2930 | ('', 'switch-parent', None, _('diff against the second parent'))], |
|
2931 | ('', 'switch-parent', None, _('diff against the second parent'))], | |
2931 | _('hg export [OPTION]... [-o OUTFILESPEC] REV...')), |
|
2932 | _('hg export [OPTION]... [-o OUTFILESPEC] REV...')), | |
2932 | "grep": |
|
2933 | "grep": | |
2933 | (grep, |
|
2934 | (grep, | |
2934 | [('0', 'print0', None, _('end fields with NUL')), |
|
2935 | [('0', 'print0', None, _('end fields with NUL')), | |
2935 | ('', 'all', None, _('print all revisions that match')), |
|
2936 | ('', 'all', None, _('print all revisions that match')), | |
2936 | ('f', 'follow', None, |
|
2937 | ('f', 'follow', None, | |
2937 | _('follow changeset history, or file history across copies and renames')), |
|
2938 | _('follow changeset history, or file history across copies and renames')), | |
2938 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2939 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
2939 | ('l', 'files-with-matches', None, |
|
2940 | ('l', 'files-with-matches', None, | |
2940 | _('print only filenames and revs that match')), |
|
2941 | _('print only filenames and revs that match')), | |
2941 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2942 | ('n', 'line-number', None, _('print matching line numbers')), | |
2942 | ('r', 'rev', [], _('search in given revision range')), |
|
2943 | ('r', 'rev', [], _('search in given revision range')), | |
2943 | ('u', 'user', None, _('print user who committed change')), |
|
2944 | ('u', 'user', None, _('print user who committed change')), | |
2944 | ] + walkopts, |
|
2945 | ] + walkopts, | |
2945 | _('hg grep [OPTION]... PATTERN [FILE]...')), |
|
2946 | _('hg grep [OPTION]... PATTERN [FILE]...')), | |
2946 | "heads": |
|
2947 | "heads": | |
2947 | (heads, |
|
2948 | (heads, | |
2948 | [('', 'style', '', _('display using template map file')), |
|
2949 | [('', 'style', '', _('display using template map file')), | |
2949 | ('r', 'rev', '', _('show only heads which are descendants of rev')), |
|
2950 | ('r', 'rev', '', _('show only heads which are descendants of rev')), | |
2950 | ('', 'template', '', _('display with template'))], |
|
2951 | ('', 'template', '', _('display with template'))], | |
2951 | _('hg heads [-r REV] [REV]...')), |
|
2952 | _('hg heads [-r REV] [REV]...')), | |
2952 | "help": (help_, [], _('hg help [COMMAND]')), |
|
2953 | "help": (help_, [], _('hg help [COMMAND]')), | |
2953 | "identify|id": |
|
2954 | "identify|id": | |
2954 | (identify, |
|
2955 | (identify, | |
2955 | [('r', 'rev', '', _('identify the specified rev')), |
|
2956 | [('r', 'rev', '', _('identify the specified rev')), | |
2956 | ('n', 'num', None, _('show local revision number')), |
|
2957 | ('n', 'num', None, _('show local revision number')), | |
2957 | ('i', 'id', None, _('show global revision id')), |
|
2958 | ('i', 'id', None, _('show global revision id')), | |
2958 | ('b', 'branch', None, _('show branch')), |
|
2959 | ('b', 'branch', None, _('show branch')), | |
2959 | ('t', 'tags', None, _('show tags'))], |
|
2960 | ('t', 'tags', None, _('show tags'))], | |
2960 | _('hg identify [-nibt] [-r REV] [SOURCE]')), |
|
2961 | _('hg identify [-nibt] [-r REV] [SOURCE]')), | |
2961 | "import|patch": |
|
2962 | "import|patch": | |
2962 | (import_, |
|
2963 | (import_, | |
2963 | [('p', 'strip', 1, |
|
2964 | [('p', 'strip', 1, | |
2964 | _('directory strip option for patch. This has the same\n' |
|
2965 | _('directory strip option for patch. This has the same\n' | |
2965 | 'meaning as the corresponding patch option')), |
|
2966 | 'meaning as the corresponding patch option')), | |
2966 | ('b', 'base', '', _('base path')), |
|
2967 | ('b', 'base', '', _('base path')), | |
2967 | ('f', 'force', None, |
|
2968 | ('f', 'force', None, | |
2968 | _('skip check for outstanding uncommitted changes')), |
|
2969 | _('skip check for outstanding uncommitted changes')), | |
2969 | ('', 'exact', None, |
|
2970 | ('', 'exact', None, | |
2970 | _('apply patch to the nodes from which it was generated')), |
|
2971 | _('apply patch to the nodes from which it was generated')), | |
2971 | ('', 'import-branch', None, |
|
2972 | ('', 'import-branch', None, | |
2972 | _('Use any branch information in patch (implied by --exact)'))] + commitopts, |
|
2973 | _('Use any branch information in patch (implied by --exact)'))] + commitopts, | |
2973 | _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), |
|
2974 | _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), | |
2974 | "incoming|in": (incoming, |
|
2975 | "incoming|in": (incoming, | |
2975 | [('M', 'no-merges', None, _('do not show merges')), |
|
2976 | [('M', 'no-merges', None, _('do not show merges')), | |
2976 | ('f', 'force', None, |
|
2977 | ('f', 'force', None, | |
2977 | _('run even when remote repository is unrelated')), |
|
2978 | _('run even when remote repository is unrelated')), | |
2978 | ('', 'style', '', _('display using template map file')), |
|
2979 | ('', 'style', '', _('display using template map file')), | |
2979 | ('n', 'newest-first', None, _('show newest record first')), |
|
2980 | ('n', 'newest-first', None, _('show newest record first')), | |
2980 | ('', 'bundle', '', _('file to store the bundles into')), |
|
2981 | ('', 'bundle', '', _('file to store the bundles into')), | |
2981 | ('p', 'patch', None, _('show patch')), |
|
2982 | ('p', 'patch', None, _('show patch')), | |
2982 | ('r', 'rev', [], _('a specific revision up to which you would like to pull')), |
|
2983 | ('r', 'rev', [], _('a specific revision up to which you would like to pull')), | |
2983 | ('', 'template', '', _('display with template')), |
|
2984 | ('', 'template', '', _('display with template')), | |
2984 | ] + remoteopts, |
|
2985 | ] + remoteopts, | |
2985 | _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...' |
|
2986 | _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...' | |
2986 | ' [--bundle FILENAME] [SOURCE]')), |
|
2987 | ' [--bundle FILENAME] [SOURCE]')), | |
2987 | "^init": |
|
2988 | "^init": | |
2988 | (init, |
|
2989 | (init, | |
2989 | remoteopts, |
|
2990 | remoteopts, | |
2990 | _('hg init [-e CMD] [--remotecmd CMD] [DEST]')), |
|
2991 | _('hg init [-e CMD] [--remotecmd CMD] [DEST]')), | |
2991 | "locate": |
|
2992 | "locate": | |
2992 | (locate, |
|
2993 | (locate, | |
2993 | [('r', 'rev', '', _('search the repository as it stood at rev')), |
|
2994 | [('r', 'rev', '', _('search the repository as it stood at rev')), | |
2994 | ('0', 'print0', None, |
|
2995 | ('0', 'print0', None, | |
2995 | _('end filenames with NUL, for use with xargs')), |
|
2996 | _('end filenames with NUL, for use with xargs')), | |
2996 | ('f', 'fullpath', None, |
|
2997 | ('f', 'fullpath', None, | |
2997 | _('print complete paths from the filesystem root')), |
|
2998 | _('print complete paths from the filesystem root')), | |
2998 | ] + walkopts, |
|
2999 | ] + walkopts, | |
2999 | _('hg locate [OPTION]... [PATTERN]...')), |
|
3000 | _('hg locate [OPTION]... [PATTERN]...')), | |
3000 | "^log|history": |
|
3001 | "^log|history": | |
3001 | (log, |
|
3002 | (log, | |
3002 | [('f', 'follow', None, |
|
3003 | [('f', 'follow', None, | |
3003 | _('follow changeset history, or file history across copies and renames')), |
|
3004 | _('follow changeset history, or file history across copies and renames')), | |
3004 | ('', 'follow-first', None, |
|
3005 | ('', 'follow-first', None, | |
3005 | _('only follow the first parent of merge changesets')), |
|
3006 | _('only follow the first parent of merge changesets')), | |
3006 | ('d', 'date', '', _('show revs matching date spec')), |
|
3007 | ('d', 'date', '', _('show revs matching date spec')), | |
3007 | ('C', 'copies', None, _('show copied files')), |
|
3008 | ('C', 'copies', None, _('show copied files')), | |
3008 | ('k', 'keyword', [], _('do case-insensitive search for a keyword')), |
|
3009 | ('k', 'keyword', [], _('do case-insensitive search for a keyword')), | |
3009 | ('l', 'limit', '', _('limit number of changes displayed')), |
|
3010 | ('l', 'limit', '', _('limit number of changes displayed')), | |
3010 | ('r', 'rev', [], _('show the specified revision or range')), |
|
3011 | ('r', 'rev', [], _('show the specified revision or range')), | |
3011 | ('', 'removed', None, _('include revs where files were removed')), |
|
3012 | ('', 'removed', None, _('include revs where files were removed')), | |
3012 | ('M', 'no-merges', None, _('do not show merges')), |
|
3013 | ('M', 'no-merges', None, _('do not show merges')), | |
3013 | ('', 'style', '', _('display using template map file')), |
|
3014 | ('', 'style', '', _('display using template map file')), | |
3014 | ('m', 'only-merges', None, _('show only merges')), |
|
3015 | ('m', 'only-merges', None, _('show only merges')), | |
3015 | ('p', 'patch', None, _('show patch')), |
|
3016 | ('p', 'patch', None, _('show patch')), | |
3016 | ('P', 'prune', [], _('do not display revision or any of its ancestors')), |
|
3017 | ('P', 'prune', [], _('do not display revision or any of its ancestors')), | |
3017 | ('', 'template', '', _('display with template')), |
|
3018 | ('', 'template', '', _('display with template')), | |
3018 | ] + walkopts, |
|
3019 | ] + walkopts, | |
3019 | _('hg log [OPTION]... [FILE]')), |
|
3020 | _('hg log [OPTION]... [FILE]')), | |
3020 | "manifest": (manifest, [('r', 'rev', '', _('revision to display'))], |
|
3021 | "manifest": (manifest, [('r', 'rev', '', _('revision to display'))], | |
3021 | _('hg manifest [-r REV]')), |
|
3022 | _('hg manifest [-r REV]')), | |
3022 | "^merge": |
|
3023 | "^merge": | |
3023 | (merge, |
|
3024 | (merge, | |
3024 | [('f', 'force', None, _('force a merge with outstanding changes')), |
|
3025 | [('f', 'force', None, _('force a merge with outstanding changes')), | |
3025 | ('r', 'rev', '', _('revision to merge')), |
|
3026 | ('r', 'rev', '', _('revision to merge')), | |
3026 | ], |
|
3027 | ], | |
3027 | _('hg merge [-f] [[-r] REV]')), |
|
3028 | _('hg merge [-f] [[-r] REV]')), | |
3028 | "outgoing|out": (outgoing, |
|
3029 | "outgoing|out": (outgoing, | |
3029 | [('M', 'no-merges', None, _('do not show merges')), |
|
3030 | [('M', 'no-merges', None, _('do not show merges')), | |
3030 | ('f', 'force', None, |
|
3031 | ('f', 'force', None, | |
3031 | _('run even when remote repository is unrelated')), |
|
3032 | _('run even when remote repository is unrelated')), | |
3032 | ('p', 'patch', None, _('show patch')), |
|
3033 | ('p', 'patch', None, _('show patch')), | |
3033 | ('', 'style', '', _('display using template map file')), |
|
3034 | ('', 'style', '', _('display using template map file')), | |
3034 | ('r', 'rev', [], _('a specific revision you would like to push')), |
|
3035 | ('r', 'rev', [], _('a specific revision you would like to push')), | |
3035 | ('n', 'newest-first', None, _('show newest record first')), |
|
3036 | ('n', 'newest-first', None, _('show newest record first')), | |
3036 | ('', 'template', '', _('display with template')), |
|
3037 | ('', 'template', '', _('display with template')), | |
3037 | ] + remoteopts, |
|
3038 | ] + remoteopts, | |
3038 | _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
|
3039 | _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')), | |
3039 | "^parents": |
|
3040 | "^parents": | |
3040 | (parents, |
|
3041 | (parents, | |
3041 | [('r', 'rev', '', _('show parents from the specified rev')), |
|
3042 | [('r', 'rev', '', _('show parents from the specified rev')), | |
3042 | ('', 'style', '', _('display using template map file')), |
|
3043 | ('', 'style', '', _('display using template map file')), | |
3043 | ('', 'template', '', _('display with template'))], |
|
3044 | ('', 'template', '', _('display with template'))], | |
3044 | _('hg parents [-r REV] [FILE]')), |
|
3045 | _('hg parents [-r REV] [FILE]')), | |
3045 | "paths": (paths, [], _('hg paths [NAME]')), |
|
3046 | "paths": (paths, [], _('hg paths [NAME]')), | |
3046 | "^pull": |
|
3047 | "^pull": | |
3047 | (pull, |
|
3048 | (pull, | |
3048 | [('u', 'update', None, |
|
3049 | [('u', 'update', None, | |
3049 | _('update to new tip if changesets were pulled')), |
|
3050 | _('update to new tip if changesets were pulled')), | |
3050 | ('f', 'force', None, |
|
3051 | ('f', 'force', None, | |
3051 | _('run even when remote repository is unrelated')), |
|
3052 | _('run even when remote repository is unrelated')), | |
3052 | ('r', 'rev', [], |
|
3053 | ('r', 'rev', [], | |
3053 | _('a specific revision up to which you would like to pull')), |
|
3054 | _('a specific revision up to which you would like to pull')), | |
3054 | ] + remoteopts, |
|
3055 | ] + remoteopts, | |
3055 | _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), |
|
3056 | _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), | |
3056 | "^push": |
|
3057 | "^push": | |
3057 | (push, |
|
3058 | (push, | |
3058 | [('f', 'force', None, _('force push')), |
|
3059 | [('f', 'force', None, _('force push')), | |
3059 | ('r', 'rev', [], _('a specific revision you would like to push')), |
|
3060 | ('r', 'rev', [], _('a specific revision you would like to push')), | |
3060 | ] + remoteopts, |
|
3061 | ] + remoteopts, | |
3061 | _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), |
|
3062 | _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), | |
3062 | "debugrawcommit|rawcommit": |
|
3063 | "debugrawcommit|rawcommit": | |
3063 | (rawcommit, |
|
3064 | (rawcommit, | |
3064 | [('p', 'parent', [], _('parent')), |
|
3065 | [('p', 'parent', [], _('parent')), | |
3065 | ('F', 'files', '', _('file list')) |
|
3066 | ('F', 'files', '', _('file list')) | |
3066 | ] + commitopts + commitopts2, |
|
3067 | ] + commitopts + commitopts2, | |
3067 | _('hg debugrawcommit [OPTION]... [FILE]...')), |
|
3068 | _('hg debugrawcommit [OPTION]... [FILE]...')), | |
3068 | "recover": (recover, [], _('hg recover')), |
|
3069 | "recover": (recover, [], _('hg recover')), | |
3069 | "^remove|rm": |
|
3070 | "^remove|rm": | |
3070 | (remove, |
|
3071 | (remove, | |
3071 | [('A', 'after', None, _('record remove that has already occurred')), |
|
3072 | [('A', 'after', None, _('record remove that has already occurred')), | |
3072 | ('f', 'force', None, _('remove file even if modified')), |
|
3073 | ('f', 'force', None, _('remove file even if modified')), | |
3073 | ] + walkopts, |
|
3074 | ] + walkopts, | |
3074 | _('hg remove [OPTION]... FILE...')), |
|
3075 | _('hg remove [OPTION]... FILE...')), | |
3075 | "rename|mv": |
|
3076 | "rename|mv": | |
3076 | (rename, |
|
3077 | (rename, | |
3077 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
3078 | [('A', 'after', None, _('record a rename that has already occurred')), | |
3078 | ('f', 'force', None, |
|
3079 | ('f', 'force', None, | |
3079 | _('forcibly copy over an existing managed file')), |
|
3080 | _('forcibly copy over an existing managed file')), | |
3080 | ] + walkopts + dryrunopts, |
|
3081 | ] + walkopts + dryrunopts, | |
3081 | _('hg rename [OPTION]... SOURCE... DEST')), |
|
3082 | _('hg rename [OPTION]... SOURCE... DEST')), | |
3082 | "^revert": |
|
3083 | "^revert": | |
3083 | (revert, |
|
3084 | (revert, | |
3084 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
3085 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
3085 | ('d', 'date', '', _('tipmost revision matching date')), |
|
3086 | ('d', 'date', '', _('tipmost revision matching date')), | |
3086 | ('r', 'rev', '', _('revision to revert to')), |
|
3087 | ('r', 'rev', '', _('revision to revert to')), | |
3087 | ('', 'no-backup', None, _('do not save backup copies of files')), |
|
3088 | ('', 'no-backup', None, _('do not save backup copies of files')), | |
3088 | ] + walkopts + dryrunopts, |
|
3089 | ] + walkopts + dryrunopts, | |
3089 | _('hg revert [OPTION]... [-r REV] [NAME]...')), |
|
3090 | _('hg revert [OPTION]... [-r REV] [NAME]...')), | |
3090 | "rollback": (rollback, [], _('hg rollback')), |
|
3091 | "rollback": (rollback, [], _('hg rollback')), | |
3091 | "root": (root, [], _('hg root')), |
|
3092 | "root": (root, [], _('hg root')), | |
3092 | "showconfig|debugconfig": |
|
3093 | "showconfig|debugconfig": | |
3093 | (showconfig, |
|
3094 | (showconfig, | |
3094 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
3095 | [('u', 'untrusted', None, _('show untrusted configuration options'))], | |
3095 | _('showconfig [-u] [NAME]...')), |
|
3096 | _('showconfig [-u] [NAME]...')), | |
3096 | "^serve": |
|
3097 | "^serve": | |
3097 | (serve, |
|
3098 | (serve, | |
3098 | [('A', 'accesslog', '', _('name of access log file to write to')), |
|
3099 | [('A', 'accesslog', '', _('name of access log file to write to')), | |
3099 | ('d', 'daemon', None, _('run server in background')), |
|
3100 | ('d', 'daemon', None, _('run server in background')), | |
3100 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), |
|
3101 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), | |
3101 | ('E', 'errorlog', '', _('name of error log file to write to')), |
|
3102 | ('E', 'errorlog', '', _('name of error log file to write to')), | |
3102 | ('p', 'port', 0, _('port to use (default: 8000)')), |
|
3103 | ('p', 'port', 0, _('port to use (default: 8000)')), | |
3103 | ('a', 'address', '', _('address to use')), |
|
3104 | ('a', 'address', '', _('address to use')), | |
3104 | ('n', 'name', '', |
|
3105 | ('n', 'name', '', | |
3105 | _('name to show in web pages (default: working dir)')), |
|
3106 | _('name to show in web pages (default: working dir)')), | |
3106 | ('', 'webdir-conf', '', _('name of the webdir config file' |
|
3107 | ('', 'webdir-conf', '', _('name of the webdir config file' | |
3107 | ' (serve more than one repo)')), |
|
3108 | ' (serve more than one repo)')), | |
3108 | ('', 'pid-file', '', _('name of file to write process ID to')), |
|
3109 | ('', 'pid-file', '', _('name of file to write process ID to')), | |
3109 | ('', 'stdio', None, _('for remote clients')), |
|
3110 | ('', 'stdio', None, _('for remote clients')), | |
3110 | ('t', 'templates', '', _('web templates to use')), |
|
3111 | ('t', 'templates', '', _('web templates to use')), | |
3111 | ('', 'style', '', _('template style to use')), |
|
3112 | ('', 'style', '', _('template style to use')), | |
3112 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
3113 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
3113 | ('', 'certificate', '', _('SSL certificate file'))], |
|
3114 | ('', 'certificate', '', _('SSL certificate file'))], | |
3114 | _('hg serve [OPTION]...')), |
|
3115 | _('hg serve [OPTION]...')), | |
3115 | "^status|st": |
|
3116 | "^status|st": | |
3116 | (status, |
|
3117 | (status, | |
3117 | [('A', 'all', None, _('show status of all files')), |
|
3118 | [('A', 'all', None, _('show status of all files')), | |
3118 | ('m', 'modified', None, _('show only modified files')), |
|
3119 | ('m', 'modified', None, _('show only modified files')), | |
3119 | ('a', 'added', None, _('show only added files')), |
|
3120 | ('a', 'added', None, _('show only added files')), | |
3120 | ('r', 'removed', None, _('show only removed files')), |
|
3121 | ('r', 'removed', None, _('show only removed files')), | |
3121 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
3122 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
3122 | ('c', 'clean', None, _('show only files without changes')), |
|
3123 | ('c', 'clean', None, _('show only files without changes')), | |
3123 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
3124 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
3124 | ('i', 'ignored', None, _('show only ignored files')), |
|
3125 | ('i', 'ignored', None, _('show only ignored files')), | |
3125 | ('n', 'no-status', None, _('hide status prefix')), |
|
3126 | ('n', 'no-status', None, _('hide status prefix')), | |
3126 | ('C', 'copies', None, _('show source of copied files')), |
|
3127 | ('C', 'copies', None, _('show source of copied files')), | |
3127 | ('0', 'print0', None, |
|
3128 | ('0', 'print0', None, | |
3128 | _('end filenames with NUL, for use with xargs')), |
|
3129 | _('end filenames with NUL, for use with xargs')), | |
3129 | ('', 'rev', [], _('show difference from revision')), |
|
3130 | ('', 'rev', [], _('show difference from revision')), | |
3130 | ] + walkopts, |
|
3131 | ] + walkopts, | |
3131 | _('hg status [OPTION]... [FILE]...')), |
|
3132 | _('hg status [OPTION]... [FILE]...')), | |
3132 | "tag": |
|
3133 | "tag": | |
3133 | (tag, |
|
3134 | (tag, | |
3134 | [('f', 'force', None, _('replace existing tag')), |
|
3135 | [('f', 'force', None, _('replace existing tag')), | |
3135 | ('l', 'local', None, _('make the tag local')), |
|
3136 | ('l', 'local', None, _('make the tag local')), | |
3136 | ('r', 'rev', '', _('revision to tag')), |
|
3137 | ('r', 'rev', '', _('revision to tag')), | |
3137 | ('', 'remove', None, _('remove a tag')), |
|
3138 | ('', 'remove', None, _('remove a tag')), | |
3138 | # -l/--local is already there, commitopts cannot be used |
|
3139 | # -l/--local is already there, commitopts cannot be used | |
3139 | ('m', 'message', '', _('use <text> as commit message')), |
|
3140 | ('m', 'message', '', _('use <text> as commit message')), | |
3140 | ] + commitopts2, |
|
3141 | ] + commitopts2, | |
3141 | _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')), |
|
3142 | _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')), | |
3142 | "tags": (tags, [], _('hg tags')), |
|
3143 | "tags": (tags, [], _('hg tags')), | |
3143 | "tip": |
|
3144 | "tip": | |
3144 | (tip, |
|
3145 | (tip, | |
3145 | [('', 'style', '', _('display using template map file')), |
|
3146 | [('', 'style', '', _('display using template map file')), | |
3146 | ('p', 'patch', None, _('show patch')), |
|
3147 | ('p', 'patch', None, _('show patch')), | |
3147 | ('', 'template', '', _('display with template'))], |
|
3148 | ('', 'template', '', _('display with template'))], | |
3148 | _('hg tip [-p]')), |
|
3149 | _('hg tip [-p]')), | |
3149 | "unbundle": |
|
3150 | "unbundle": | |
3150 | (unbundle, |
|
3151 | (unbundle, | |
3151 | [('u', 'update', None, |
|
3152 | [('u', 'update', None, | |
3152 | _('update to new tip if changesets were unbundled'))], |
|
3153 | _('update to new tip if changesets were unbundled'))], | |
3153 | _('hg unbundle [-u] FILE...')), |
|
3154 | _('hg unbundle [-u] FILE...')), | |
3154 | "^update|up|checkout|co": |
|
3155 | "^update|up|checkout|co": | |
3155 | (update, |
|
3156 | (update, | |
3156 | [('C', 'clean', None, _('overwrite locally modified files')), |
|
3157 | [('C', 'clean', None, _('overwrite locally modified files')), | |
3157 | ('d', 'date', '', _('tipmost revision matching date')), |
|
3158 | ('d', 'date', '', _('tipmost revision matching date')), | |
3158 | ('r', 'rev', '', _('revision'))], |
|
3159 | ('r', 'rev', '', _('revision'))], | |
3159 | _('hg update [-C] [-d DATE] [[-r] REV]')), |
|
3160 | _('hg update [-C] [-d DATE] [[-r] REV]')), | |
3160 | "verify": (verify, [], _('hg verify')), |
|
3161 | "verify": (verify, [], _('hg verify')), | |
3161 | "version": (version_, [], _('hg version')), |
|
3162 | "version": (version_, [], _('hg version')), | |
3162 | } |
|
3163 | } | |
3163 |
|
3164 | |||
3164 | norepo = ("clone init version help debugancestor debugcomplete debugdata" |
|
3165 | norepo = ("clone init version help debugancestor debugcomplete debugdata" | |
3165 | " debugindex debugindexdot debugdate debuginstall") |
|
3166 | " debugindex debugindexdot debugdate debuginstall") | |
3166 | optionalrepo = ("identify paths serve showconfig") |
|
3167 | optionalrepo = ("identify paths serve showconfig") |
General Comments 0
You need to be logged in to leave comments.
Login now