##// END OF EJS Templates
_makelogrevset: replace try/except with 'next' usage...
Pierre-Yves David -
r25168:4dfd4d3b default
parent child Browse files
Show More
@@ -1,3334 +1,3331 b''
1 1 # cmdutil.py - help for command processing in 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 of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from i18n import _
10 10 import os, sys, errno, re, tempfile, cStringIO, shutil
11 11 import util, scmutil, templater, patch, error, templatekw, revlog, copies
12 12 import match as matchmod
13 13 import context, repair, graphmod, revset, phases, obsolete, pathutil
14 14 import changelog
15 15 import bookmarks
16 16 import encoding
17 17 import crecord as crecordmod
18 18 import lock as lockmod
19 19
20 20 def parsealiases(cmd):
21 21 return cmd.lstrip("^").split("|")
22 22
23 23 def setupwrapcolorwrite(ui):
24 24 # wrap ui.write so diff output can be labeled/colorized
25 25 def wrapwrite(orig, *args, **kw):
26 26 label = kw.pop('label', '')
27 27 for chunk, l in patch.difflabel(lambda: args):
28 28 orig(chunk, label=label + l)
29 29
30 30 oldwrite = ui.write
31 31 def wrap(*args, **kwargs):
32 32 return wrapwrite(oldwrite, *args, **kwargs)
33 33 setattr(ui, 'write', wrap)
34 34 return oldwrite
35 35
36 36 def filterchunks(ui, originalhunks, usecurses, testfile):
37 37 if usecurses:
38 38 if testfile:
39 39 recordfn = crecordmod.testdecorator(testfile,
40 40 crecordmod.testchunkselector)
41 41 else:
42 42 recordfn = crecordmod.chunkselector
43 43
44 44 return crecordmod.filterpatch(ui, originalhunks, recordfn)
45 45
46 46 else:
47 47 return patch.filterpatch(ui, originalhunks)
48 48
49 49 def recordfilter(ui, originalhunks):
50 50 usecurses = ui.configbool('experimental', 'crecord', False)
51 51 testfile = ui.config('experimental', 'crecordtest', None)
52 52 oldwrite = setupwrapcolorwrite(ui)
53 53 try:
54 54 newchunks = filterchunks(ui, originalhunks, usecurses, testfile)
55 55 finally:
56 56 ui.write = oldwrite
57 57 return newchunks
58 58
59 59 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
60 60 filterfn, *pats, **opts):
61 61 import merge as mergemod
62 62 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
63 63 ishunk = lambda x: isinstance(x, hunkclasses)
64 64
65 65 if not ui.interactive():
66 66 raise util.Abort(_('running non-interactively, use %s instead') %
67 67 cmdsuggest)
68 68
69 69 # make sure username is set before going interactive
70 70 if not opts.get('user'):
71 71 ui.username() # raise exception, username not provided
72 72
73 73 def recordfunc(ui, repo, message, match, opts):
74 74 """This is generic record driver.
75 75
76 76 Its job is to interactively filter local changes, and
77 77 accordingly prepare working directory into a state in which the
78 78 job can be delegated to a non-interactive commit command such as
79 79 'commit' or 'qrefresh'.
80 80
81 81 After the actual job is done by non-interactive command, the
82 82 working directory is restored to its original state.
83 83
84 84 In the end we'll record interesting changes, and everything else
85 85 will be left in place, so the user can continue working.
86 86 """
87 87
88 88 checkunfinished(repo, commit=True)
89 89 merge = len(repo[None].parents()) > 1
90 90 if merge:
91 91 raise util.Abort(_('cannot partially commit a merge '
92 92 '(use "hg commit" instead)'))
93 93
94 94 status = repo.status(match=match)
95 95 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
96 96 diffopts.nodates = True
97 97 diffopts.git = True
98 98 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
99 99 originalchunks = patch.parsepatch(originaldiff)
100 100
101 101 # 1. filter patch, so we have intending-to apply subset of it
102 102 try:
103 103 chunks = filterfn(ui, originalchunks)
104 104 except patch.PatchError, err:
105 105 raise util.Abort(_('error parsing patch: %s') % err)
106 106
107 107 # We need to keep a backup of files that have been newly added and
108 108 # modified during the recording process because there is a previous
109 109 # version without the edit in the workdir
110 110 newlyaddedandmodifiedfiles = set()
111 111 for chunk in chunks:
112 112 if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \
113 113 originalchunks:
114 114 newlyaddedandmodifiedfiles.add(chunk.header.filename())
115 115 contenders = set()
116 116 for h in chunks:
117 117 try:
118 118 contenders.update(set(h.files()))
119 119 except AttributeError:
120 120 pass
121 121
122 122 changed = status.modified + status.added + status.removed
123 123 newfiles = [f for f in changed if f in contenders]
124 124 if not newfiles:
125 125 ui.status(_('no changes to record\n'))
126 126 return 0
127 127
128 128 modified = set(status.modified)
129 129
130 130 # 2. backup changed files, so we can restore them in the end
131 131
132 132 if backupall:
133 133 tobackup = changed
134 134 else:
135 135 tobackup = [f for f in newfiles if f in modified or f in \
136 136 newlyaddedandmodifiedfiles]
137 137 backups = {}
138 138 if tobackup:
139 139 backupdir = repo.join('record-backups')
140 140 try:
141 141 os.mkdir(backupdir)
142 142 except OSError, err:
143 143 if err.errno != errno.EEXIST:
144 144 raise
145 145 try:
146 146 # backup continues
147 147 for f in tobackup:
148 148 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
149 149 dir=backupdir)
150 150 os.close(fd)
151 151 ui.debug('backup %r as %r\n' % (f, tmpname))
152 152 util.copyfile(repo.wjoin(f), tmpname)
153 153 shutil.copystat(repo.wjoin(f), tmpname)
154 154 backups[f] = tmpname
155 155
156 156 fp = cStringIO.StringIO()
157 157 for c in chunks:
158 158 fname = c.filename()
159 159 if fname in backups:
160 160 c.write(fp)
161 161 dopatch = fp.tell()
162 162 fp.seek(0)
163 163
164 164 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
165 165 # 3a. apply filtered patch to clean repo (clean)
166 166 if backups:
167 167 # Equivalent to hg.revert
168 168 choices = lambda key: key in backups
169 169 mergemod.update(repo, repo.dirstate.p1(),
170 170 False, True, choices)
171 171
172 172 # 3b. (apply)
173 173 if dopatch:
174 174 try:
175 175 ui.debug('applying patch\n')
176 176 ui.debug(fp.getvalue())
177 177 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
178 178 except patch.PatchError, err:
179 179 raise util.Abort(str(err))
180 180 del fp
181 181
182 182 # 4. We prepared working directory according to filtered
183 183 # patch. Now is the time to delegate the job to
184 184 # commit/qrefresh or the like!
185 185
186 186 # Make all of the pathnames absolute.
187 187 newfiles = [repo.wjoin(nf) for nf in newfiles]
188 188 return commitfunc(ui, repo, *newfiles, **opts)
189 189 finally:
190 190 # 5. finally restore backed-up files
191 191 try:
192 192 for realname, tmpname in backups.iteritems():
193 193 ui.debug('restoring %r to %r\n' % (tmpname, realname))
194 194 util.copyfile(tmpname, repo.wjoin(realname))
195 195 # Our calls to copystat() here and above are a
196 196 # hack to trick any editors that have f open that
197 197 # we haven't modified them.
198 198 #
199 199 # Also note that this racy as an editor could
200 200 # notice the file's mtime before we've finished
201 201 # writing it.
202 202 shutil.copystat(tmpname, repo.wjoin(realname))
203 203 os.unlink(tmpname)
204 204 if tobackup:
205 205 os.rmdir(backupdir)
206 206 except OSError:
207 207 pass
208 208
209 209 return commit(ui, repo, recordfunc, pats, opts)
210 210
211 211 def findpossible(cmd, table, strict=False):
212 212 """
213 213 Return cmd -> (aliases, command table entry)
214 214 for each matching command.
215 215 Return debug commands (or their aliases) only if no normal command matches.
216 216 """
217 217 choice = {}
218 218 debugchoice = {}
219 219
220 220 if cmd in table:
221 221 # short-circuit exact matches, "log" alias beats "^log|history"
222 222 keys = [cmd]
223 223 else:
224 224 keys = table.keys()
225 225
226 226 allcmds = []
227 227 for e in keys:
228 228 aliases = parsealiases(e)
229 229 allcmds.extend(aliases)
230 230 found = None
231 231 if cmd in aliases:
232 232 found = cmd
233 233 elif not strict:
234 234 for a in aliases:
235 235 if a.startswith(cmd):
236 236 found = a
237 237 break
238 238 if found is not None:
239 239 if aliases[0].startswith("debug") or found.startswith("debug"):
240 240 debugchoice[found] = (aliases, table[e])
241 241 else:
242 242 choice[found] = (aliases, table[e])
243 243
244 244 if not choice and debugchoice:
245 245 choice = debugchoice
246 246
247 247 return choice, allcmds
248 248
249 249 def findcmd(cmd, table, strict=True):
250 250 """Return (aliases, command table entry) for command string."""
251 251 choice, allcmds = findpossible(cmd, table, strict)
252 252
253 253 if cmd in choice:
254 254 return choice[cmd]
255 255
256 256 if len(choice) > 1:
257 257 clist = choice.keys()
258 258 clist.sort()
259 259 raise error.AmbiguousCommand(cmd, clist)
260 260
261 261 if choice:
262 262 return choice.values()[0]
263 263
264 264 raise error.UnknownCommand(cmd, allcmds)
265 265
266 266 def findrepo(p):
267 267 while not os.path.isdir(os.path.join(p, ".hg")):
268 268 oldp, p = p, os.path.dirname(p)
269 269 if p == oldp:
270 270 return None
271 271
272 272 return p
273 273
274 274 def bailifchanged(repo, merge=True):
275 275 if merge and repo.dirstate.p2() != nullid:
276 276 raise util.Abort(_('outstanding uncommitted merge'))
277 277 modified, added, removed, deleted = repo.status()[:4]
278 278 if modified or added or removed or deleted:
279 279 raise util.Abort(_('uncommitted changes'))
280 280 ctx = repo[None]
281 281 for s in sorted(ctx.substate):
282 282 ctx.sub(s).bailifchanged()
283 283
284 284 def logmessage(ui, opts):
285 285 """ get the log message according to -m and -l option """
286 286 message = opts.get('message')
287 287 logfile = opts.get('logfile')
288 288
289 289 if message and logfile:
290 290 raise util.Abort(_('options --message and --logfile are mutually '
291 291 'exclusive'))
292 292 if not message and logfile:
293 293 try:
294 294 if logfile == '-':
295 295 message = ui.fin.read()
296 296 else:
297 297 message = '\n'.join(util.readfile(logfile).splitlines())
298 298 except IOError, inst:
299 299 raise util.Abort(_("can't read commit message '%s': %s") %
300 300 (logfile, inst.strerror))
301 301 return message
302 302
303 303 def mergeeditform(ctxorbool, baseformname):
304 304 """return appropriate editform name (referencing a committemplate)
305 305
306 306 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
307 307 merging is committed.
308 308
309 309 This returns baseformname with '.merge' appended if it is a merge,
310 310 otherwise '.normal' is appended.
311 311 """
312 312 if isinstance(ctxorbool, bool):
313 313 if ctxorbool:
314 314 return baseformname + ".merge"
315 315 elif 1 < len(ctxorbool.parents()):
316 316 return baseformname + ".merge"
317 317
318 318 return baseformname + ".normal"
319 319
320 320 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
321 321 editform='', **opts):
322 322 """get appropriate commit message editor according to '--edit' option
323 323
324 324 'finishdesc' is a function to be called with edited commit message
325 325 (= 'description' of the new changeset) just after editing, but
326 326 before checking empty-ness. It should return actual text to be
327 327 stored into history. This allows to change description before
328 328 storing.
329 329
330 330 'extramsg' is a extra message to be shown in the editor instead of
331 331 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
332 332 is automatically added.
333 333
334 334 'editform' is a dot-separated list of names, to distinguish
335 335 the purpose of commit text editing.
336 336
337 337 'getcommiteditor' returns 'commitforceeditor' regardless of
338 338 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
339 339 they are specific for usage in MQ.
340 340 """
341 341 if edit or finishdesc or extramsg:
342 342 return lambda r, c, s: commitforceeditor(r, c, s,
343 343 finishdesc=finishdesc,
344 344 extramsg=extramsg,
345 345 editform=editform)
346 346 elif editform:
347 347 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
348 348 else:
349 349 return commiteditor
350 350
351 351 def loglimit(opts):
352 352 """get the log limit according to option -l/--limit"""
353 353 limit = opts.get('limit')
354 354 if limit:
355 355 try:
356 356 limit = int(limit)
357 357 except ValueError:
358 358 raise util.Abort(_('limit must be a positive integer'))
359 359 if limit <= 0:
360 360 raise util.Abort(_('limit must be positive'))
361 361 else:
362 362 limit = None
363 363 return limit
364 364
365 365 def makefilename(repo, pat, node, desc=None,
366 366 total=None, seqno=None, revwidth=None, pathname=None):
367 367 node_expander = {
368 368 'H': lambda: hex(node),
369 369 'R': lambda: str(repo.changelog.rev(node)),
370 370 'h': lambda: short(node),
371 371 'm': lambda: re.sub('[^\w]', '_', str(desc))
372 372 }
373 373 expander = {
374 374 '%': lambda: '%',
375 375 'b': lambda: os.path.basename(repo.root),
376 376 }
377 377
378 378 try:
379 379 if node:
380 380 expander.update(node_expander)
381 381 if node:
382 382 expander['r'] = (lambda:
383 383 str(repo.changelog.rev(node)).zfill(revwidth or 0))
384 384 if total is not None:
385 385 expander['N'] = lambda: str(total)
386 386 if seqno is not None:
387 387 expander['n'] = lambda: str(seqno)
388 388 if total is not None and seqno is not None:
389 389 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
390 390 if pathname is not None:
391 391 expander['s'] = lambda: os.path.basename(pathname)
392 392 expander['d'] = lambda: os.path.dirname(pathname) or '.'
393 393 expander['p'] = lambda: pathname
394 394
395 395 newname = []
396 396 patlen = len(pat)
397 397 i = 0
398 398 while i < patlen:
399 399 c = pat[i]
400 400 if c == '%':
401 401 i += 1
402 402 c = pat[i]
403 403 c = expander[c]()
404 404 newname.append(c)
405 405 i += 1
406 406 return ''.join(newname)
407 407 except KeyError, inst:
408 408 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
409 409 inst.args[0])
410 410
411 411 def makefileobj(repo, pat, node=None, desc=None, total=None,
412 412 seqno=None, revwidth=None, mode='wb', modemap=None,
413 413 pathname=None):
414 414
415 415 writable = mode not in ('r', 'rb')
416 416
417 417 if not pat or pat == '-':
418 418 if writable:
419 419 fp = repo.ui.fout
420 420 else:
421 421 fp = repo.ui.fin
422 422 if util.safehasattr(fp, 'fileno'):
423 423 return os.fdopen(os.dup(fp.fileno()), mode)
424 424 else:
425 425 # if this fp can't be duped properly, return
426 426 # a dummy object that can be closed
427 427 class wrappedfileobj(object):
428 428 noop = lambda x: None
429 429 def __init__(self, f):
430 430 self.f = f
431 431 def __getattr__(self, attr):
432 432 if attr == 'close':
433 433 return self.noop
434 434 else:
435 435 return getattr(self.f, attr)
436 436
437 437 return wrappedfileobj(fp)
438 438 if util.safehasattr(pat, 'write') and writable:
439 439 return pat
440 440 if util.safehasattr(pat, 'read') and 'r' in mode:
441 441 return pat
442 442 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
443 443 if modemap is not None:
444 444 mode = modemap.get(fn, mode)
445 445 if mode == 'wb':
446 446 modemap[fn] = 'ab'
447 447 return open(fn, mode)
448 448
449 449 def openrevlog(repo, cmd, file_, opts):
450 450 """opens the changelog, manifest, a filelog or a given revlog"""
451 451 cl = opts['changelog']
452 452 mf = opts['manifest']
453 453 dir = opts['dir']
454 454 msg = None
455 455 if cl and mf:
456 456 msg = _('cannot specify --changelog and --manifest at the same time')
457 457 elif cl and dir:
458 458 msg = _('cannot specify --changelog and --dir at the same time')
459 459 elif cl or mf:
460 460 if file_:
461 461 msg = _('cannot specify filename with --changelog or --manifest')
462 462 elif not repo:
463 463 msg = _('cannot specify --changelog or --manifest or --dir '
464 464 'without a repository')
465 465 if msg:
466 466 raise util.Abort(msg)
467 467
468 468 r = None
469 469 if repo:
470 470 if cl:
471 471 r = repo.unfiltered().changelog
472 472 elif dir:
473 473 if 'treemanifest' not in repo.requirements:
474 474 raise util.Abort(_("--dir can only be used on repos with "
475 475 "treemanifest enabled"))
476 476 dirlog = repo.dirlog(file_)
477 477 if len(dirlog):
478 478 r = dirlog
479 479 elif mf:
480 480 r = repo.manifest
481 481 elif file_:
482 482 filelog = repo.file(file_)
483 483 if len(filelog):
484 484 r = filelog
485 485 if not r:
486 486 if not file_:
487 487 raise error.CommandError(cmd, _('invalid arguments'))
488 488 if not os.path.isfile(file_):
489 489 raise util.Abort(_("revlog '%s' not found") % file_)
490 490 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
491 491 file_[:-2] + ".i")
492 492 return r
493 493
494 494 def copy(ui, repo, pats, opts, rename=False):
495 495 # called with the repo lock held
496 496 #
497 497 # hgsep => pathname that uses "/" to separate directories
498 498 # ossep => pathname that uses os.sep to separate directories
499 499 cwd = repo.getcwd()
500 500 targets = {}
501 501 after = opts.get("after")
502 502 dryrun = opts.get("dry_run")
503 503 wctx = repo[None]
504 504
505 505 def walkpat(pat):
506 506 srcs = []
507 507 if after:
508 508 badstates = '?'
509 509 else:
510 510 badstates = '?r'
511 511 m = scmutil.match(repo[None], [pat], opts, globbed=True)
512 512 for abs in repo.walk(m):
513 513 state = repo.dirstate[abs]
514 514 rel = m.rel(abs)
515 515 exact = m.exact(abs)
516 516 if state in badstates:
517 517 if exact and state == '?':
518 518 ui.warn(_('%s: not copying - file is not managed\n') % rel)
519 519 if exact and state == 'r':
520 520 ui.warn(_('%s: not copying - file has been marked for'
521 521 ' remove\n') % rel)
522 522 continue
523 523 # abs: hgsep
524 524 # rel: ossep
525 525 srcs.append((abs, rel, exact))
526 526 return srcs
527 527
528 528 # abssrc: hgsep
529 529 # relsrc: ossep
530 530 # otarget: ossep
531 531 def copyfile(abssrc, relsrc, otarget, exact):
532 532 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
533 533 if '/' in abstarget:
534 534 # We cannot normalize abstarget itself, this would prevent
535 535 # case only renames, like a => A.
536 536 abspath, absname = abstarget.rsplit('/', 1)
537 537 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
538 538 reltarget = repo.pathto(abstarget, cwd)
539 539 target = repo.wjoin(abstarget)
540 540 src = repo.wjoin(abssrc)
541 541 state = repo.dirstate[abstarget]
542 542
543 543 scmutil.checkportable(ui, abstarget)
544 544
545 545 # check for collisions
546 546 prevsrc = targets.get(abstarget)
547 547 if prevsrc is not None:
548 548 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
549 549 (reltarget, repo.pathto(abssrc, cwd),
550 550 repo.pathto(prevsrc, cwd)))
551 551 return
552 552
553 553 # check for overwrites
554 554 exists = os.path.lexists(target)
555 555 samefile = False
556 556 if exists and abssrc != abstarget:
557 557 if (repo.dirstate.normalize(abssrc) ==
558 558 repo.dirstate.normalize(abstarget)):
559 559 if not rename:
560 560 ui.warn(_("%s: can't copy - same file\n") % reltarget)
561 561 return
562 562 exists = False
563 563 samefile = True
564 564
565 565 if not after and exists or after and state in 'mn':
566 566 if not opts['force']:
567 567 ui.warn(_('%s: not overwriting - file exists\n') %
568 568 reltarget)
569 569 return
570 570
571 571 if after:
572 572 if not exists:
573 573 if rename:
574 574 ui.warn(_('%s: not recording move - %s does not exist\n') %
575 575 (relsrc, reltarget))
576 576 else:
577 577 ui.warn(_('%s: not recording copy - %s does not exist\n') %
578 578 (relsrc, reltarget))
579 579 return
580 580 elif not dryrun:
581 581 try:
582 582 if exists:
583 583 os.unlink(target)
584 584 targetdir = os.path.dirname(target) or '.'
585 585 if not os.path.isdir(targetdir):
586 586 os.makedirs(targetdir)
587 587 if samefile:
588 588 tmp = target + "~hgrename"
589 589 os.rename(src, tmp)
590 590 os.rename(tmp, target)
591 591 else:
592 592 util.copyfile(src, target)
593 593 srcexists = True
594 594 except IOError, inst:
595 595 if inst.errno == errno.ENOENT:
596 596 ui.warn(_('%s: deleted in working directory\n') % relsrc)
597 597 srcexists = False
598 598 else:
599 599 ui.warn(_('%s: cannot copy - %s\n') %
600 600 (relsrc, inst.strerror))
601 601 return True # report a failure
602 602
603 603 if ui.verbose or not exact:
604 604 if rename:
605 605 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
606 606 else:
607 607 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
608 608
609 609 targets[abstarget] = abssrc
610 610
611 611 # fix up dirstate
612 612 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
613 613 dryrun=dryrun, cwd=cwd)
614 614 if rename and not dryrun:
615 615 if not after and srcexists and not samefile:
616 616 util.unlinkpath(repo.wjoin(abssrc))
617 617 wctx.forget([abssrc])
618 618
619 619 # pat: ossep
620 620 # dest ossep
621 621 # srcs: list of (hgsep, hgsep, ossep, bool)
622 622 # return: function that takes hgsep and returns ossep
623 623 def targetpathfn(pat, dest, srcs):
624 624 if os.path.isdir(pat):
625 625 abspfx = pathutil.canonpath(repo.root, cwd, pat)
626 626 abspfx = util.localpath(abspfx)
627 627 if destdirexists:
628 628 striplen = len(os.path.split(abspfx)[0])
629 629 else:
630 630 striplen = len(abspfx)
631 631 if striplen:
632 632 striplen += len(os.sep)
633 633 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
634 634 elif destdirexists:
635 635 res = lambda p: os.path.join(dest,
636 636 os.path.basename(util.localpath(p)))
637 637 else:
638 638 res = lambda p: dest
639 639 return res
640 640
641 641 # pat: ossep
642 642 # dest ossep
643 643 # srcs: list of (hgsep, hgsep, ossep, bool)
644 644 # return: function that takes hgsep and returns ossep
645 645 def targetpathafterfn(pat, dest, srcs):
646 646 if matchmod.patkind(pat):
647 647 # a mercurial pattern
648 648 res = lambda p: os.path.join(dest,
649 649 os.path.basename(util.localpath(p)))
650 650 else:
651 651 abspfx = pathutil.canonpath(repo.root, cwd, pat)
652 652 if len(abspfx) < len(srcs[0][0]):
653 653 # A directory. Either the target path contains the last
654 654 # component of the source path or it does not.
655 655 def evalpath(striplen):
656 656 score = 0
657 657 for s in srcs:
658 658 t = os.path.join(dest, util.localpath(s[0])[striplen:])
659 659 if os.path.lexists(t):
660 660 score += 1
661 661 return score
662 662
663 663 abspfx = util.localpath(abspfx)
664 664 striplen = len(abspfx)
665 665 if striplen:
666 666 striplen += len(os.sep)
667 667 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
668 668 score = evalpath(striplen)
669 669 striplen1 = len(os.path.split(abspfx)[0])
670 670 if striplen1:
671 671 striplen1 += len(os.sep)
672 672 if evalpath(striplen1) > score:
673 673 striplen = striplen1
674 674 res = lambda p: os.path.join(dest,
675 675 util.localpath(p)[striplen:])
676 676 else:
677 677 # a file
678 678 if destdirexists:
679 679 res = lambda p: os.path.join(dest,
680 680 os.path.basename(util.localpath(p)))
681 681 else:
682 682 res = lambda p: dest
683 683 return res
684 684
685 685 pats = scmutil.expandpats(pats)
686 686 if not pats:
687 687 raise util.Abort(_('no source or destination specified'))
688 688 if len(pats) == 1:
689 689 raise util.Abort(_('no destination specified'))
690 690 dest = pats.pop()
691 691 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
692 692 if not destdirexists:
693 693 if len(pats) > 1 or matchmod.patkind(pats[0]):
694 694 raise util.Abort(_('with multiple sources, destination must be an '
695 695 'existing directory'))
696 696 if util.endswithsep(dest):
697 697 raise util.Abort(_('destination %s is not a directory') % dest)
698 698
699 699 tfn = targetpathfn
700 700 if after:
701 701 tfn = targetpathafterfn
702 702 copylist = []
703 703 for pat in pats:
704 704 srcs = walkpat(pat)
705 705 if not srcs:
706 706 continue
707 707 copylist.append((tfn(pat, dest, srcs), srcs))
708 708 if not copylist:
709 709 raise util.Abort(_('no files to copy'))
710 710
711 711 errors = 0
712 712 for targetpath, srcs in copylist:
713 713 for abssrc, relsrc, exact in srcs:
714 714 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
715 715 errors += 1
716 716
717 717 if errors:
718 718 ui.warn(_('(consider using --after)\n'))
719 719
720 720 return errors != 0
721 721
722 722 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
723 723 runargs=None, appendpid=False):
724 724 '''Run a command as a service.'''
725 725
726 726 def writepid(pid):
727 727 if opts['pid_file']:
728 728 if appendpid:
729 729 mode = 'a'
730 730 else:
731 731 mode = 'w'
732 732 fp = open(opts['pid_file'], mode)
733 733 fp.write(str(pid) + '\n')
734 734 fp.close()
735 735
736 736 if opts['daemon'] and not opts['daemon_pipefds']:
737 737 # Signal child process startup with file removal
738 738 lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
739 739 os.close(lockfd)
740 740 try:
741 741 if not runargs:
742 742 runargs = util.hgcmd() + sys.argv[1:]
743 743 runargs.append('--daemon-pipefds=%s' % lockpath)
744 744 # Don't pass --cwd to the child process, because we've already
745 745 # changed directory.
746 746 for i in xrange(1, len(runargs)):
747 747 if runargs[i].startswith('--cwd='):
748 748 del runargs[i]
749 749 break
750 750 elif runargs[i].startswith('--cwd'):
751 751 del runargs[i:i + 2]
752 752 break
753 753 def condfn():
754 754 return not os.path.exists(lockpath)
755 755 pid = util.rundetached(runargs, condfn)
756 756 if pid < 0:
757 757 raise util.Abort(_('child process failed to start'))
758 758 writepid(pid)
759 759 finally:
760 760 try:
761 761 os.unlink(lockpath)
762 762 except OSError, e:
763 763 if e.errno != errno.ENOENT:
764 764 raise
765 765 if parentfn:
766 766 return parentfn(pid)
767 767 else:
768 768 return
769 769
770 770 if initfn:
771 771 initfn()
772 772
773 773 if not opts['daemon']:
774 774 writepid(os.getpid())
775 775
776 776 if opts['daemon_pipefds']:
777 777 lockpath = opts['daemon_pipefds']
778 778 try:
779 779 os.setsid()
780 780 except AttributeError:
781 781 pass
782 782 os.unlink(lockpath)
783 783 util.hidewindow()
784 784 sys.stdout.flush()
785 785 sys.stderr.flush()
786 786
787 787 nullfd = os.open(os.devnull, os.O_RDWR)
788 788 logfilefd = nullfd
789 789 if logfile:
790 790 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
791 791 os.dup2(nullfd, 0)
792 792 os.dup2(logfilefd, 1)
793 793 os.dup2(logfilefd, 2)
794 794 if nullfd not in (0, 1, 2):
795 795 os.close(nullfd)
796 796 if logfile and logfilefd not in (0, 1, 2):
797 797 os.close(logfilefd)
798 798
799 799 if runfn:
800 800 return runfn()
801 801
802 802 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
803 803 """Utility function used by commands.import to import a single patch
804 804
805 805 This function is explicitly defined here to help the evolve extension to
806 806 wrap this part of the import logic.
807 807
808 808 The API is currently a bit ugly because it a simple code translation from
809 809 the import command. Feel free to make it better.
810 810
811 811 :hunk: a patch (as a binary string)
812 812 :parents: nodes that will be parent of the created commit
813 813 :opts: the full dict of option passed to the import command
814 814 :msgs: list to save commit message to.
815 815 (used in case we need to save it when failing)
816 816 :updatefunc: a function that update a repo to a given node
817 817 updatefunc(<repo>, <node>)
818 818 """
819 819 tmpname, message, user, date, branch, nodeid, p1, p2 = \
820 820 patch.extract(ui, hunk)
821 821
822 822 update = not opts.get('bypass')
823 823 strip = opts["strip"]
824 824 prefix = opts["prefix"]
825 825 sim = float(opts.get('similarity') or 0)
826 826 if not tmpname:
827 827 return (None, None, False)
828 828 msg = _('applied to working directory')
829 829
830 830 rejects = False
831 831 dsguard = None
832 832
833 833 try:
834 834 cmdline_message = logmessage(ui, opts)
835 835 if cmdline_message:
836 836 # pickup the cmdline msg
837 837 message = cmdline_message
838 838 elif message:
839 839 # pickup the patch msg
840 840 message = message.strip()
841 841 else:
842 842 # launch the editor
843 843 message = None
844 844 ui.debug('message:\n%s\n' % message)
845 845
846 846 if len(parents) == 1:
847 847 parents.append(repo[nullid])
848 848 if opts.get('exact'):
849 849 if not nodeid or not p1:
850 850 raise util.Abort(_('not a Mercurial patch'))
851 851 p1 = repo[p1]
852 852 p2 = repo[p2 or nullid]
853 853 elif p2:
854 854 try:
855 855 p1 = repo[p1]
856 856 p2 = repo[p2]
857 857 # Without any options, consider p2 only if the
858 858 # patch is being applied on top of the recorded
859 859 # first parent.
860 860 if p1 != parents[0]:
861 861 p1 = parents[0]
862 862 p2 = repo[nullid]
863 863 except error.RepoError:
864 864 p1, p2 = parents
865 865 if p2.node() == nullid:
866 866 ui.warn(_("warning: import the patch as a normal revision\n"
867 867 "(use --exact to import the patch as a merge)\n"))
868 868 else:
869 869 p1, p2 = parents
870 870
871 871 n = None
872 872 if update:
873 873 dsguard = dirstateguard(repo, 'tryimportone')
874 874 if p1 != parents[0]:
875 875 updatefunc(repo, p1.node())
876 876 if p2 != parents[1]:
877 877 repo.setparents(p1.node(), p2.node())
878 878
879 879 if opts.get('exact') or opts.get('import_branch'):
880 880 repo.dirstate.setbranch(branch or 'default')
881 881
882 882 partial = opts.get('partial', False)
883 883 files = set()
884 884 try:
885 885 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
886 886 files=files, eolmode=None, similarity=sim / 100.0)
887 887 except patch.PatchError, e:
888 888 if not partial:
889 889 raise util.Abort(str(e))
890 890 if partial:
891 891 rejects = True
892 892
893 893 files = list(files)
894 894 if opts.get('no_commit'):
895 895 if message:
896 896 msgs.append(message)
897 897 else:
898 898 if opts.get('exact') or p2:
899 899 # If you got here, you either use --force and know what
900 900 # you are doing or used --exact or a merge patch while
901 901 # being updated to its first parent.
902 902 m = None
903 903 else:
904 904 m = scmutil.matchfiles(repo, files or [])
905 905 editform = mergeeditform(repo[None], 'import.normal')
906 906 if opts.get('exact'):
907 907 editor = None
908 908 else:
909 909 editor = getcommiteditor(editform=editform, **opts)
910 910 allowemptyback = repo.ui.backupconfig('ui', 'allowemptycommit')
911 911 try:
912 912 if partial:
913 913 repo.ui.setconfig('ui', 'allowemptycommit', True)
914 914 n = repo.commit(message, opts.get('user') or user,
915 915 opts.get('date') or date, match=m,
916 916 editor=editor)
917 917 finally:
918 918 repo.ui.restoreconfig(allowemptyback)
919 919 dsguard.close()
920 920 else:
921 921 if opts.get('exact') or opts.get('import_branch'):
922 922 branch = branch or 'default'
923 923 else:
924 924 branch = p1.branch()
925 925 store = patch.filestore()
926 926 try:
927 927 files = set()
928 928 try:
929 929 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
930 930 files, eolmode=None)
931 931 except patch.PatchError, e:
932 932 raise util.Abort(str(e))
933 933 if opts.get('exact'):
934 934 editor = None
935 935 else:
936 936 editor = getcommiteditor(editform='import.bypass')
937 937 memctx = context.makememctx(repo, (p1.node(), p2.node()),
938 938 message,
939 939 opts.get('user') or user,
940 940 opts.get('date') or date,
941 941 branch, files, store,
942 942 editor=editor)
943 943 n = memctx.commit()
944 944 finally:
945 945 store.close()
946 946 if opts.get('exact') and opts.get('no_commit'):
947 947 # --exact with --no-commit is still useful in that it does merge
948 948 # and branch bits
949 949 ui.warn(_("warning: can't check exact import with --no-commit\n"))
950 950 elif opts.get('exact') and hex(n) != nodeid:
951 951 raise util.Abort(_('patch is damaged or loses information'))
952 952 if n:
953 953 # i18n: refers to a short changeset id
954 954 msg = _('created %s') % short(n)
955 955 return (msg, n, rejects)
956 956 finally:
957 957 lockmod.release(dsguard)
958 958 os.unlink(tmpname)
959 959
960 960 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
961 961 opts=None):
962 962 '''export changesets as hg patches.'''
963 963
964 964 total = len(revs)
965 965 revwidth = max([len(str(rev)) for rev in revs])
966 966 filemode = {}
967 967
968 968 def single(rev, seqno, fp):
969 969 ctx = repo[rev]
970 970 node = ctx.node()
971 971 parents = [p.node() for p in ctx.parents() if p]
972 972 branch = ctx.branch()
973 973 if switch_parent:
974 974 parents.reverse()
975 975
976 976 if parents:
977 977 prev = parents[0]
978 978 else:
979 979 prev = nullid
980 980
981 981 shouldclose = False
982 982 if not fp and len(template) > 0:
983 983 desc_lines = ctx.description().rstrip().split('\n')
984 984 desc = desc_lines[0] #Commit always has a first line.
985 985 fp = makefileobj(repo, template, node, desc=desc, total=total,
986 986 seqno=seqno, revwidth=revwidth, mode='wb',
987 987 modemap=filemode)
988 988 if fp != template:
989 989 shouldclose = True
990 990 if fp and fp != sys.stdout and util.safehasattr(fp, 'name'):
991 991 repo.ui.note("%s\n" % fp.name)
992 992
993 993 if not fp:
994 994 write = repo.ui.write
995 995 else:
996 996 def write(s, **kw):
997 997 fp.write(s)
998 998
999 999 write("# HG changeset patch\n")
1000 1000 write("# User %s\n" % ctx.user())
1001 1001 write("# Date %d %d\n" % ctx.date())
1002 1002 write("# %s\n" % util.datestr(ctx.date()))
1003 1003 if branch and branch != 'default':
1004 1004 write("# Branch %s\n" % branch)
1005 1005 write("# Node ID %s\n" % hex(node))
1006 1006 write("# Parent %s\n" % hex(prev))
1007 1007 if len(parents) > 1:
1008 1008 write("# Parent %s\n" % hex(parents[1]))
1009 1009 write(ctx.description().rstrip())
1010 1010 write("\n\n")
1011 1011
1012 1012 for chunk, label in patch.diffui(repo, prev, node, opts=opts):
1013 1013 write(chunk, label=label)
1014 1014
1015 1015 if shouldclose:
1016 1016 fp.close()
1017 1017
1018 1018 for seqno, rev in enumerate(revs):
1019 1019 single(rev, seqno + 1, fp)
1020 1020
1021 1021 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
1022 1022 changes=None, stat=False, fp=None, prefix='',
1023 1023 root='', listsubrepos=False):
1024 1024 '''show diff or diffstat.'''
1025 1025 if fp is None:
1026 1026 write = ui.write
1027 1027 else:
1028 1028 def write(s, **kw):
1029 1029 fp.write(s)
1030 1030
1031 1031 if root:
1032 1032 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
1033 1033 else:
1034 1034 relroot = ''
1035 1035 if relroot != '':
1036 1036 # XXX relative roots currently don't work if the root is within a
1037 1037 # subrepo
1038 1038 uirelroot = match.uipath(relroot)
1039 1039 relroot += '/'
1040 1040 for matchroot in match.files():
1041 1041 if not matchroot.startswith(relroot):
1042 1042 ui.warn(_('warning: %s not inside relative root %s\n') % (
1043 1043 match.uipath(matchroot), uirelroot))
1044 1044
1045 1045 if stat:
1046 1046 diffopts = diffopts.copy(context=0)
1047 1047 width = 80
1048 1048 if not ui.plain():
1049 1049 width = ui.termwidth()
1050 1050 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
1051 1051 prefix=prefix, relroot=relroot)
1052 1052 for chunk, label in patch.diffstatui(util.iterlines(chunks),
1053 1053 width=width,
1054 1054 git=diffopts.git):
1055 1055 write(chunk, label=label)
1056 1056 else:
1057 1057 for chunk, label in patch.diffui(repo, node1, node2, match,
1058 1058 changes, diffopts, prefix=prefix,
1059 1059 relroot=relroot):
1060 1060 write(chunk, label=label)
1061 1061
1062 1062 if listsubrepos:
1063 1063 ctx1 = repo[node1]
1064 1064 ctx2 = repo[node2]
1065 1065 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
1066 1066 tempnode2 = node2
1067 1067 try:
1068 1068 if node2 is not None:
1069 1069 tempnode2 = ctx2.substate[subpath][1]
1070 1070 except KeyError:
1071 1071 # A subrepo that existed in node1 was deleted between node1 and
1072 1072 # node2 (inclusive). Thus, ctx2's substate won't contain that
1073 1073 # subpath. The best we can do is to ignore it.
1074 1074 tempnode2 = None
1075 1075 submatch = matchmod.narrowmatcher(subpath, match)
1076 1076 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
1077 1077 stat=stat, fp=fp, prefix=prefix)
1078 1078
1079 1079 class changeset_printer(object):
1080 1080 '''show changeset information when templating not requested.'''
1081 1081
1082 1082 def __init__(self, ui, repo, matchfn, diffopts, buffered):
1083 1083 self.ui = ui
1084 1084 self.repo = repo
1085 1085 self.buffered = buffered
1086 1086 self.matchfn = matchfn
1087 1087 self.diffopts = diffopts
1088 1088 self.header = {}
1089 1089 self.hunk = {}
1090 1090 self.lastheader = None
1091 1091 self.footer = None
1092 1092
1093 1093 def flush(self, rev):
1094 1094 if rev in self.header:
1095 1095 h = self.header[rev]
1096 1096 if h != self.lastheader:
1097 1097 self.lastheader = h
1098 1098 self.ui.write(h)
1099 1099 del self.header[rev]
1100 1100 if rev in self.hunk:
1101 1101 self.ui.write(self.hunk[rev])
1102 1102 del self.hunk[rev]
1103 1103 return 1
1104 1104 return 0
1105 1105
1106 1106 def close(self):
1107 1107 if self.footer:
1108 1108 self.ui.write(self.footer)
1109 1109
1110 1110 def show(self, ctx, copies=None, matchfn=None, **props):
1111 1111 if self.buffered:
1112 1112 self.ui.pushbuffer()
1113 1113 self._show(ctx, copies, matchfn, props)
1114 1114 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
1115 1115 else:
1116 1116 self._show(ctx, copies, matchfn, props)
1117 1117
1118 1118 def _show(self, ctx, copies, matchfn, props):
1119 1119 '''show a single changeset or file revision'''
1120 1120 changenode = ctx.node()
1121 1121 rev = ctx.rev()
1122 1122 if self.ui.debugflag:
1123 1123 hexfunc = hex
1124 1124 else:
1125 1125 hexfunc = short
1126 1126 if rev is None:
1127 1127 pctx = ctx.p1()
1128 1128 revnode = (pctx.rev(), hexfunc(pctx.node()) + '+')
1129 1129 else:
1130 1130 revnode = (rev, hexfunc(changenode))
1131 1131
1132 1132 if self.ui.quiet:
1133 1133 self.ui.write("%d:%s\n" % revnode, label='log.node')
1134 1134 return
1135 1135
1136 1136 date = util.datestr(ctx.date())
1137 1137
1138 1138 # i18n: column positioning for "hg log"
1139 1139 self.ui.write(_("changeset: %d:%s\n") % revnode,
1140 1140 label='log.changeset changeset.%s' % ctx.phasestr())
1141 1141
1142 1142 # branches are shown first before any other names due to backwards
1143 1143 # compatibility
1144 1144 branch = ctx.branch()
1145 1145 # don't show the default branch name
1146 1146 if branch != 'default':
1147 1147 # i18n: column positioning for "hg log"
1148 1148 self.ui.write(_("branch: %s\n") % branch,
1149 1149 label='log.branch')
1150 1150
1151 1151 for name, ns in self.repo.names.iteritems():
1152 1152 # branches has special logic already handled above, so here we just
1153 1153 # skip it
1154 1154 if name == 'branches':
1155 1155 continue
1156 1156 # we will use the templatename as the color name since those two
1157 1157 # should be the same
1158 1158 for name in ns.names(self.repo, changenode):
1159 1159 self.ui.write(ns.logfmt % name,
1160 1160 label='log.%s' % ns.colorname)
1161 1161 if self.ui.debugflag:
1162 1162 # i18n: column positioning for "hg log"
1163 1163 self.ui.write(_("phase: %s\n") % ctx.phasestr(),
1164 1164 label='log.phase')
1165 1165 for pctx in self._meaningful_parentrevs(ctx):
1166 1166 label = 'log.parent changeset.%s' % pctx.phasestr()
1167 1167 # i18n: column positioning for "hg log"
1168 1168 self.ui.write(_("parent: %d:%s\n")
1169 1169 % (pctx.rev(), hexfunc(pctx.node())),
1170 1170 label=label)
1171 1171
1172 1172 if self.ui.debugflag and rev is not None:
1173 1173 mnode = ctx.manifestnode()
1174 1174 # i18n: column positioning for "hg log"
1175 1175 self.ui.write(_("manifest: %d:%s\n") %
1176 1176 (self.repo.manifest.rev(mnode), hex(mnode)),
1177 1177 label='ui.debug log.manifest')
1178 1178 # i18n: column positioning for "hg log"
1179 1179 self.ui.write(_("user: %s\n") % ctx.user(),
1180 1180 label='log.user')
1181 1181 # i18n: column positioning for "hg log"
1182 1182 self.ui.write(_("date: %s\n") % date,
1183 1183 label='log.date')
1184 1184
1185 1185 if self.ui.debugflag:
1186 1186 files = ctx.p1().status(ctx)[:3]
1187 1187 for key, value in zip([# i18n: column positioning for "hg log"
1188 1188 _("files:"),
1189 1189 # i18n: column positioning for "hg log"
1190 1190 _("files+:"),
1191 1191 # i18n: column positioning for "hg log"
1192 1192 _("files-:")], files):
1193 1193 if value:
1194 1194 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
1195 1195 label='ui.debug log.files')
1196 1196 elif ctx.files() and self.ui.verbose:
1197 1197 # i18n: column positioning for "hg log"
1198 1198 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
1199 1199 label='ui.note log.files')
1200 1200 if copies and self.ui.verbose:
1201 1201 copies = ['%s (%s)' % c for c in copies]
1202 1202 # i18n: column positioning for "hg log"
1203 1203 self.ui.write(_("copies: %s\n") % ' '.join(copies),
1204 1204 label='ui.note log.copies')
1205 1205
1206 1206 extra = ctx.extra()
1207 1207 if extra and self.ui.debugflag:
1208 1208 for key, value in sorted(extra.items()):
1209 1209 # i18n: column positioning for "hg log"
1210 1210 self.ui.write(_("extra: %s=%s\n")
1211 1211 % (key, value.encode('string_escape')),
1212 1212 label='ui.debug log.extra')
1213 1213
1214 1214 description = ctx.description().strip()
1215 1215 if description:
1216 1216 if self.ui.verbose:
1217 1217 self.ui.write(_("description:\n"),
1218 1218 label='ui.note log.description')
1219 1219 self.ui.write(description,
1220 1220 label='ui.note log.description')
1221 1221 self.ui.write("\n\n")
1222 1222 else:
1223 1223 # i18n: column positioning for "hg log"
1224 1224 self.ui.write(_("summary: %s\n") %
1225 1225 description.splitlines()[0],
1226 1226 label='log.summary')
1227 1227 self.ui.write("\n")
1228 1228
1229 1229 self.showpatch(changenode, matchfn)
1230 1230
1231 1231 def showpatch(self, node, matchfn):
1232 1232 if not matchfn:
1233 1233 matchfn = self.matchfn
1234 1234 if matchfn:
1235 1235 stat = self.diffopts.get('stat')
1236 1236 diff = self.diffopts.get('patch')
1237 1237 diffopts = patch.diffallopts(self.ui, self.diffopts)
1238 1238 prev = self.repo.changelog.parents(node)[0]
1239 1239 if stat:
1240 1240 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1241 1241 match=matchfn, stat=True)
1242 1242 if diff:
1243 1243 if stat:
1244 1244 self.ui.write("\n")
1245 1245 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1246 1246 match=matchfn, stat=False)
1247 1247 self.ui.write("\n")
1248 1248
1249 1249 def _meaningful_parentrevs(self, ctx):
1250 1250 """Return list of meaningful (or all if debug) parentrevs for rev.
1251 1251
1252 1252 For merges (two non-nullrev revisions) both parents are meaningful.
1253 1253 Otherwise the first parent revision is considered meaningful if it
1254 1254 is not the preceding revision.
1255 1255 """
1256 1256 parents = ctx.parents()
1257 1257 if len(parents) > 1:
1258 1258 return parents
1259 1259 if self.ui.debugflag:
1260 1260 return [parents[0], self.repo['null']]
1261 1261 if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1:
1262 1262 return []
1263 1263 return parents
1264 1264
1265 1265 class jsonchangeset(changeset_printer):
1266 1266 '''format changeset information.'''
1267 1267
1268 1268 def __init__(self, ui, repo, matchfn, diffopts, buffered):
1269 1269 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
1270 1270 self.cache = {}
1271 1271 self._first = True
1272 1272
1273 1273 def close(self):
1274 1274 if not self._first:
1275 1275 self.ui.write("\n]\n")
1276 1276 else:
1277 1277 self.ui.write("[]\n")
1278 1278
1279 1279 def _show(self, ctx, copies, matchfn, props):
1280 1280 '''show a single changeset or file revision'''
1281 1281 rev = ctx.rev()
1282 1282 if rev is None:
1283 1283 jrev = jnode = 'null'
1284 1284 else:
1285 1285 jrev = str(rev)
1286 1286 jnode = '"%s"' % hex(ctx.node())
1287 1287 j = encoding.jsonescape
1288 1288
1289 1289 if self._first:
1290 1290 self.ui.write("[\n {")
1291 1291 self._first = False
1292 1292 else:
1293 1293 self.ui.write(",\n {")
1294 1294
1295 1295 if self.ui.quiet:
1296 1296 self.ui.write('\n "rev": %s' % jrev)
1297 1297 self.ui.write(',\n "node": %s' % jnode)
1298 1298 self.ui.write('\n }')
1299 1299 return
1300 1300
1301 1301 self.ui.write('\n "rev": %s' % jrev)
1302 1302 self.ui.write(',\n "node": %s' % jnode)
1303 1303 self.ui.write(',\n "branch": "%s"' % j(ctx.branch()))
1304 1304 self.ui.write(',\n "phase": "%s"' % ctx.phasestr())
1305 1305 self.ui.write(',\n "user": "%s"' % j(ctx.user()))
1306 1306 self.ui.write(',\n "date": [%d, %d]' % ctx.date())
1307 1307 self.ui.write(',\n "desc": "%s"' % j(ctx.description()))
1308 1308
1309 1309 self.ui.write(',\n "bookmarks": [%s]' %
1310 1310 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
1311 1311 self.ui.write(',\n "tags": [%s]' %
1312 1312 ", ".join('"%s"' % j(t) for t in ctx.tags()))
1313 1313 self.ui.write(',\n "parents": [%s]' %
1314 1314 ", ".join('"%s"' % c.hex() for c in ctx.parents()))
1315 1315
1316 1316 if self.ui.debugflag:
1317 1317 if rev is None:
1318 1318 jmanifestnode = 'null'
1319 1319 else:
1320 1320 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
1321 1321 self.ui.write(',\n "manifest": %s' % jmanifestnode)
1322 1322
1323 1323 self.ui.write(',\n "extra": {%s}' %
1324 1324 ", ".join('"%s": "%s"' % (j(k), j(v))
1325 1325 for k, v in ctx.extra().items()))
1326 1326
1327 1327 files = ctx.p1().status(ctx)
1328 1328 self.ui.write(',\n "modified": [%s]' %
1329 1329 ", ".join('"%s"' % j(f) for f in files[0]))
1330 1330 self.ui.write(',\n "added": [%s]' %
1331 1331 ", ".join('"%s"' % j(f) for f in files[1]))
1332 1332 self.ui.write(',\n "removed": [%s]' %
1333 1333 ", ".join('"%s"' % j(f) for f in files[2]))
1334 1334
1335 1335 elif self.ui.verbose:
1336 1336 self.ui.write(',\n "files": [%s]' %
1337 1337 ", ".join('"%s"' % j(f) for f in ctx.files()))
1338 1338
1339 1339 if copies:
1340 1340 self.ui.write(',\n "copies": {%s}' %
1341 1341 ", ".join('"%s": "%s"' % (j(k), j(v))
1342 1342 for k, v in copies))
1343 1343
1344 1344 matchfn = self.matchfn
1345 1345 if matchfn:
1346 1346 stat = self.diffopts.get('stat')
1347 1347 diff = self.diffopts.get('patch')
1348 1348 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
1349 1349 node, prev = ctx.node(), ctx.p1().node()
1350 1350 if stat:
1351 1351 self.ui.pushbuffer()
1352 1352 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1353 1353 match=matchfn, stat=True)
1354 1354 self.ui.write(',\n "diffstat": "%s"' % j(self.ui.popbuffer()))
1355 1355 if diff:
1356 1356 self.ui.pushbuffer()
1357 1357 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1358 1358 match=matchfn, stat=False)
1359 1359 self.ui.write(',\n "diff": "%s"' % j(self.ui.popbuffer()))
1360 1360
1361 1361 self.ui.write("\n }")
1362 1362
1363 1363 class changeset_templater(changeset_printer):
1364 1364 '''format changeset information.'''
1365 1365
1366 1366 def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered):
1367 1367 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
1368 1368 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
1369 1369 defaulttempl = {
1370 1370 'parent': '{rev}:{node|formatnode} ',
1371 1371 'manifest': '{rev}:{node|formatnode}',
1372 1372 'file_copy': '{name} ({source})',
1373 1373 'extra': '{key}={value|stringescape}'
1374 1374 }
1375 1375 # filecopy is preserved for compatibility reasons
1376 1376 defaulttempl['filecopy'] = defaulttempl['file_copy']
1377 1377 self.t = templater.templater(mapfile, {'formatnode': formatnode},
1378 1378 cache=defaulttempl)
1379 1379 if tmpl:
1380 1380 self.t.cache['changeset'] = tmpl
1381 1381
1382 1382 self.cache = {}
1383 1383
1384 1384 def _show(self, ctx, copies, matchfn, props):
1385 1385 '''show a single changeset or file revision'''
1386 1386
1387 1387 showlist = templatekw.showlist
1388 1388
1389 1389 # showparents() behaviour depends on ui trace level which
1390 1390 # causes unexpected behaviours at templating level and makes
1391 1391 # it harder to extract it in a standalone function. Its
1392 1392 # behaviour cannot be changed so leave it here for now.
1393 1393 def showparents(**args):
1394 1394 ctx = args['ctx']
1395 1395 parents = [[('rev', p.rev()),
1396 1396 ('node', p.hex()),
1397 1397 ('phase', p.phasestr())]
1398 1398 for p in self._meaningful_parentrevs(ctx)]
1399 1399 return showlist('parent', parents, **args)
1400 1400
1401 1401 props = props.copy()
1402 1402 props.update(templatekw.keywords)
1403 1403 props['parents'] = showparents
1404 1404 props['templ'] = self.t
1405 1405 props['ctx'] = ctx
1406 1406 props['repo'] = self.repo
1407 1407 props['revcache'] = {'copies': copies}
1408 1408 props['cache'] = self.cache
1409 1409
1410 1410 # find correct templates for current mode
1411 1411
1412 1412 tmplmodes = [
1413 1413 (True, None),
1414 1414 (self.ui.verbose, 'verbose'),
1415 1415 (self.ui.quiet, 'quiet'),
1416 1416 (self.ui.debugflag, 'debug'),
1417 1417 ]
1418 1418
1419 1419 types = {'header': '', 'footer':'', 'changeset': 'changeset'}
1420 1420 for mode, postfix in tmplmodes:
1421 1421 for type in types:
1422 1422 cur = postfix and ('%s_%s' % (type, postfix)) or type
1423 1423 if mode and cur in self.t:
1424 1424 types[type] = cur
1425 1425
1426 1426 try:
1427 1427
1428 1428 # write header
1429 1429 if types['header']:
1430 1430 h = templater.stringify(self.t(types['header'], **props))
1431 1431 if self.buffered:
1432 1432 self.header[ctx.rev()] = h
1433 1433 else:
1434 1434 if self.lastheader != h:
1435 1435 self.lastheader = h
1436 1436 self.ui.write(h)
1437 1437
1438 1438 # write changeset metadata, then patch if requested
1439 1439 key = types['changeset']
1440 1440 self.ui.write(templater.stringify(self.t(key, **props)))
1441 1441 self.showpatch(ctx.node(), matchfn)
1442 1442
1443 1443 if types['footer']:
1444 1444 if not self.footer:
1445 1445 self.footer = templater.stringify(self.t(types['footer'],
1446 1446 **props))
1447 1447
1448 1448 except KeyError, inst:
1449 1449 msg = _("%s: no key named '%s'")
1450 1450 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
1451 1451 except SyntaxError, inst:
1452 1452 raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0]))
1453 1453
1454 1454 def gettemplate(ui, tmpl, style):
1455 1455 """
1456 1456 Find the template matching the given template spec or style.
1457 1457 """
1458 1458
1459 1459 # ui settings
1460 1460 if not tmpl and not style: # template are stronger than style
1461 1461 tmpl = ui.config('ui', 'logtemplate')
1462 1462 if tmpl:
1463 1463 try:
1464 1464 tmpl = templater.unquotestring(tmpl)
1465 1465 except SyntaxError:
1466 1466 pass
1467 1467 return tmpl, None
1468 1468 else:
1469 1469 style = util.expandpath(ui.config('ui', 'style', ''))
1470 1470
1471 1471 if not tmpl and style:
1472 1472 mapfile = style
1473 1473 if not os.path.split(mapfile)[0]:
1474 1474 mapname = (templater.templatepath('map-cmdline.' + mapfile)
1475 1475 or templater.templatepath(mapfile))
1476 1476 if mapname:
1477 1477 mapfile = mapname
1478 1478 return None, mapfile
1479 1479
1480 1480 if not tmpl:
1481 1481 return None, None
1482 1482
1483 1483 # looks like a literal template?
1484 1484 if '{' in tmpl:
1485 1485 return tmpl, None
1486 1486
1487 1487 # perhaps a stock style?
1488 1488 if not os.path.split(tmpl)[0]:
1489 1489 mapname = (templater.templatepath('map-cmdline.' + tmpl)
1490 1490 or templater.templatepath(tmpl))
1491 1491 if mapname and os.path.isfile(mapname):
1492 1492 return None, mapname
1493 1493
1494 1494 # perhaps it's a reference to [templates]
1495 1495 t = ui.config('templates', tmpl)
1496 1496 if t:
1497 1497 try:
1498 1498 tmpl = templater.unquotestring(t)
1499 1499 except SyntaxError:
1500 1500 tmpl = t
1501 1501 return tmpl, None
1502 1502
1503 1503 if tmpl == 'list':
1504 1504 ui.write(_("available styles: %s\n") % templater.stylelist())
1505 1505 raise util.Abort(_("specify a template"))
1506 1506
1507 1507 # perhaps it's a path to a map or a template
1508 1508 if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
1509 1509 # is it a mapfile for a style?
1510 1510 if os.path.basename(tmpl).startswith("map-"):
1511 1511 return None, os.path.realpath(tmpl)
1512 1512 tmpl = open(tmpl).read()
1513 1513 return tmpl, None
1514 1514
1515 1515 # constant string?
1516 1516 return tmpl, None
1517 1517
1518 1518 def show_changeset(ui, repo, opts, buffered=False):
1519 1519 """show one changeset using template or regular display.
1520 1520
1521 1521 Display format will be the first non-empty hit of:
1522 1522 1. option 'template'
1523 1523 2. option 'style'
1524 1524 3. [ui] setting 'logtemplate'
1525 1525 4. [ui] setting 'style'
1526 1526 If all of these values are either the unset or the empty string,
1527 1527 regular display via changeset_printer() is done.
1528 1528 """
1529 1529 # options
1530 1530 matchfn = None
1531 1531 if opts.get('patch') or opts.get('stat'):
1532 1532 matchfn = scmutil.matchall(repo)
1533 1533
1534 1534 if opts.get('template') == 'json':
1535 1535 return jsonchangeset(ui, repo, matchfn, opts, buffered)
1536 1536
1537 1537 tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style'))
1538 1538
1539 1539 if not tmpl and not mapfile:
1540 1540 return changeset_printer(ui, repo, matchfn, opts, buffered)
1541 1541
1542 1542 try:
1543 1543 t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile,
1544 1544 buffered)
1545 1545 except SyntaxError, inst:
1546 1546 raise util.Abort(inst.args[0])
1547 1547 return t
1548 1548
1549 1549 def showmarker(ui, marker):
1550 1550 """utility function to display obsolescence marker in a readable way
1551 1551
1552 1552 To be used by debug function."""
1553 1553 ui.write(hex(marker.precnode()))
1554 1554 for repl in marker.succnodes():
1555 1555 ui.write(' ')
1556 1556 ui.write(hex(repl))
1557 1557 ui.write(' %X ' % marker.flags())
1558 1558 parents = marker.parentnodes()
1559 1559 if parents is not None:
1560 1560 ui.write('{%s} ' % ', '.join(hex(p) for p in parents))
1561 1561 ui.write('(%s) ' % util.datestr(marker.date()))
1562 1562 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
1563 1563 sorted(marker.metadata().items())
1564 1564 if t[0] != 'date')))
1565 1565 ui.write('\n')
1566 1566
1567 1567 def finddate(ui, repo, date):
1568 1568 """Find the tipmost changeset that matches the given date spec"""
1569 1569
1570 1570 df = util.matchdate(date)
1571 1571 m = scmutil.matchall(repo)
1572 1572 results = {}
1573 1573
1574 1574 def prep(ctx, fns):
1575 1575 d = ctx.date()
1576 1576 if df(d[0]):
1577 1577 results[ctx.rev()] = d
1578 1578
1579 1579 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1580 1580 rev = ctx.rev()
1581 1581 if rev in results:
1582 1582 ui.status(_("found revision %s from %s\n") %
1583 1583 (rev, util.datestr(results[rev])))
1584 1584 return str(rev)
1585 1585
1586 1586 raise util.Abort(_("revision matching date not found"))
1587 1587
1588 1588 def increasingwindows(windowsize=8, sizelimit=512):
1589 1589 while True:
1590 1590 yield windowsize
1591 1591 if windowsize < sizelimit:
1592 1592 windowsize *= 2
1593 1593
1594 1594 class FileWalkError(Exception):
1595 1595 pass
1596 1596
1597 1597 def walkfilerevs(repo, match, follow, revs, fncache):
1598 1598 '''Walks the file history for the matched files.
1599 1599
1600 1600 Returns the changeset revs that are involved in the file history.
1601 1601
1602 1602 Throws FileWalkError if the file history can't be walked using
1603 1603 filelogs alone.
1604 1604 '''
1605 1605 wanted = set()
1606 1606 copies = []
1607 1607 minrev, maxrev = min(revs), max(revs)
1608 1608 def filerevgen(filelog, last):
1609 1609 """
1610 1610 Only files, no patterns. Check the history of each file.
1611 1611
1612 1612 Examines filelog entries within minrev, maxrev linkrev range
1613 1613 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1614 1614 tuples in backwards order
1615 1615 """
1616 1616 cl_count = len(repo)
1617 1617 revs = []
1618 1618 for j in xrange(0, last + 1):
1619 1619 linkrev = filelog.linkrev(j)
1620 1620 if linkrev < minrev:
1621 1621 continue
1622 1622 # only yield rev for which we have the changelog, it can
1623 1623 # happen while doing "hg log" during a pull or commit
1624 1624 if linkrev >= cl_count:
1625 1625 break
1626 1626
1627 1627 parentlinkrevs = []
1628 1628 for p in filelog.parentrevs(j):
1629 1629 if p != nullrev:
1630 1630 parentlinkrevs.append(filelog.linkrev(p))
1631 1631 n = filelog.node(j)
1632 1632 revs.append((linkrev, parentlinkrevs,
1633 1633 follow and filelog.renamed(n)))
1634 1634
1635 1635 return reversed(revs)
1636 1636 def iterfiles():
1637 1637 pctx = repo['.']
1638 1638 for filename in match.files():
1639 1639 if follow:
1640 1640 if filename not in pctx:
1641 1641 raise util.Abort(_('cannot follow file not in parent '
1642 1642 'revision: "%s"') % filename)
1643 1643 yield filename, pctx[filename].filenode()
1644 1644 else:
1645 1645 yield filename, None
1646 1646 for filename_node in copies:
1647 1647 yield filename_node
1648 1648
1649 1649 for file_, node in iterfiles():
1650 1650 filelog = repo.file(file_)
1651 1651 if not len(filelog):
1652 1652 if node is None:
1653 1653 # A zero count may be a directory or deleted file, so
1654 1654 # try to find matching entries on the slow path.
1655 1655 if follow:
1656 1656 raise util.Abort(
1657 1657 _('cannot follow nonexistent file: "%s"') % file_)
1658 1658 raise FileWalkError("Cannot walk via filelog")
1659 1659 else:
1660 1660 continue
1661 1661
1662 1662 if node is None:
1663 1663 last = len(filelog) - 1
1664 1664 else:
1665 1665 last = filelog.rev(node)
1666 1666
1667 1667 # keep track of all ancestors of the file
1668 1668 ancestors = set([filelog.linkrev(last)])
1669 1669
1670 1670 # iterate from latest to oldest revision
1671 1671 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1672 1672 if not follow:
1673 1673 if rev > maxrev:
1674 1674 continue
1675 1675 else:
1676 1676 # Note that last might not be the first interesting
1677 1677 # rev to us:
1678 1678 # if the file has been changed after maxrev, we'll
1679 1679 # have linkrev(last) > maxrev, and we still need
1680 1680 # to explore the file graph
1681 1681 if rev not in ancestors:
1682 1682 continue
1683 1683 # XXX insert 1327 fix here
1684 1684 if flparentlinkrevs:
1685 1685 ancestors.update(flparentlinkrevs)
1686 1686
1687 1687 fncache.setdefault(rev, []).append(file_)
1688 1688 wanted.add(rev)
1689 1689 if copied:
1690 1690 copies.append(copied)
1691 1691
1692 1692 return wanted
1693 1693
1694 1694 class _followfilter(object):
1695 1695 def __init__(self, repo, onlyfirst=False):
1696 1696 self.repo = repo
1697 1697 self.startrev = nullrev
1698 1698 self.roots = set()
1699 1699 self.onlyfirst = onlyfirst
1700 1700
1701 1701 def match(self, rev):
1702 1702 def realparents(rev):
1703 1703 if self.onlyfirst:
1704 1704 return self.repo.changelog.parentrevs(rev)[0:1]
1705 1705 else:
1706 1706 return filter(lambda x: x != nullrev,
1707 1707 self.repo.changelog.parentrevs(rev))
1708 1708
1709 1709 if self.startrev == nullrev:
1710 1710 self.startrev = rev
1711 1711 return True
1712 1712
1713 1713 if rev > self.startrev:
1714 1714 # forward: all descendants
1715 1715 if not self.roots:
1716 1716 self.roots.add(self.startrev)
1717 1717 for parent in realparents(rev):
1718 1718 if parent in self.roots:
1719 1719 self.roots.add(rev)
1720 1720 return True
1721 1721 else:
1722 1722 # backwards: all parents
1723 1723 if not self.roots:
1724 1724 self.roots.update(realparents(self.startrev))
1725 1725 if rev in self.roots:
1726 1726 self.roots.remove(rev)
1727 1727 self.roots.update(realparents(rev))
1728 1728 return True
1729 1729
1730 1730 return False
1731 1731
1732 1732 def walkchangerevs(repo, match, opts, prepare):
1733 1733 '''Iterate over files and the revs in which they changed.
1734 1734
1735 1735 Callers most commonly need to iterate backwards over the history
1736 1736 in which they are interested. Doing so has awful (quadratic-looking)
1737 1737 performance, so we use iterators in a "windowed" way.
1738 1738
1739 1739 We walk a window of revisions in the desired order. Within the
1740 1740 window, we first walk forwards to gather data, then in the desired
1741 1741 order (usually backwards) to display it.
1742 1742
1743 1743 This function returns an iterator yielding contexts. Before
1744 1744 yielding each context, the iterator will first call the prepare
1745 1745 function on each context in the window in forward order.'''
1746 1746
1747 1747 follow = opts.get('follow') or opts.get('follow_first')
1748 1748 revs = _logrevs(repo, opts)
1749 1749 if not revs:
1750 1750 return []
1751 1751 wanted = set()
1752 1752 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1753 1753 fncache = {}
1754 1754 change = repo.changectx
1755 1755
1756 1756 # First step is to fill wanted, the set of revisions that we want to yield.
1757 1757 # When it does not induce extra cost, we also fill fncache for revisions in
1758 1758 # wanted: a cache of filenames that were changed (ctx.files()) and that
1759 1759 # match the file filtering conditions.
1760 1760
1761 1761 if match.always():
1762 1762 # No files, no patterns. Display all revs.
1763 1763 wanted = revs
1764 1764
1765 1765 if not slowpath and match.files():
1766 1766 # We only have to read through the filelog to find wanted revisions
1767 1767
1768 1768 try:
1769 1769 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1770 1770 except FileWalkError:
1771 1771 slowpath = True
1772 1772
1773 1773 # We decided to fall back to the slowpath because at least one
1774 1774 # of the paths was not a file. Check to see if at least one of them
1775 1775 # existed in history, otherwise simply return
1776 1776 for path in match.files():
1777 1777 if path == '.' or path in repo.store:
1778 1778 break
1779 1779 else:
1780 1780 return []
1781 1781
1782 1782 if slowpath:
1783 1783 # We have to read the changelog to match filenames against
1784 1784 # changed files
1785 1785
1786 1786 if follow:
1787 1787 raise util.Abort(_('can only follow copies/renames for explicit '
1788 1788 'filenames'))
1789 1789
1790 1790 # The slow path checks files modified in every changeset.
1791 1791 # This is really slow on large repos, so compute the set lazily.
1792 1792 class lazywantedset(object):
1793 1793 def __init__(self):
1794 1794 self.set = set()
1795 1795 self.revs = set(revs)
1796 1796
1797 1797 # No need to worry about locality here because it will be accessed
1798 1798 # in the same order as the increasing window below.
1799 1799 def __contains__(self, value):
1800 1800 if value in self.set:
1801 1801 return True
1802 1802 elif not value in self.revs:
1803 1803 return False
1804 1804 else:
1805 1805 self.revs.discard(value)
1806 1806 ctx = change(value)
1807 1807 matches = filter(match, ctx.files())
1808 1808 if matches:
1809 1809 fncache[value] = matches
1810 1810 self.set.add(value)
1811 1811 return True
1812 1812 return False
1813 1813
1814 1814 def discard(self, value):
1815 1815 self.revs.discard(value)
1816 1816 self.set.discard(value)
1817 1817
1818 1818 wanted = lazywantedset()
1819 1819
1820 1820 # it might be worthwhile to do this in the iterator if the rev range
1821 1821 # is descending and the prune args are all within that range
1822 1822 for rev in opts.get('prune', ()):
1823 1823 rev = repo[rev].rev()
1824 1824 ff = _followfilter(repo)
1825 1825 stop = min(revs[0], revs[-1])
1826 1826 for x in xrange(rev, stop - 1, -1):
1827 1827 if ff.match(x):
1828 1828 wanted = wanted - [x]
1829 1829
1830 1830 # Now that wanted is correctly initialized, we can iterate over the
1831 1831 # revision range, yielding only revisions in wanted.
1832 1832 def iterate():
1833 1833 if follow and not match.files():
1834 1834 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
1835 1835 def want(rev):
1836 1836 return ff.match(rev) and rev in wanted
1837 1837 else:
1838 1838 def want(rev):
1839 1839 return rev in wanted
1840 1840
1841 1841 it = iter(revs)
1842 1842 stopiteration = False
1843 1843 for windowsize in increasingwindows():
1844 1844 nrevs = []
1845 1845 for i in xrange(windowsize):
1846 1846 rev = next(it, None)
1847 1847 if rev is None:
1848 1848 stopiteration = True
1849 1849 break
1850 1850 elif want(rev):
1851 1851 nrevs.append(rev)
1852 1852 for rev in sorted(nrevs):
1853 1853 fns = fncache.get(rev)
1854 1854 ctx = change(rev)
1855 1855 if not fns:
1856 1856 def fns_generator():
1857 1857 for f in ctx.files():
1858 1858 if match(f):
1859 1859 yield f
1860 1860 fns = fns_generator()
1861 1861 prepare(ctx, fns)
1862 1862 for rev in nrevs:
1863 1863 yield change(rev)
1864 1864
1865 1865 if stopiteration:
1866 1866 break
1867 1867
1868 1868 return iterate()
1869 1869
1870 1870 def _makefollowlogfilematcher(repo, files, followfirst):
1871 1871 # When displaying a revision with --patch --follow FILE, we have
1872 1872 # to know which file of the revision must be diffed. With
1873 1873 # --follow, we want the names of the ancestors of FILE in the
1874 1874 # revision, stored in "fcache". "fcache" is populated by
1875 1875 # reproducing the graph traversal already done by --follow revset
1876 1876 # and relating linkrevs to file names (which is not "correct" but
1877 1877 # good enough).
1878 1878 fcache = {}
1879 1879 fcacheready = [False]
1880 1880 pctx = repo['.']
1881 1881
1882 1882 def populate():
1883 1883 for fn in files:
1884 1884 for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)):
1885 1885 for c in i:
1886 1886 fcache.setdefault(c.linkrev(), set()).add(c.path())
1887 1887
1888 1888 def filematcher(rev):
1889 1889 if not fcacheready[0]:
1890 1890 # Lazy initialization
1891 1891 fcacheready[0] = True
1892 1892 populate()
1893 1893 return scmutil.matchfiles(repo, fcache.get(rev, []))
1894 1894
1895 1895 return filematcher
1896 1896
1897 1897 def _makenofollowlogfilematcher(repo, pats, opts):
1898 1898 '''hook for extensions to override the filematcher for non-follow cases'''
1899 1899 return None
1900 1900
1901 1901 def _makelogrevset(repo, pats, opts, revs):
1902 1902 """Return (expr, filematcher) where expr is a revset string built
1903 1903 from log options and file patterns or None. If --stat or --patch
1904 1904 are not passed filematcher is None. Otherwise it is a callable
1905 1905 taking a revision number and returning a match objects filtering
1906 1906 the files to be detailed when displaying the revision.
1907 1907 """
1908 1908 opt2revset = {
1909 1909 'no_merges': ('not merge()', None),
1910 1910 'only_merges': ('merge()', None),
1911 1911 '_ancestors': ('ancestors(%(val)s)', None),
1912 1912 '_fancestors': ('_firstancestors(%(val)s)', None),
1913 1913 '_descendants': ('descendants(%(val)s)', None),
1914 1914 '_fdescendants': ('_firstdescendants(%(val)s)', None),
1915 1915 '_matchfiles': ('_matchfiles(%(val)s)', None),
1916 1916 'date': ('date(%(val)r)', None),
1917 1917 'branch': ('branch(%(val)r)', ' or '),
1918 1918 '_patslog': ('filelog(%(val)r)', ' or '),
1919 1919 '_patsfollow': ('follow(%(val)r)', ' or '),
1920 1920 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
1921 1921 'keyword': ('keyword(%(val)r)', ' or '),
1922 1922 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '),
1923 1923 'user': ('user(%(val)r)', ' or '),
1924 1924 }
1925 1925
1926 1926 opts = dict(opts)
1927 1927 # follow or not follow?
1928 1928 follow = opts.get('follow') or opts.get('follow_first')
1929 1929 if opts.get('follow_first'):
1930 1930 followfirst = 1
1931 1931 else:
1932 1932 followfirst = 0
1933 1933 # --follow with FILE behaviour depends on revs...
1934 1934 it = iter(revs)
1935 1935 startrev = it.next()
1936 try:
1937 followdescendants = startrev < it.next()
1938 except (StopIteration):
1939 followdescendants = False
1936 followdescendants = startrev < next(it, startrev)
1940 1937
1941 1938 # branch and only_branch are really aliases and must be handled at
1942 1939 # the same time
1943 1940 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
1944 1941 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
1945 1942 # pats/include/exclude are passed to match.match() directly in
1946 1943 # _matchfiles() revset but walkchangerevs() builds its matcher with
1947 1944 # scmutil.match(). The difference is input pats are globbed on
1948 1945 # platforms without shell expansion (windows).
1949 1946 wctx = repo[None]
1950 1947 match, pats = scmutil.matchandpats(wctx, pats, opts)
1951 1948 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1952 1949 if not slowpath:
1953 1950 for f in match.files():
1954 1951 if follow and f not in wctx:
1955 1952 # If the file exists, it may be a directory, so let it
1956 1953 # take the slow path.
1957 1954 if os.path.exists(repo.wjoin(f)):
1958 1955 slowpath = True
1959 1956 continue
1960 1957 else:
1961 1958 raise util.Abort(_('cannot follow file not in parent '
1962 1959 'revision: "%s"') % f)
1963 1960 filelog = repo.file(f)
1964 1961 if not filelog:
1965 1962 # A zero count may be a directory or deleted file, so
1966 1963 # try to find matching entries on the slow path.
1967 1964 if follow:
1968 1965 raise util.Abort(
1969 1966 _('cannot follow nonexistent file: "%s"') % f)
1970 1967 slowpath = True
1971 1968
1972 1969 # We decided to fall back to the slowpath because at least one
1973 1970 # of the paths was not a file. Check to see if at least one of them
1974 1971 # existed in history - in that case, we'll continue down the
1975 1972 # slowpath; otherwise, we can turn off the slowpath
1976 1973 if slowpath:
1977 1974 for path in match.files():
1978 1975 if path == '.' or path in repo.store:
1979 1976 break
1980 1977 else:
1981 1978 slowpath = False
1982 1979
1983 1980 fpats = ('_patsfollow', '_patsfollowfirst')
1984 1981 fnopats = (('_ancestors', '_fancestors'),
1985 1982 ('_descendants', '_fdescendants'))
1986 1983 if slowpath:
1987 1984 # See walkchangerevs() slow path.
1988 1985 #
1989 1986 # pats/include/exclude cannot be represented as separate
1990 1987 # revset expressions as their filtering logic applies at file
1991 1988 # level. For instance "-I a -X a" matches a revision touching
1992 1989 # "a" and "b" while "file(a) and not file(b)" does
1993 1990 # not. Besides, filesets are evaluated against the working
1994 1991 # directory.
1995 1992 matchargs = ['r:', 'd:relpath']
1996 1993 for p in pats:
1997 1994 matchargs.append('p:' + p)
1998 1995 for p in opts.get('include', []):
1999 1996 matchargs.append('i:' + p)
2000 1997 for p in opts.get('exclude', []):
2001 1998 matchargs.append('x:' + p)
2002 1999 matchargs = ','.join(('%r' % p) for p in matchargs)
2003 2000 opts['_matchfiles'] = matchargs
2004 2001 if follow:
2005 2002 opts[fnopats[0][followfirst]] = '.'
2006 2003 else:
2007 2004 if follow:
2008 2005 if pats:
2009 2006 # follow() revset interprets its file argument as a
2010 2007 # manifest entry, so use match.files(), not pats.
2011 2008 opts[fpats[followfirst]] = list(match.files())
2012 2009 else:
2013 2010 op = fnopats[followdescendants][followfirst]
2014 2011 opts[op] = 'rev(%d)' % startrev
2015 2012 else:
2016 2013 opts['_patslog'] = list(pats)
2017 2014
2018 2015 filematcher = None
2019 2016 if opts.get('patch') or opts.get('stat'):
2020 2017 # When following files, track renames via a special matcher.
2021 2018 # If we're forced to take the slowpath it means we're following
2022 2019 # at least one pattern/directory, so don't bother with rename tracking.
2023 2020 if follow and not match.always() and not slowpath:
2024 2021 # _makefollowlogfilematcher expects its files argument to be
2025 2022 # relative to the repo root, so use match.files(), not pats.
2026 2023 filematcher = _makefollowlogfilematcher(repo, match.files(),
2027 2024 followfirst)
2028 2025 else:
2029 2026 filematcher = _makenofollowlogfilematcher(repo, pats, opts)
2030 2027 if filematcher is None:
2031 2028 filematcher = lambda rev: match
2032 2029
2033 2030 expr = []
2034 2031 for op, val in sorted(opts.iteritems()):
2035 2032 if not val:
2036 2033 continue
2037 2034 if op not in opt2revset:
2038 2035 continue
2039 2036 revop, andor = opt2revset[op]
2040 2037 if '%(val)' not in revop:
2041 2038 expr.append(revop)
2042 2039 else:
2043 2040 if not isinstance(val, list):
2044 2041 e = revop % {'val': val}
2045 2042 else:
2046 2043 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
2047 2044 expr.append(e)
2048 2045
2049 2046 if expr:
2050 2047 expr = '(' + ' and '.join(expr) + ')'
2051 2048 else:
2052 2049 expr = None
2053 2050 return expr, filematcher
2054 2051
2055 2052 def _logrevs(repo, opts):
2056 2053 # Default --rev value depends on --follow but --follow behaviour
2057 2054 # depends on revisions resolved from --rev...
2058 2055 follow = opts.get('follow') or opts.get('follow_first')
2059 2056 if opts.get('rev'):
2060 2057 revs = scmutil.revrange(repo, opts['rev'])
2061 2058 elif follow and repo.dirstate.p1() == nullid:
2062 2059 revs = revset.baseset()
2063 2060 elif follow:
2064 2061 revs = repo.revs('reverse(:.)')
2065 2062 else:
2066 2063 revs = revset.spanset(repo)
2067 2064 revs.reverse()
2068 2065 return revs
2069 2066
2070 2067 def getgraphlogrevs(repo, pats, opts):
2071 2068 """Return (revs, expr, filematcher) where revs is an iterable of
2072 2069 revision numbers, expr is a revset string built from log options
2073 2070 and file patterns or None, and used to filter 'revs'. If --stat or
2074 2071 --patch are not passed filematcher is None. Otherwise it is a
2075 2072 callable taking a revision number and returning a match objects
2076 2073 filtering the files to be detailed when displaying the revision.
2077 2074 """
2078 2075 limit = loglimit(opts)
2079 2076 revs = _logrevs(repo, opts)
2080 2077 if not revs:
2081 2078 return revset.baseset(), None, None
2082 2079 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
2083 2080 if opts.get('rev'):
2084 2081 # User-specified revs might be unsorted, but don't sort before
2085 2082 # _makelogrevset because it might depend on the order of revs
2086 2083 revs.sort(reverse=True)
2087 2084 if expr:
2088 2085 # Revset matchers often operate faster on revisions in changelog
2089 2086 # order, because most filters deal with the changelog.
2090 2087 revs.reverse()
2091 2088 matcher = revset.match(repo.ui, expr)
2092 2089 # Revset matches can reorder revisions. "A or B" typically returns
2093 2090 # returns the revision matching A then the revision matching B. Sort
2094 2091 # again to fix that.
2095 2092 revs = matcher(repo, revs)
2096 2093 revs.sort(reverse=True)
2097 2094 if limit is not None:
2098 2095 limitedrevs = []
2099 2096 for idx, rev in enumerate(revs):
2100 2097 if idx >= limit:
2101 2098 break
2102 2099 limitedrevs.append(rev)
2103 2100 revs = revset.baseset(limitedrevs)
2104 2101
2105 2102 return revs, expr, filematcher
2106 2103
2107 2104 def getlogrevs(repo, pats, opts):
2108 2105 """Return (revs, expr, filematcher) where revs is an iterable of
2109 2106 revision numbers, expr is a revset string built from log options
2110 2107 and file patterns or None, and used to filter 'revs'. If --stat or
2111 2108 --patch are not passed filematcher is None. Otherwise it is a
2112 2109 callable taking a revision number and returning a match objects
2113 2110 filtering the files to be detailed when displaying the revision.
2114 2111 """
2115 2112 limit = loglimit(opts)
2116 2113 revs = _logrevs(repo, opts)
2117 2114 if not revs:
2118 2115 return revset.baseset([]), None, None
2119 2116 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
2120 2117 if expr:
2121 2118 # Revset matchers often operate faster on revisions in changelog
2122 2119 # order, because most filters deal with the changelog.
2123 2120 if not opts.get('rev'):
2124 2121 revs.reverse()
2125 2122 matcher = revset.match(repo.ui, expr)
2126 2123 # Revset matches can reorder revisions. "A or B" typically returns
2127 2124 # returns the revision matching A then the revision matching B. Sort
2128 2125 # again to fix that.
2129 2126 revs = matcher(repo, revs)
2130 2127 if not opts.get('rev'):
2131 2128 revs.sort(reverse=True)
2132 2129 if limit is not None:
2133 2130 count = 0
2134 2131 limitedrevs = []
2135 2132 it = iter(revs)
2136 2133 while count < limit:
2137 2134 try:
2138 2135 limitedrevs.append(it.next())
2139 2136 except (StopIteration):
2140 2137 break
2141 2138 count += 1
2142 2139 revs = revset.baseset(limitedrevs)
2143 2140
2144 2141 return revs, expr, filematcher
2145 2142
2146 2143 def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None,
2147 2144 filematcher=None):
2148 2145 seen, state = [], graphmod.asciistate()
2149 2146 for rev, type, ctx, parents in dag:
2150 2147 char = 'o'
2151 2148 if ctx.node() in showparents:
2152 2149 char = '@'
2153 2150 elif ctx.obsolete():
2154 2151 char = 'x'
2155 2152 elif ctx.closesbranch():
2156 2153 char = '_'
2157 2154 copies = None
2158 2155 if getrenamed and ctx.rev():
2159 2156 copies = []
2160 2157 for fn in ctx.files():
2161 2158 rename = getrenamed(fn, ctx.rev())
2162 2159 if rename:
2163 2160 copies.append((fn, rename[0]))
2164 2161 revmatchfn = None
2165 2162 if filematcher is not None:
2166 2163 revmatchfn = filematcher(ctx.rev())
2167 2164 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2168 2165 lines = displayer.hunk.pop(rev).split('\n')
2169 2166 if not lines[-1]:
2170 2167 del lines[-1]
2171 2168 displayer.flush(rev)
2172 2169 edges = edgefn(type, char, lines, seen, rev, parents)
2173 2170 for type, char, lines, coldata in edges:
2174 2171 graphmod.ascii(ui, state, type, char, lines, coldata)
2175 2172 displayer.close()
2176 2173
2177 2174 def graphlog(ui, repo, *pats, **opts):
2178 2175 # Parameters are identical to log command ones
2179 2176 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
2180 2177 revdag = graphmod.dagwalker(repo, revs)
2181 2178
2182 2179 getrenamed = None
2183 2180 if opts.get('copies'):
2184 2181 endrev = None
2185 2182 if opts.get('rev'):
2186 2183 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
2187 2184 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2188 2185 displayer = show_changeset(ui, repo, opts, buffered=True)
2189 2186 showparents = [ctx.node() for ctx in repo[None].parents()]
2190 2187 displaygraph(ui, revdag, displayer, showparents,
2191 2188 graphmod.asciiedges, getrenamed, filematcher)
2192 2189
2193 2190 def checkunsupportedgraphflags(pats, opts):
2194 2191 for op in ["newest_first"]:
2195 2192 if op in opts and opts[op]:
2196 2193 raise util.Abort(_("-G/--graph option is incompatible with --%s")
2197 2194 % op.replace("_", "-"))
2198 2195
2199 2196 def graphrevs(repo, nodes, opts):
2200 2197 limit = loglimit(opts)
2201 2198 nodes.reverse()
2202 2199 if limit is not None:
2203 2200 nodes = nodes[:limit]
2204 2201 return graphmod.nodes(repo, nodes)
2205 2202
2206 2203 def add(ui, repo, match, prefix, explicitonly, **opts):
2207 2204 join = lambda f: os.path.join(prefix, f)
2208 2205 bad = []
2209 2206 oldbad = match.bad
2210 2207 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
2211 2208 names = []
2212 2209 wctx = repo[None]
2213 2210 cca = None
2214 2211 abort, warn = scmutil.checkportabilityalert(ui)
2215 2212 if abort or warn:
2216 2213 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2217 2214 for f in wctx.walk(match):
2218 2215 exact = match.exact(f)
2219 2216 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2220 2217 if cca:
2221 2218 cca(f)
2222 2219 names.append(f)
2223 2220 if ui.verbose or not exact:
2224 2221 ui.status(_('adding %s\n') % match.rel(f))
2225 2222
2226 2223 for subpath in sorted(wctx.substate):
2227 2224 sub = wctx.sub(subpath)
2228 2225 try:
2229 2226 submatch = matchmod.narrowmatcher(subpath, match)
2230 2227 if opts.get('subrepos'):
2231 2228 bad.extend(sub.add(ui, submatch, prefix, False, **opts))
2232 2229 else:
2233 2230 bad.extend(sub.add(ui, submatch, prefix, True, **opts))
2234 2231 except error.LookupError:
2235 2232 ui.status(_("skipping missing subrepository: %s\n")
2236 2233 % join(subpath))
2237 2234
2238 2235 if not opts.get('dry_run'):
2239 2236 rejected = wctx.add(names, prefix)
2240 2237 bad.extend(f for f in rejected if f in match.files())
2241 2238 return bad
2242 2239
2243 2240 def forget(ui, repo, match, prefix, explicitonly):
2244 2241 join = lambda f: os.path.join(prefix, f)
2245 2242 bad = []
2246 2243 oldbad = match.bad
2247 2244 match.bad = lambda x, y: bad.append(x) or oldbad(x, y)
2248 2245 wctx = repo[None]
2249 2246 forgot = []
2250 2247 s = repo.status(match=match, clean=True)
2251 2248 forget = sorted(s[0] + s[1] + s[3] + s[6])
2252 2249 if explicitonly:
2253 2250 forget = [f for f in forget if match.exact(f)]
2254 2251
2255 2252 for subpath in sorted(wctx.substate):
2256 2253 sub = wctx.sub(subpath)
2257 2254 try:
2258 2255 submatch = matchmod.narrowmatcher(subpath, match)
2259 2256 subbad, subforgot = sub.forget(submatch, prefix)
2260 2257 bad.extend([subpath + '/' + f for f in subbad])
2261 2258 forgot.extend([subpath + '/' + f for f in subforgot])
2262 2259 except error.LookupError:
2263 2260 ui.status(_("skipping missing subrepository: %s\n")
2264 2261 % join(subpath))
2265 2262
2266 2263 if not explicitonly:
2267 2264 for f in match.files():
2268 2265 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2269 2266 if f not in forgot:
2270 2267 if repo.wvfs.exists(f):
2271 2268 # Don't complain if the exact case match wasn't given.
2272 2269 # But don't do this until after checking 'forgot', so
2273 2270 # that subrepo files aren't normalized, and this op is
2274 2271 # purely from data cached by the status walk above.
2275 2272 if repo.dirstate.normalize(f) in repo.dirstate:
2276 2273 continue
2277 2274 ui.warn(_('not removing %s: '
2278 2275 'file is already untracked\n')
2279 2276 % match.rel(f))
2280 2277 bad.append(f)
2281 2278
2282 2279 for f in forget:
2283 2280 if ui.verbose or not match.exact(f):
2284 2281 ui.status(_('removing %s\n') % match.rel(f))
2285 2282
2286 2283 rejected = wctx.forget(forget, prefix)
2287 2284 bad.extend(f for f in rejected if f in match.files())
2288 2285 forgot.extend(f for f in forget if f not in rejected)
2289 2286 return bad, forgot
2290 2287
2291 2288 def files(ui, ctx, m, fm, fmt, subrepos):
2292 2289 rev = ctx.rev()
2293 2290 ret = 1
2294 2291 ds = ctx.repo().dirstate
2295 2292
2296 2293 for f in ctx.matches(m):
2297 2294 if rev is None and ds[f] == 'r':
2298 2295 continue
2299 2296 fm.startitem()
2300 2297 if ui.verbose:
2301 2298 fc = ctx[f]
2302 2299 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
2303 2300 fm.data(abspath=f)
2304 2301 fm.write('path', fmt, m.rel(f))
2305 2302 ret = 0
2306 2303
2307 2304 if subrepos:
2308 2305 for subpath in sorted(ctx.substate):
2309 2306 sub = ctx.sub(subpath)
2310 2307 try:
2311 2308 submatch = matchmod.narrowmatcher(subpath, m)
2312 2309 if sub.printfiles(ui, submatch, fm, fmt) == 0:
2313 2310 ret = 0
2314 2311 except error.LookupError:
2315 2312 ui.status(_("skipping missing subrepository: %s\n")
2316 2313 % m.abs(subpath))
2317 2314
2318 2315 return ret
2319 2316
2320 2317 def remove(ui, repo, m, prefix, after, force, subrepos):
2321 2318 join = lambda f: os.path.join(prefix, f)
2322 2319 ret = 0
2323 2320 s = repo.status(match=m, clean=True)
2324 2321 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2325 2322
2326 2323 wctx = repo[None]
2327 2324
2328 2325 for subpath in sorted(wctx.substate):
2329 2326 def matchessubrepo(matcher, subpath):
2330 2327 if matcher.exact(subpath):
2331 2328 return True
2332 2329 for f in matcher.files():
2333 2330 if f.startswith(subpath):
2334 2331 return True
2335 2332 return False
2336 2333
2337 2334 if subrepos or matchessubrepo(m, subpath):
2338 2335 sub = wctx.sub(subpath)
2339 2336 try:
2340 2337 submatch = matchmod.narrowmatcher(subpath, m)
2341 2338 if sub.removefiles(submatch, prefix, after, force, subrepos):
2342 2339 ret = 1
2343 2340 except error.LookupError:
2344 2341 ui.status(_("skipping missing subrepository: %s\n")
2345 2342 % join(subpath))
2346 2343
2347 2344 # warn about failure to delete explicit files/dirs
2348 2345 deleteddirs = util.dirs(deleted)
2349 2346 for f in m.files():
2350 2347 def insubrepo():
2351 2348 for subpath in wctx.substate:
2352 2349 if f.startswith(subpath):
2353 2350 return True
2354 2351 return False
2355 2352
2356 2353 isdir = f in deleteddirs or wctx.hasdir(f)
2357 2354 if f in repo.dirstate or isdir or f == '.' or insubrepo():
2358 2355 continue
2359 2356
2360 2357 if repo.wvfs.exists(f):
2361 2358 if repo.wvfs.isdir(f):
2362 2359 ui.warn(_('not removing %s: no tracked files\n')
2363 2360 % m.rel(f))
2364 2361 else:
2365 2362 ui.warn(_('not removing %s: file is untracked\n')
2366 2363 % m.rel(f))
2367 2364 # missing files will generate a warning elsewhere
2368 2365 ret = 1
2369 2366
2370 2367 if force:
2371 2368 list = modified + deleted + clean + added
2372 2369 elif after:
2373 2370 list = deleted
2374 2371 for f in modified + added + clean:
2375 2372 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
2376 2373 ret = 1
2377 2374 else:
2378 2375 list = deleted + clean
2379 2376 for f in modified:
2380 2377 ui.warn(_('not removing %s: file is modified (use -f'
2381 2378 ' to force removal)\n') % m.rel(f))
2382 2379 ret = 1
2383 2380 for f in added:
2384 2381 ui.warn(_('not removing %s: file has been marked for add'
2385 2382 ' (use forget to undo)\n') % m.rel(f))
2386 2383 ret = 1
2387 2384
2388 2385 for f in sorted(list):
2389 2386 if ui.verbose or not m.exact(f):
2390 2387 ui.status(_('removing %s\n') % m.rel(f))
2391 2388
2392 2389 wlock = repo.wlock()
2393 2390 try:
2394 2391 if not after:
2395 2392 for f in list:
2396 2393 if f in added:
2397 2394 continue # we never unlink added files on remove
2398 2395 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
2399 2396 repo[None].forget(list)
2400 2397 finally:
2401 2398 wlock.release()
2402 2399
2403 2400 return ret
2404 2401
2405 2402 def cat(ui, repo, ctx, matcher, prefix, **opts):
2406 2403 err = 1
2407 2404
2408 2405 def write(path):
2409 2406 fp = makefileobj(repo, opts.get('output'), ctx.node(),
2410 2407 pathname=os.path.join(prefix, path))
2411 2408 data = ctx[path].data()
2412 2409 if opts.get('decode'):
2413 2410 data = repo.wwritedata(path, data)
2414 2411 fp.write(data)
2415 2412 fp.close()
2416 2413
2417 2414 # Automation often uses hg cat on single files, so special case it
2418 2415 # for performance to avoid the cost of parsing the manifest.
2419 2416 if len(matcher.files()) == 1 and not matcher.anypats():
2420 2417 file = matcher.files()[0]
2421 2418 mf = repo.manifest
2422 2419 mfnode = ctx.manifestnode()
2423 2420 if mfnode and mf.find(mfnode, file)[0]:
2424 2421 write(file)
2425 2422 return 0
2426 2423
2427 2424 # Don't warn about "missing" files that are really in subrepos
2428 2425 bad = matcher.bad
2429 2426
2430 2427 def badfn(path, msg):
2431 2428 for subpath in ctx.substate:
2432 2429 if path.startswith(subpath):
2433 2430 return
2434 2431 bad(path, msg)
2435 2432
2436 2433 matcher.bad = badfn
2437 2434
2438 2435 for abs in ctx.walk(matcher):
2439 2436 write(abs)
2440 2437 err = 0
2441 2438
2442 2439 matcher.bad = bad
2443 2440
2444 2441 for subpath in sorted(ctx.substate):
2445 2442 sub = ctx.sub(subpath)
2446 2443 try:
2447 2444 submatch = matchmod.narrowmatcher(subpath, matcher)
2448 2445
2449 2446 if not sub.cat(submatch, os.path.join(prefix, sub._path),
2450 2447 **opts):
2451 2448 err = 0
2452 2449 except error.RepoLookupError:
2453 2450 ui.status(_("skipping missing subrepository: %s\n")
2454 2451 % os.path.join(prefix, subpath))
2455 2452
2456 2453 return err
2457 2454
2458 2455 def commit(ui, repo, commitfunc, pats, opts):
2459 2456 '''commit the specified files or all outstanding changes'''
2460 2457 date = opts.get('date')
2461 2458 if date:
2462 2459 opts['date'] = util.parsedate(date)
2463 2460 message = logmessage(ui, opts)
2464 2461 matcher = scmutil.match(repo[None], pats, opts)
2465 2462
2466 2463 # extract addremove carefully -- this function can be called from a command
2467 2464 # that doesn't support addremove
2468 2465 if opts.get('addremove'):
2469 2466 if scmutil.addremove(repo, matcher, "", opts) != 0:
2470 2467 raise util.Abort(
2471 2468 _("failed to mark all new/missing files as added/removed"))
2472 2469
2473 2470 return commitfunc(ui, repo, message, matcher, opts)
2474 2471
2475 2472 def amend(ui, repo, commitfunc, old, extra, pats, opts):
2476 2473 # amend will reuse the existing user if not specified, but the obsolete
2477 2474 # marker creation requires that the current user's name is specified.
2478 2475 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2479 2476 ui.username() # raise exception if username not set
2480 2477
2481 2478 ui.note(_('amending changeset %s\n') % old)
2482 2479 base = old.p1()
2483 2480
2484 2481 wlock = dsguard = lock = newid = None
2485 2482 try:
2486 2483 wlock = repo.wlock()
2487 2484 dsguard = dirstateguard(repo, 'amend')
2488 2485 lock = repo.lock()
2489 2486 tr = repo.transaction('amend')
2490 2487 try:
2491 2488 # See if we got a message from -m or -l, if not, open the editor
2492 2489 # with the message of the changeset to amend
2493 2490 message = logmessage(ui, opts)
2494 2491 # ensure logfile does not conflict with later enforcement of the
2495 2492 # message. potential logfile content has been processed by
2496 2493 # `logmessage` anyway.
2497 2494 opts.pop('logfile')
2498 2495 # First, do a regular commit to record all changes in the working
2499 2496 # directory (if there are any)
2500 2497 ui.callhooks = False
2501 2498 activebookmark = repo._activebookmark
2502 2499 try:
2503 2500 repo._activebookmark = None
2504 2501 opts['message'] = 'temporary amend commit for %s' % old
2505 2502 node = commit(ui, repo, commitfunc, pats, opts)
2506 2503 finally:
2507 2504 repo._activebookmark = activebookmark
2508 2505 ui.callhooks = True
2509 2506 ctx = repo[node]
2510 2507
2511 2508 # Participating changesets:
2512 2509 #
2513 2510 # node/ctx o - new (intermediate) commit that contains changes
2514 2511 # | from working dir to go into amending commit
2515 2512 # | (or a workingctx if there were no changes)
2516 2513 # |
2517 2514 # old o - changeset to amend
2518 2515 # |
2519 2516 # base o - parent of amending changeset
2520 2517
2521 2518 # Update extra dict from amended commit (e.g. to preserve graft
2522 2519 # source)
2523 2520 extra.update(old.extra())
2524 2521
2525 2522 # Also update it from the intermediate commit or from the wctx
2526 2523 extra.update(ctx.extra())
2527 2524
2528 2525 if len(old.parents()) > 1:
2529 2526 # ctx.files() isn't reliable for merges, so fall back to the
2530 2527 # slower repo.status() method
2531 2528 files = set([fn for st in repo.status(base, old)[:3]
2532 2529 for fn in st])
2533 2530 else:
2534 2531 files = set(old.files())
2535 2532
2536 2533 # Second, we use either the commit we just did, or if there were no
2537 2534 # changes the parent of the working directory as the version of the
2538 2535 # files in the final amend commit
2539 2536 if node:
2540 2537 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
2541 2538
2542 2539 user = ctx.user()
2543 2540 date = ctx.date()
2544 2541 # Recompute copies (avoid recording a -> b -> a)
2545 2542 copied = copies.pathcopies(base, ctx)
2546 2543 if old.p2:
2547 2544 copied.update(copies.pathcopies(old.p2(), ctx))
2548 2545
2549 2546 # Prune files which were reverted by the updates: if old
2550 2547 # introduced file X and our intermediate commit, node,
2551 2548 # renamed that file, then those two files are the same and
2552 2549 # we can discard X from our list of files. Likewise if X
2553 2550 # was deleted, it's no longer relevant
2554 2551 files.update(ctx.files())
2555 2552
2556 2553 def samefile(f):
2557 2554 if f in ctx.manifest():
2558 2555 a = ctx.filectx(f)
2559 2556 if f in base.manifest():
2560 2557 b = base.filectx(f)
2561 2558 return (not a.cmp(b)
2562 2559 and a.flags() == b.flags())
2563 2560 else:
2564 2561 return False
2565 2562 else:
2566 2563 return f not in base.manifest()
2567 2564 files = [f for f in files if not samefile(f)]
2568 2565
2569 2566 def filectxfn(repo, ctx_, path):
2570 2567 try:
2571 2568 fctx = ctx[path]
2572 2569 flags = fctx.flags()
2573 2570 mctx = context.memfilectx(repo,
2574 2571 fctx.path(), fctx.data(),
2575 2572 islink='l' in flags,
2576 2573 isexec='x' in flags,
2577 2574 copied=copied.get(path))
2578 2575 return mctx
2579 2576 except KeyError:
2580 2577 return None
2581 2578 else:
2582 2579 ui.note(_('copying changeset %s to %s\n') % (old, base))
2583 2580
2584 2581 # Use version of files as in the old cset
2585 2582 def filectxfn(repo, ctx_, path):
2586 2583 try:
2587 2584 return old.filectx(path)
2588 2585 except KeyError:
2589 2586 return None
2590 2587
2591 2588 user = opts.get('user') or old.user()
2592 2589 date = opts.get('date') or old.date()
2593 2590 editform = mergeeditform(old, 'commit.amend')
2594 2591 editor = getcommiteditor(editform=editform, **opts)
2595 2592 if not message:
2596 2593 editor = getcommiteditor(edit=True, editform=editform)
2597 2594 message = old.description()
2598 2595
2599 2596 pureextra = extra.copy()
2600 2597 extra['amend_source'] = old.hex()
2601 2598
2602 2599 new = context.memctx(repo,
2603 2600 parents=[base.node(), old.p2().node()],
2604 2601 text=message,
2605 2602 files=files,
2606 2603 filectxfn=filectxfn,
2607 2604 user=user,
2608 2605 date=date,
2609 2606 extra=extra,
2610 2607 editor=editor)
2611 2608
2612 2609 newdesc = changelog.stripdesc(new.description())
2613 2610 if ((not node)
2614 2611 and newdesc == old.description()
2615 2612 and user == old.user()
2616 2613 and date == old.date()
2617 2614 and pureextra == old.extra()):
2618 2615 # nothing changed. continuing here would create a new node
2619 2616 # anyway because of the amend_source noise.
2620 2617 #
2621 2618 # This not what we expect from amend.
2622 2619 return old.node()
2623 2620
2624 2621 ph = repo.ui.config('phases', 'new-commit', phases.draft)
2625 2622 try:
2626 2623 if opts.get('secret'):
2627 2624 commitphase = 'secret'
2628 2625 else:
2629 2626 commitphase = old.phase()
2630 2627 repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend')
2631 2628 newid = repo.commitctx(new)
2632 2629 finally:
2633 2630 repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
2634 2631 if newid != old.node():
2635 2632 # Reroute the working copy parent to the new changeset
2636 2633 repo.setparents(newid, nullid)
2637 2634
2638 2635 # Move bookmarks from old parent to amend commit
2639 2636 bms = repo.nodebookmarks(old.node())
2640 2637 if bms:
2641 2638 marks = repo._bookmarks
2642 2639 for bm in bms:
2643 2640 marks[bm] = newid
2644 2641 marks.write()
2645 2642 #commit the whole amend process
2646 2643 createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
2647 2644 if createmarkers and newid != old.node():
2648 2645 # mark the new changeset as successor of the rewritten one
2649 2646 new = repo[newid]
2650 2647 obs = [(old, (new,))]
2651 2648 if node:
2652 2649 obs.append((ctx, ()))
2653 2650
2654 2651 obsolete.createmarkers(repo, obs)
2655 2652 tr.close()
2656 2653 finally:
2657 2654 tr.release()
2658 2655 dsguard.close()
2659 2656 if not createmarkers and newid != old.node():
2660 2657 # Strip the intermediate commit (if there was one) and the amended
2661 2658 # commit
2662 2659 if node:
2663 2660 ui.note(_('stripping intermediate changeset %s\n') % ctx)
2664 2661 ui.note(_('stripping amended changeset %s\n') % old)
2665 2662 repair.strip(ui, repo, old.node(), topic='amend-backup')
2666 2663 finally:
2667 2664 lockmod.release(lock, dsguard, wlock)
2668 2665 return newid
2669 2666
2670 2667 def commiteditor(repo, ctx, subs, editform=''):
2671 2668 if ctx.description():
2672 2669 return ctx.description()
2673 2670 return commitforceeditor(repo, ctx, subs, editform=editform)
2674 2671
2675 2672 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
2676 2673 editform=''):
2677 2674 if not extramsg:
2678 2675 extramsg = _("Leave message empty to abort commit.")
2679 2676
2680 2677 forms = [e for e in editform.split('.') if e]
2681 2678 forms.insert(0, 'changeset')
2682 2679 while forms:
2683 2680 tmpl = repo.ui.config('committemplate', '.'.join(forms))
2684 2681 if tmpl:
2685 2682 committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl)
2686 2683 break
2687 2684 forms.pop()
2688 2685 else:
2689 2686 committext = buildcommittext(repo, ctx, subs, extramsg)
2690 2687
2691 2688 # run editor in the repository root
2692 2689 olddir = os.getcwd()
2693 2690 os.chdir(repo.root)
2694 2691 text = repo.ui.edit(committext, ctx.user(), ctx.extra(), editform=editform)
2695 2692 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2696 2693 os.chdir(olddir)
2697 2694
2698 2695 if finishdesc:
2699 2696 text = finishdesc(text)
2700 2697 if not text.strip():
2701 2698 raise util.Abort(_("empty commit message"))
2702 2699
2703 2700 return text
2704 2701
2705 2702 def buildcommittemplate(repo, ctx, subs, extramsg, tmpl):
2706 2703 ui = repo.ui
2707 2704 tmpl, mapfile = gettemplate(ui, tmpl, None)
2708 2705
2709 2706 try:
2710 2707 t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False)
2711 2708 except SyntaxError, inst:
2712 2709 raise util.Abort(inst.args[0])
2713 2710
2714 2711 for k, v in repo.ui.configitems('committemplate'):
2715 2712 if k != 'changeset':
2716 2713 t.t.cache[k] = v
2717 2714
2718 2715 if not extramsg:
2719 2716 extramsg = '' # ensure that extramsg is string
2720 2717
2721 2718 ui.pushbuffer()
2722 2719 t.show(ctx, extramsg=extramsg)
2723 2720 return ui.popbuffer()
2724 2721
2725 2722 def buildcommittext(repo, ctx, subs, extramsg):
2726 2723 edittext = []
2727 2724 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2728 2725 if ctx.description():
2729 2726 edittext.append(ctx.description())
2730 2727 edittext.append("")
2731 2728 edittext.append("") # Empty line between message and comments.
2732 2729 edittext.append(_("HG: Enter commit message."
2733 2730 " Lines beginning with 'HG:' are removed."))
2734 2731 edittext.append("HG: %s" % extramsg)
2735 2732 edittext.append("HG: --")
2736 2733 edittext.append(_("HG: user: %s") % ctx.user())
2737 2734 if ctx.p2():
2738 2735 edittext.append(_("HG: branch merge"))
2739 2736 if ctx.branch():
2740 2737 edittext.append(_("HG: branch '%s'") % ctx.branch())
2741 2738 if bookmarks.isactivewdirparent(repo):
2742 2739 edittext.append(_("HG: bookmark '%s'") % repo._activebookmark)
2743 2740 edittext.extend([_("HG: subrepo %s") % s for s in subs])
2744 2741 edittext.extend([_("HG: added %s") % f for f in added])
2745 2742 edittext.extend([_("HG: changed %s") % f for f in modified])
2746 2743 edittext.extend([_("HG: removed %s") % f for f in removed])
2747 2744 if not added and not modified and not removed:
2748 2745 edittext.append(_("HG: no files changed"))
2749 2746 edittext.append("")
2750 2747
2751 2748 return "\n".join(edittext)
2752 2749
2753 2750 def commitstatus(repo, node, branch, bheads=None, opts={}):
2754 2751 ctx = repo[node]
2755 2752 parents = ctx.parents()
2756 2753
2757 2754 if (not opts.get('amend') and bheads and node not in bheads and not
2758 2755 [x for x in parents if x.node() in bheads and x.branch() == branch]):
2759 2756 repo.ui.status(_('created new head\n'))
2760 2757 # The message is not printed for initial roots. For the other
2761 2758 # changesets, it is printed in the following situations:
2762 2759 #
2763 2760 # Par column: for the 2 parents with ...
2764 2761 # N: null or no parent
2765 2762 # B: parent is on another named branch
2766 2763 # C: parent is a regular non head changeset
2767 2764 # H: parent was a branch head of the current branch
2768 2765 # Msg column: whether we print "created new head" message
2769 2766 # In the following, it is assumed that there already exists some
2770 2767 # initial branch heads of the current branch, otherwise nothing is
2771 2768 # printed anyway.
2772 2769 #
2773 2770 # Par Msg Comment
2774 2771 # N N y additional topo root
2775 2772 #
2776 2773 # B N y additional branch root
2777 2774 # C N y additional topo head
2778 2775 # H N n usual case
2779 2776 #
2780 2777 # B B y weird additional branch root
2781 2778 # C B y branch merge
2782 2779 # H B n merge with named branch
2783 2780 #
2784 2781 # C C y additional head from merge
2785 2782 # C H n merge with a head
2786 2783 #
2787 2784 # H H n head merge: head count decreases
2788 2785
2789 2786 if not opts.get('close_branch'):
2790 2787 for r in parents:
2791 2788 if r.closesbranch() and r.branch() == branch:
2792 2789 repo.ui.status(_('reopening closed branch head %d\n') % r)
2793 2790
2794 2791 if repo.ui.debugflag:
2795 2792 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
2796 2793 elif repo.ui.verbose:
2797 2794 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
2798 2795
2799 2796 def revert(ui, repo, ctx, parents, *pats, **opts):
2800 2797 parent, p2 = parents
2801 2798 node = ctx.node()
2802 2799
2803 2800 mf = ctx.manifest()
2804 2801 if node == p2:
2805 2802 parent = p2
2806 2803 if node == parent:
2807 2804 pmf = mf
2808 2805 else:
2809 2806 pmf = None
2810 2807
2811 2808 # need all matching names in dirstate and manifest of target rev,
2812 2809 # so have to walk both. do not print errors if files exist in one
2813 2810 # but not other. in both cases, filesets should be evaluated against
2814 2811 # workingctx to get consistent result (issue4497). this means 'set:**'
2815 2812 # cannot be used to select missing files from target rev.
2816 2813
2817 2814 # `names` is a mapping for all elements in working copy and target revision
2818 2815 # The mapping is in the form:
2819 2816 # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
2820 2817 names = {}
2821 2818
2822 2819 wlock = repo.wlock()
2823 2820 try:
2824 2821 ## filling of the `names` mapping
2825 2822 # walk dirstate to fill `names`
2826 2823
2827 2824 interactive = opts.get('interactive', False)
2828 2825 wctx = repo[None]
2829 2826 m = scmutil.match(wctx, pats, opts)
2830 2827
2831 2828 # we'll need this later
2832 2829 targetsubs = sorted(s for s in wctx.substate if m(s))
2833 2830
2834 2831 if not m.always():
2835 2832 m.bad = lambda x, y: False
2836 2833 for abs in repo.walk(m):
2837 2834 names[abs] = m.rel(abs), m.exact(abs)
2838 2835
2839 2836 # walk target manifest to fill `names`
2840 2837
2841 2838 def badfn(path, msg):
2842 2839 if path in names:
2843 2840 return
2844 2841 if path in ctx.substate:
2845 2842 return
2846 2843 path_ = path + '/'
2847 2844 for f in names:
2848 2845 if f.startswith(path_):
2849 2846 return
2850 2847 ui.warn("%s: %s\n" % (m.rel(path), msg))
2851 2848
2852 2849 m.bad = badfn
2853 2850 for abs in ctx.walk(m):
2854 2851 if abs not in names:
2855 2852 names[abs] = m.rel(abs), m.exact(abs)
2856 2853
2857 2854 # Find status of all file in `names`.
2858 2855 m = scmutil.matchfiles(repo, names)
2859 2856
2860 2857 changes = repo.status(node1=node, match=m,
2861 2858 unknown=True, ignored=True, clean=True)
2862 2859 else:
2863 2860 changes = repo.status(node1=node, match=m)
2864 2861 for kind in changes:
2865 2862 for abs in kind:
2866 2863 names[abs] = m.rel(abs), m.exact(abs)
2867 2864
2868 2865 m = scmutil.matchfiles(repo, names)
2869 2866
2870 2867 modified = set(changes.modified)
2871 2868 added = set(changes.added)
2872 2869 removed = set(changes.removed)
2873 2870 _deleted = set(changes.deleted)
2874 2871 unknown = set(changes.unknown)
2875 2872 unknown.update(changes.ignored)
2876 2873 clean = set(changes.clean)
2877 2874 modadded = set()
2878 2875
2879 2876 # split between files known in target manifest and the others
2880 2877 smf = set(mf)
2881 2878
2882 2879 # determine the exact nature of the deleted changesets
2883 2880 deladded = _deleted - smf
2884 2881 deleted = _deleted - deladded
2885 2882
2886 2883 # We need to account for the state of the file in the dirstate,
2887 2884 # even when we revert against something else than parent. This will
2888 2885 # slightly alter the behavior of revert (doing back up or not, delete
2889 2886 # or just forget etc).
2890 2887 if parent == node:
2891 2888 dsmodified = modified
2892 2889 dsadded = added
2893 2890 dsremoved = removed
2894 2891 # store all local modifications, useful later for rename detection
2895 2892 localchanges = dsmodified | dsadded
2896 2893 modified, added, removed = set(), set(), set()
2897 2894 else:
2898 2895 changes = repo.status(node1=parent, match=m)
2899 2896 dsmodified = set(changes.modified)
2900 2897 dsadded = set(changes.added)
2901 2898 dsremoved = set(changes.removed)
2902 2899 # store all local modifications, useful later for rename detection
2903 2900 localchanges = dsmodified | dsadded
2904 2901
2905 2902 # only take into account for removes between wc and target
2906 2903 clean |= dsremoved - removed
2907 2904 dsremoved &= removed
2908 2905 # distinct between dirstate remove and other
2909 2906 removed -= dsremoved
2910 2907
2911 2908 modadded = added & dsmodified
2912 2909 added -= modadded
2913 2910
2914 2911 # tell newly modified apart.
2915 2912 dsmodified &= modified
2916 2913 dsmodified |= modified & dsadded # dirstate added may needs backup
2917 2914 modified -= dsmodified
2918 2915
2919 2916 # We need to wait for some post-processing to update this set
2920 2917 # before making the distinction. The dirstate will be used for
2921 2918 # that purpose.
2922 2919 dsadded = added
2923 2920
2924 2921 # in case of merge, files that are actually added can be reported as
2925 2922 # modified, we need to post process the result
2926 2923 if p2 != nullid:
2927 2924 if pmf is None:
2928 2925 # only need parent manifest in the merge case,
2929 2926 # so do not read by default
2930 2927 pmf = repo[parent].manifest()
2931 2928 mergeadd = dsmodified - set(pmf)
2932 2929 dsadded |= mergeadd
2933 2930 dsmodified -= mergeadd
2934 2931
2935 2932 # if f is a rename, update `names` to also revert the source
2936 2933 cwd = repo.getcwd()
2937 2934 for f in localchanges:
2938 2935 src = repo.dirstate.copied(f)
2939 2936 # XXX should we check for rename down to target node?
2940 2937 if src and src not in names and repo.dirstate[src] == 'r':
2941 2938 dsremoved.add(src)
2942 2939 names[src] = (repo.pathto(src, cwd), True)
2943 2940
2944 2941 # distinguish between file to forget and the other
2945 2942 added = set()
2946 2943 for abs in dsadded:
2947 2944 if repo.dirstate[abs] != 'a':
2948 2945 added.add(abs)
2949 2946 dsadded -= added
2950 2947
2951 2948 for abs in deladded:
2952 2949 if repo.dirstate[abs] == 'a':
2953 2950 dsadded.add(abs)
2954 2951 deladded -= dsadded
2955 2952
2956 2953 # For files marked as removed, we check if an unknown file is present at
2957 2954 # the same path. If a such file exists it may need to be backed up.
2958 2955 # Making the distinction at this stage helps have simpler backup
2959 2956 # logic.
2960 2957 removunk = set()
2961 2958 for abs in removed:
2962 2959 target = repo.wjoin(abs)
2963 2960 if os.path.lexists(target):
2964 2961 removunk.add(abs)
2965 2962 removed -= removunk
2966 2963
2967 2964 dsremovunk = set()
2968 2965 for abs in dsremoved:
2969 2966 target = repo.wjoin(abs)
2970 2967 if os.path.lexists(target):
2971 2968 dsremovunk.add(abs)
2972 2969 dsremoved -= dsremovunk
2973 2970
2974 2971 # action to be actually performed by revert
2975 2972 # (<list of file>, message>) tuple
2976 2973 actions = {'revert': ([], _('reverting %s\n')),
2977 2974 'add': ([], _('adding %s\n')),
2978 2975 'remove': ([], _('removing %s\n')),
2979 2976 'drop': ([], _('removing %s\n')),
2980 2977 'forget': ([], _('forgetting %s\n')),
2981 2978 'undelete': ([], _('undeleting %s\n')),
2982 2979 'noop': (None, _('no changes needed to %s\n')),
2983 2980 'unknown': (None, _('file not managed: %s\n')),
2984 2981 }
2985 2982
2986 2983 # "constant" that convey the backup strategy.
2987 2984 # All set to `discard` if `no-backup` is set do avoid checking
2988 2985 # no_backup lower in the code.
2989 2986 # These values are ordered for comparison purposes
2990 2987 backup = 2 # unconditionally do backup
2991 2988 check = 1 # check if the existing file differs from target
2992 2989 discard = 0 # never do backup
2993 2990 if opts.get('no_backup'):
2994 2991 backup = check = discard
2995 2992
2996 2993 backupanddel = actions['remove']
2997 2994 if not opts.get('no_backup'):
2998 2995 backupanddel = actions['drop']
2999 2996
3000 2997 disptable = (
3001 2998 # dispatch table:
3002 2999 # file state
3003 3000 # action
3004 3001 # make backup
3005 3002
3006 3003 ## Sets that results that will change file on disk
3007 3004 # Modified compared to target, no local change
3008 3005 (modified, actions['revert'], discard),
3009 3006 # Modified compared to target, but local file is deleted
3010 3007 (deleted, actions['revert'], discard),
3011 3008 # Modified compared to target, local change
3012 3009 (dsmodified, actions['revert'], backup),
3013 3010 # Added since target
3014 3011 (added, actions['remove'], discard),
3015 3012 # Added in working directory
3016 3013 (dsadded, actions['forget'], discard),
3017 3014 # Added since target, have local modification
3018 3015 (modadded, backupanddel, backup),
3019 3016 # Added since target but file is missing in working directory
3020 3017 (deladded, actions['drop'], discard),
3021 3018 # Removed since target, before working copy parent
3022 3019 (removed, actions['add'], discard),
3023 3020 # Same as `removed` but an unknown file exists at the same path
3024 3021 (removunk, actions['add'], check),
3025 3022 # Removed since targe, marked as such in working copy parent
3026 3023 (dsremoved, actions['undelete'], discard),
3027 3024 # Same as `dsremoved` but an unknown file exists at the same path
3028 3025 (dsremovunk, actions['undelete'], check),
3029 3026 ## the following sets does not result in any file changes
3030 3027 # File with no modification
3031 3028 (clean, actions['noop'], discard),
3032 3029 # Existing file, not tracked anywhere
3033 3030 (unknown, actions['unknown'], discard),
3034 3031 )
3035 3032
3036 3033 for abs, (rel, exact) in sorted(names.items()):
3037 3034 # target file to be touch on disk (relative to cwd)
3038 3035 target = repo.wjoin(abs)
3039 3036 # search the entry in the dispatch table.
3040 3037 # if the file is in any of these sets, it was touched in the working
3041 3038 # directory parent and we are sure it needs to be reverted.
3042 3039 for table, (xlist, msg), dobackup in disptable:
3043 3040 if abs not in table:
3044 3041 continue
3045 3042 if xlist is not None:
3046 3043 xlist.append(abs)
3047 3044 if dobackup and (backup <= dobackup
3048 3045 or wctx[abs].cmp(ctx[abs])):
3049 3046 bakname = "%s.orig" % rel
3050 3047 ui.note(_('saving current version of %s as %s\n') %
3051 3048 (rel, bakname))
3052 3049 if not opts.get('dry_run'):
3053 3050 if interactive:
3054 3051 util.copyfile(target, bakname)
3055 3052 else:
3056 3053 util.rename(target, bakname)
3057 3054 if ui.verbose or not exact:
3058 3055 if not isinstance(msg, basestring):
3059 3056 msg = msg(abs)
3060 3057 ui.status(msg % rel)
3061 3058 elif exact:
3062 3059 ui.warn(msg % rel)
3063 3060 break
3064 3061
3065 3062 if not opts.get('dry_run'):
3066 3063 needdata = ('revert', 'add', 'undelete')
3067 3064 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
3068 3065 _performrevert(repo, parents, ctx, actions, interactive)
3069 3066
3070 3067 if targetsubs:
3071 3068 # Revert the subrepos on the revert list
3072 3069 for sub in targetsubs:
3073 3070 try:
3074 3071 wctx.sub(sub).revert(ctx.substate[sub], *pats, **opts)
3075 3072 except KeyError:
3076 3073 raise util.Abort("subrepository '%s' does not exist in %s!"
3077 3074 % (sub, short(ctx.node())))
3078 3075 finally:
3079 3076 wlock.release()
3080 3077
3081 3078 def _revertprefetch(repo, ctx, *files):
3082 3079 """Let extension changing the storage layer prefetch content"""
3083 3080 pass
3084 3081
3085 3082 def _performrevert(repo, parents, ctx, actions, interactive=False):
3086 3083 """function that actually perform all the actions computed for revert
3087 3084
3088 3085 This is an independent function to let extension to plug in and react to
3089 3086 the imminent revert.
3090 3087
3091 3088 Make sure you have the working directory locked when calling this function.
3092 3089 """
3093 3090 parent, p2 = parents
3094 3091 node = ctx.node()
3095 3092 def checkout(f):
3096 3093 fc = ctx[f]
3097 3094 return repo.wwrite(f, fc.data(), fc.flags())
3098 3095
3099 3096 audit_path = pathutil.pathauditor(repo.root)
3100 3097 for f in actions['forget'][0]:
3101 3098 repo.dirstate.drop(f)
3102 3099 for f in actions['remove'][0]:
3103 3100 audit_path(f)
3104 3101 try:
3105 3102 util.unlinkpath(repo.wjoin(f))
3106 3103 except OSError:
3107 3104 pass
3108 3105 repo.dirstate.remove(f)
3109 3106 for f in actions['drop'][0]:
3110 3107 audit_path(f)
3111 3108 repo.dirstate.remove(f)
3112 3109
3113 3110 normal = None
3114 3111 if node == parent:
3115 3112 # We're reverting to our parent. If possible, we'd like status
3116 3113 # to report the file as clean. We have to use normallookup for
3117 3114 # merges to avoid losing information about merged/dirty files.
3118 3115 if p2 != nullid:
3119 3116 normal = repo.dirstate.normallookup
3120 3117 else:
3121 3118 normal = repo.dirstate.normal
3122 3119
3123 3120 if interactive:
3124 3121 # Prompt the user for changes to revert
3125 3122 torevert = [repo.wjoin(f) for f in actions['revert'][0]]
3126 3123 m = scmutil.match(ctx, torevert, {})
3127 3124 diff = patch.diff(repo, None, ctx.node(), m)
3128 3125 originalchunks = patch.parsepatch(diff)
3129 3126 try:
3130 3127 chunks = recordfilter(repo.ui, originalchunks)
3131 3128 except patch.PatchError, err:
3132 3129 raise util.Abort(_('error parsing patch: %s') % err)
3133 3130
3134 3131 # Apply changes
3135 3132 fp = cStringIO.StringIO()
3136 3133 for c in chunks:
3137 3134 c.write(fp)
3138 3135 dopatch = fp.tell()
3139 3136 fp.seek(0)
3140 3137 if dopatch:
3141 3138 try:
3142 3139 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3143 3140 except patch.PatchError, err:
3144 3141 raise util.Abort(str(err))
3145 3142 del fp
3146 3143 else:
3147 3144 for f in actions['revert'][0]:
3148 3145 wsize = checkout(f)
3149 3146 if normal:
3150 3147 normal(f)
3151 3148 elif wsize == repo.dirstate._map[f][2]:
3152 3149 # changes may be overlooked without normallookup,
3153 3150 # if size isn't changed at reverting
3154 3151 repo.dirstate.normallookup(f)
3155 3152
3156 3153 for f in actions['add'][0]:
3157 3154 checkout(f)
3158 3155 repo.dirstate.add(f)
3159 3156
3160 3157 normal = repo.dirstate.normallookup
3161 3158 if node == parent and p2 == nullid:
3162 3159 normal = repo.dirstate.normal
3163 3160 for f in actions['undelete'][0]:
3164 3161 checkout(f)
3165 3162 normal(f)
3166 3163
3167 3164 copied = copies.pathcopies(repo[parent], ctx)
3168 3165
3169 3166 for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
3170 3167 if f in copied:
3171 3168 repo.dirstate.copy(copied[f], f)
3172 3169
3173 3170 def command(table):
3174 3171 """Returns a function object to be used as a decorator for making commands.
3175 3172
3176 3173 This function receives a command table as its argument. The table should
3177 3174 be a dict.
3178 3175
3179 3176 The returned function can be used as a decorator for adding commands
3180 3177 to that command table. This function accepts multiple arguments to define
3181 3178 a command.
3182 3179
3183 3180 The first argument is the command name.
3184 3181
3185 3182 The options argument is an iterable of tuples defining command arguments.
3186 3183 See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple.
3187 3184
3188 3185 The synopsis argument defines a short, one line summary of how to use the
3189 3186 command. This shows up in the help output.
3190 3187
3191 3188 The norepo argument defines whether the command does not require a
3192 3189 local repository. Most commands operate against a repository, thus the
3193 3190 default is False.
3194 3191
3195 3192 The optionalrepo argument defines whether the command optionally requires
3196 3193 a local repository.
3197 3194
3198 3195 The inferrepo argument defines whether to try to find a repository from the
3199 3196 command line arguments. If True, arguments will be examined for potential
3200 3197 repository locations. See ``findrepo()``. If a repository is found, it
3201 3198 will be used.
3202 3199 """
3203 3200 def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False,
3204 3201 inferrepo=False):
3205 3202 def decorator(func):
3206 3203 if synopsis:
3207 3204 table[name] = func, list(options), synopsis
3208 3205 else:
3209 3206 table[name] = func, list(options)
3210 3207
3211 3208 if norepo:
3212 3209 # Avoid import cycle.
3213 3210 import commands
3214 3211 commands.norepo += ' %s' % ' '.join(parsealiases(name))
3215 3212
3216 3213 if optionalrepo:
3217 3214 import commands
3218 3215 commands.optionalrepo += ' %s' % ' '.join(parsealiases(name))
3219 3216
3220 3217 if inferrepo:
3221 3218 import commands
3222 3219 commands.inferrepo += ' %s' % ' '.join(parsealiases(name))
3223 3220
3224 3221 return func
3225 3222 return decorator
3226 3223
3227 3224 return cmd
3228 3225
3229 3226 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3230 3227 # commands.outgoing. "missing" is "missing" of the result of
3231 3228 # "findcommonoutgoing()"
3232 3229 outgoinghooks = util.hooks()
3233 3230
3234 3231 # a list of (ui, repo) functions called by commands.summary
3235 3232 summaryhooks = util.hooks()
3236 3233
3237 3234 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3238 3235 #
3239 3236 # functions should return tuple of booleans below, if 'changes' is None:
3240 3237 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3241 3238 #
3242 3239 # otherwise, 'changes' is a tuple of tuples below:
3243 3240 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3244 3241 # - (desturl, destbranch, destpeer, outgoing)
3245 3242 summaryremotehooks = util.hooks()
3246 3243
3247 3244 # A list of state files kept by multistep operations like graft.
3248 3245 # Since graft cannot be aborted, it is considered 'clearable' by update.
3249 3246 # note: bisect is intentionally excluded
3250 3247 # (state file, clearable, allowcommit, error, hint)
3251 3248 unfinishedstates = [
3252 3249 ('graftstate', True, False, _('graft in progress'),
3253 3250 _("use 'hg graft --continue' or 'hg update' to abort")),
3254 3251 ('updatestate', True, False, _('last update was interrupted'),
3255 3252 _("use 'hg update' to get a consistent checkout"))
3256 3253 ]
3257 3254
3258 3255 def checkunfinished(repo, commit=False):
3259 3256 '''Look for an unfinished multistep operation, like graft, and abort
3260 3257 if found. It's probably good to check this right before
3261 3258 bailifchanged().
3262 3259 '''
3263 3260 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3264 3261 if commit and allowcommit:
3265 3262 continue
3266 3263 if repo.vfs.exists(f):
3267 3264 raise util.Abort(msg, hint=hint)
3268 3265
3269 3266 def clearunfinished(repo):
3270 3267 '''Check for unfinished operations (as above), and clear the ones
3271 3268 that are clearable.
3272 3269 '''
3273 3270 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3274 3271 if not clearable and repo.vfs.exists(f):
3275 3272 raise util.Abort(msg, hint=hint)
3276 3273 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3277 3274 if clearable and repo.vfs.exists(f):
3278 3275 util.unlink(repo.join(f))
3279 3276
3280 3277 class dirstateguard(object):
3281 3278 '''Restore dirstate at unexpected failure.
3282 3279
3283 3280 At the construction, this class does:
3284 3281
3285 3282 - write current ``repo.dirstate`` out, and
3286 3283 - save ``.hg/dirstate`` into the backup file
3287 3284
3288 3285 This restores ``.hg/dirstate`` from backup file, if ``release()``
3289 3286 is invoked before ``close()``.
3290 3287
3291 3288 This just removes the backup file at ``close()`` before ``release()``.
3292 3289 '''
3293 3290
3294 3291 def __init__(self, repo, name):
3295 3292 repo.dirstate.write()
3296 3293 self._repo = repo
3297 3294 self._filename = 'dirstate.backup.%s.%d' % (name, id(self))
3298 3295 repo.vfs.write(self._filename, repo.vfs.tryread('dirstate'))
3299 3296 self._active = True
3300 3297 self._closed = False
3301 3298
3302 3299 def __del__(self):
3303 3300 if self._active: # still active
3304 3301 # this may occur, even if this class is used correctly:
3305 3302 # for example, releasing other resources like transaction
3306 3303 # may raise exception before ``dirstateguard.release`` in
3307 3304 # ``release(tr, ....)``.
3308 3305 self._abort()
3309 3306
3310 3307 def close(self):
3311 3308 if not self._active: # already inactivated
3312 3309 msg = (_("can't close already inactivated backup: %s")
3313 3310 % self._filename)
3314 3311 raise util.Abort(msg)
3315 3312
3316 3313 self._repo.vfs.unlink(self._filename)
3317 3314 self._active = False
3318 3315 self._closed = True
3319 3316
3320 3317 def _abort(self):
3321 3318 # this "invalidate()" prevents "wlock.release()" from writing
3322 3319 # changes of dirstate out after restoring to original status
3323 3320 self._repo.dirstate.invalidate()
3324 3321
3325 3322 self._repo.vfs.rename(self._filename, 'dirstate')
3326 3323 self._active = False
3327 3324
3328 3325 def release(self):
3329 3326 if not self._closed:
3330 3327 if not self._active: # already inactivated
3331 3328 msg = (_("can't release already inactivated backup: %s")
3332 3329 % self._filename)
3333 3330 raise util.Abort(msg)
3334 3331 self._abort()
General Comments 0
You need to be logged in to leave comments. Login now