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