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