##// END OF EJS Templates
walkchangerevs: reset cache between windows
Matt Mackall -
r9664:2a4a0dc4 default
parent child Browse files
Show More
@@ -1,1281 +1,1282 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, incorporated herein by reference.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from i18n import _
10 10 import os, sys, errno, re, glob
11 11 import mdiff, bdiff, util, templater, patch, error, encoding
12 12 import match as _match
13 13
14 14 revrangesep = ':'
15 15
16 16 def findpossible(cmd, table, strict=False):
17 17 """
18 18 Return cmd -> (aliases, command table entry)
19 19 for each matching command.
20 20 Return debug commands (or their aliases) only if no normal command matches.
21 21 """
22 22 choice = {}
23 23 debugchoice = {}
24 24 for e in table.keys():
25 25 aliases = e.lstrip("^").split("|")
26 26 found = None
27 27 if cmd in aliases:
28 28 found = cmd
29 29 elif not strict:
30 30 for a in aliases:
31 31 if a.startswith(cmd):
32 32 found = a
33 33 break
34 34 if found is not None:
35 35 if aliases[0].startswith("debug") or found.startswith("debug"):
36 36 debugchoice[found] = (aliases, table[e])
37 37 else:
38 38 choice[found] = (aliases, table[e])
39 39
40 40 if not choice and debugchoice:
41 41 choice = debugchoice
42 42
43 43 return choice
44 44
45 45 def findcmd(cmd, table, strict=True):
46 46 """Return (aliases, command table entry) for command string."""
47 47 choice = findpossible(cmd, table, strict)
48 48
49 49 if cmd in choice:
50 50 return choice[cmd]
51 51
52 52 if len(choice) > 1:
53 53 clist = choice.keys()
54 54 clist.sort()
55 55 raise error.AmbiguousCommand(cmd, clist)
56 56
57 57 if choice:
58 58 return choice.values()[0]
59 59
60 60 raise error.UnknownCommand(cmd)
61 61
62 62 def bail_if_changed(repo):
63 63 if repo.dirstate.parents()[1] != nullid:
64 64 raise util.Abort(_('outstanding uncommitted merge'))
65 65 modified, added, removed, deleted = repo.status()[:4]
66 66 if modified or added or removed or deleted:
67 67 raise util.Abort(_("outstanding uncommitted changes"))
68 68
69 69 def logmessage(opts):
70 70 """ get the log message according to -m and -l option """
71 71 message = opts.get('message')
72 72 logfile = opts.get('logfile')
73 73
74 74 if message and logfile:
75 75 raise util.Abort(_('options --message and --logfile are mutually '
76 76 'exclusive'))
77 77 if not message and logfile:
78 78 try:
79 79 if logfile == '-':
80 80 message = sys.stdin.read()
81 81 else:
82 82 message = open(logfile).read()
83 83 except IOError, inst:
84 84 raise util.Abort(_("can't read commit message '%s': %s") %
85 85 (logfile, inst.strerror))
86 86 return message
87 87
88 88 def loglimit(opts):
89 89 """get the log limit according to option -l/--limit"""
90 90 limit = opts.get('limit')
91 91 if limit:
92 92 try:
93 93 limit = int(limit)
94 94 except ValueError:
95 95 raise util.Abort(_('limit must be a positive integer'))
96 96 if limit <= 0: raise util.Abort(_('limit must be positive'))
97 97 else:
98 98 limit = sys.maxint
99 99 return limit
100 100
101 101 def remoteui(src, opts):
102 102 'build a remote ui from ui or repo and opts'
103 103 if hasattr(src, 'baseui'): # looks like a repository
104 104 dst = src.baseui.copy() # drop repo-specific config
105 105 src = src.ui # copy target options from repo
106 106 else: # assume it's a global ui object
107 107 dst = src.copy() # keep all global options
108 108
109 109 # copy ssh-specific options
110 110 for o in 'ssh', 'remotecmd':
111 111 v = opts.get(o) or src.config('ui', o)
112 112 if v:
113 113 dst.setconfig("ui", o, v)
114 114 # copy bundle-specific options
115 115 r = src.config('bundle', 'mainreporoot')
116 116 if r:
117 117 dst.setconfig('bundle', 'mainreporoot', r)
118 118
119 119 return dst
120 120
121 121 def revpair(repo, revs):
122 122 '''return pair of nodes, given list of revisions. second item can
123 123 be None, meaning use working dir.'''
124 124
125 125 def revfix(repo, val, defval):
126 126 if not val and val != 0 and defval is not None:
127 127 val = defval
128 128 return repo.lookup(val)
129 129
130 130 if not revs:
131 131 return repo.dirstate.parents()[0], None
132 132 end = None
133 133 if len(revs) == 1:
134 134 if revrangesep in revs[0]:
135 135 start, end = revs[0].split(revrangesep, 1)
136 136 start = revfix(repo, start, 0)
137 137 end = revfix(repo, end, len(repo) - 1)
138 138 else:
139 139 start = revfix(repo, revs[0], None)
140 140 elif len(revs) == 2:
141 141 if revrangesep in revs[0] or revrangesep in revs[1]:
142 142 raise util.Abort(_('too many revisions specified'))
143 143 start = revfix(repo, revs[0], None)
144 144 end = revfix(repo, revs[1], None)
145 145 else:
146 146 raise util.Abort(_('too many revisions specified'))
147 147 return start, end
148 148
149 149 def revrange(repo, revs):
150 150 """Yield revision as strings from a list of revision specifications."""
151 151
152 152 def revfix(repo, val, defval):
153 153 if not val and val != 0 and defval is not None:
154 154 return defval
155 155 return repo.changelog.rev(repo.lookup(val))
156 156
157 157 seen, l = set(), []
158 158 for spec in revs:
159 159 if revrangesep in spec:
160 160 start, end = spec.split(revrangesep, 1)
161 161 start = revfix(repo, start, 0)
162 162 end = revfix(repo, end, len(repo) - 1)
163 163 step = start > end and -1 or 1
164 164 for rev in xrange(start, end+step, step):
165 165 if rev in seen:
166 166 continue
167 167 seen.add(rev)
168 168 l.append(rev)
169 169 else:
170 170 rev = revfix(repo, spec, None)
171 171 if rev in seen:
172 172 continue
173 173 seen.add(rev)
174 174 l.append(rev)
175 175
176 176 return l
177 177
178 178 def make_filename(repo, pat, node,
179 179 total=None, seqno=None, revwidth=None, pathname=None):
180 180 node_expander = {
181 181 'H': lambda: hex(node),
182 182 'R': lambda: str(repo.changelog.rev(node)),
183 183 'h': lambda: short(node),
184 184 }
185 185 expander = {
186 186 '%': lambda: '%',
187 187 'b': lambda: os.path.basename(repo.root),
188 188 }
189 189
190 190 try:
191 191 if node:
192 192 expander.update(node_expander)
193 193 if node:
194 194 expander['r'] = (lambda:
195 195 str(repo.changelog.rev(node)).zfill(revwidth or 0))
196 196 if total is not None:
197 197 expander['N'] = lambda: str(total)
198 198 if seqno is not None:
199 199 expander['n'] = lambda: str(seqno)
200 200 if total is not None and seqno is not None:
201 201 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
202 202 if pathname is not None:
203 203 expander['s'] = lambda: os.path.basename(pathname)
204 204 expander['d'] = lambda: os.path.dirname(pathname) or '.'
205 205 expander['p'] = lambda: pathname
206 206
207 207 newname = []
208 208 patlen = len(pat)
209 209 i = 0
210 210 while i < patlen:
211 211 c = pat[i]
212 212 if c == '%':
213 213 i += 1
214 214 c = pat[i]
215 215 c = expander[c]()
216 216 newname.append(c)
217 217 i += 1
218 218 return ''.join(newname)
219 219 except KeyError, inst:
220 220 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
221 221 inst.args[0])
222 222
223 223 def make_file(repo, pat, node=None,
224 224 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
225 225
226 226 writable = 'w' in mode or 'a' in mode
227 227
228 228 if not pat or pat == '-':
229 229 return writable and sys.stdout or sys.stdin
230 230 if hasattr(pat, 'write') and writable:
231 231 return pat
232 232 if hasattr(pat, 'read') and 'r' in mode:
233 233 return pat
234 234 return open(make_filename(repo, pat, node, total, seqno, revwidth,
235 235 pathname),
236 236 mode)
237 237
238 238 def expandpats(pats):
239 239 if not util.expandglobs:
240 240 return list(pats)
241 241 ret = []
242 242 for p in pats:
243 243 kind, name = _match._patsplit(p, None)
244 244 if kind is None:
245 245 try:
246 246 globbed = glob.glob(name)
247 247 except re.error:
248 248 globbed = [name]
249 249 if globbed:
250 250 ret.extend(globbed)
251 251 continue
252 252 ret.append(p)
253 253 return ret
254 254
255 255 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
256 256 if not globbed and default == 'relpath':
257 257 pats = expandpats(pats or [])
258 258 m = _match.match(repo.root, repo.getcwd(), pats,
259 259 opts.get('include'), opts.get('exclude'), default)
260 260 def badfn(f, msg):
261 261 repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
262 262 m.bad = badfn
263 263 return m
264 264
265 265 def matchall(repo):
266 266 return _match.always(repo.root, repo.getcwd())
267 267
268 268 def matchfiles(repo, files):
269 269 return _match.exact(repo.root, repo.getcwd(), files)
270 270
271 271 def findrenames(repo, added, removed, threshold):
272 272 '''find renamed files -- yields (before, after, score) tuples'''
273 273 ctx = repo['.']
274 274 for a in added:
275 275 aa = repo.wread(a)
276 276 bestname, bestscore = None, threshold
277 277 for r in removed:
278 278 if r not in ctx:
279 279 continue
280 280 rr = ctx.filectx(r).data()
281 281
282 282 # bdiff.blocks() returns blocks of matching lines
283 283 # count the number of bytes in each
284 284 equal = 0
285 285 alines = mdiff.splitnewlines(aa)
286 286 matches = bdiff.blocks(aa, rr)
287 287 for x1,x2,y1,y2 in matches:
288 288 for line in alines[x1:x2]:
289 289 equal += len(line)
290 290
291 291 lengths = len(aa) + len(rr)
292 292 if lengths:
293 293 myscore = equal*2.0 / lengths
294 294 if myscore >= bestscore:
295 295 bestname, bestscore = r, myscore
296 296 if bestname:
297 297 yield bestname, a, bestscore
298 298
299 299 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
300 300 if dry_run is None:
301 301 dry_run = opts.get('dry_run')
302 302 if similarity is None:
303 303 similarity = float(opts.get('similarity') or 0)
304 304 # we'd use status here, except handling of symlinks and ignore is tricky
305 305 added, unknown, deleted, removed = [], [], [], []
306 306 audit_path = util.path_auditor(repo.root)
307 307 m = match(repo, pats, opts)
308 308 for abs in repo.walk(m):
309 309 target = repo.wjoin(abs)
310 310 good = True
311 311 try:
312 312 audit_path(abs)
313 313 except:
314 314 good = False
315 315 rel = m.rel(abs)
316 316 exact = m.exact(abs)
317 317 if good and abs not in repo.dirstate:
318 318 unknown.append(abs)
319 319 if repo.ui.verbose or not exact:
320 320 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
321 321 elif repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
322 322 or (os.path.isdir(target) and not os.path.islink(target))):
323 323 deleted.append(abs)
324 324 if repo.ui.verbose or not exact:
325 325 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
326 326 # for finding renames
327 327 elif repo.dirstate[abs] == 'r':
328 328 removed.append(abs)
329 329 elif repo.dirstate[abs] == 'a':
330 330 added.append(abs)
331 331 if not dry_run:
332 332 repo.remove(deleted)
333 333 repo.add(unknown)
334 334 if similarity > 0:
335 335 for old, new, score in findrenames(repo, added + unknown,
336 336 removed + deleted, similarity):
337 337 if repo.ui.verbose or not m.exact(old) or not m.exact(new):
338 338 repo.ui.status(_('recording removal of %s as rename to %s '
339 339 '(%d%% similar)\n') %
340 340 (m.rel(old), m.rel(new), score * 100))
341 341 if not dry_run:
342 342 repo.copy(old, new)
343 343
344 344 def copy(ui, repo, pats, opts, rename=False):
345 345 # called with the repo lock held
346 346 #
347 347 # hgsep => pathname that uses "/" to separate directories
348 348 # ossep => pathname that uses os.sep to separate directories
349 349 cwd = repo.getcwd()
350 350 targets = {}
351 351 after = opts.get("after")
352 352 dryrun = opts.get("dry_run")
353 353
354 354 def walkpat(pat):
355 355 srcs = []
356 356 m = match(repo, [pat], opts, globbed=True)
357 357 for abs in repo.walk(m):
358 358 state = repo.dirstate[abs]
359 359 rel = m.rel(abs)
360 360 exact = m.exact(abs)
361 361 if state in '?r':
362 362 if exact and state == '?':
363 363 ui.warn(_('%s: not copying - file is not managed\n') % rel)
364 364 if exact and state == 'r':
365 365 ui.warn(_('%s: not copying - file has been marked for'
366 366 ' remove\n') % rel)
367 367 continue
368 368 # abs: hgsep
369 369 # rel: ossep
370 370 srcs.append((abs, rel, exact))
371 371 return srcs
372 372
373 373 # abssrc: hgsep
374 374 # relsrc: ossep
375 375 # otarget: ossep
376 376 def copyfile(abssrc, relsrc, otarget, exact):
377 377 abstarget = util.canonpath(repo.root, cwd, otarget)
378 378 reltarget = repo.pathto(abstarget, cwd)
379 379 target = repo.wjoin(abstarget)
380 380 src = repo.wjoin(abssrc)
381 381 state = repo.dirstate[abstarget]
382 382
383 383 # check for collisions
384 384 prevsrc = targets.get(abstarget)
385 385 if prevsrc is not None:
386 386 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
387 387 (reltarget, repo.pathto(abssrc, cwd),
388 388 repo.pathto(prevsrc, cwd)))
389 389 return
390 390
391 391 # check for overwrites
392 392 exists = os.path.exists(target)
393 393 if not after and exists or after and state in 'mn':
394 394 if not opts['force']:
395 395 ui.warn(_('%s: not overwriting - file exists\n') %
396 396 reltarget)
397 397 return
398 398
399 399 if after:
400 400 if not exists:
401 401 return
402 402 elif not dryrun:
403 403 try:
404 404 if exists:
405 405 os.unlink(target)
406 406 targetdir = os.path.dirname(target) or '.'
407 407 if not os.path.isdir(targetdir):
408 408 os.makedirs(targetdir)
409 409 util.copyfile(src, target)
410 410 except IOError, inst:
411 411 if inst.errno == errno.ENOENT:
412 412 ui.warn(_('%s: deleted in working copy\n') % relsrc)
413 413 else:
414 414 ui.warn(_('%s: cannot copy - %s\n') %
415 415 (relsrc, inst.strerror))
416 416 return True # report a failure
417 417
418 418 if ui.verbose or not exact:
419 419 if rename:
420 420 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
421 421 else:
422 422 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
423 423
424 424 targets[abstarget] = abssrc
425 425
426 426 # fix up dirstate
427 427 origsrc = repo.dirstate.copied(abssrc) or abssrc
428 428 if abstarget == origsrc: # copying back a copy?
429 429 if state not in 'mn' and not dryrun:
430 430 repo.dirstate.normallookup(abstarget)
431 431 else:
432 432 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
433 433 if not ui.quiet:
434 434 ui.warn(_("%s has not been committed yet, so no copy "
435 435 "data will be stored for %s.\n")
436 436 % (repo.pathto(origsrc, cwd), reltarget))
437 437 if repo.dirstate[abstarget] in '?r' and not dryrun:
438 438 repo.add([abstarget])
439 439 elif not dryrun:
440 440 repo.copy(origsrc, abstarget)
441 441
442 442 if rename and not dryrun:
443 443 repo.remove([abssrc], not after)
444 444
445 445 # pat: ossep
446 446 # dest ossep
447 447 # srcs: list of (hgsep, hgsep, ossep, bool)
448 448 # return: function that takes hgsep and returns ossep
449 449 def targetpathfn(pat, dest, srcs):
450 450 if os.path.isdir(pat):
451 451 abspfx = util.canonpath(repo.root, cwd, pat)
452 452 abspfx = util.localpath(abspfx)
453 453 if destdirexists:
454 454 striplen = len(os.path.split(abspfx)[0])
455 455 else:
456 456 striplen = len(abspfx)
457 457 if striplen:
458 458 striplen += len(os.sep)
459 459 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
460 460 elif destdirexists:
461 461 res = lambda p: os.path.join(dest,
462 462 os.path.basename(util.localpath(p)))
463 463 else:
464 464 res = lambda p: dest
465 465 return res
466 466
467 467 # pat: ossep
468 468 # dest ossep
469 469 # srcs: list of (hgsep, hgsep, ossep, bool)
470 470 # return: function that takes hgsep and returns ossep
471 471 def targetpathafterfn(pat, dest, srcs):
472 472 if _match.patkind(pat):
473 473 # a mercurial pattern
474 474 res = lambda p: os.path.join(dest,
475 475 os.path.basename(util.localpath(p)))
476 476 else:
477 477 abspfx = util.canonpath(repo.root, cwd, pat)
478 478 if len(abspfx) < len(srcs[0][0]):
479 479 # A directory. Either the target path contains the last
480 480 # component of the source path or it does not.
481 481 def evalpath(striplen):
482 482 score = 0
483 483 for s in srcs:
484 484 t = os.path.join(dest, util.localpath(s[0])[striplen:])
485 485 if os.path.exists(t):
486 486 score += 1
487 487 return score
488 488
489 489 abspfx = util.localpath(abspfx)
490 490 striplen = len(abspfx)
491 491 if striplen:
492 492 striplen += len(os.sep)
493 493 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
494 494 score = evalpath(striplen)
495 495 striplen1 = len(os.path.split(abspfx)[0])
496 496 if striplen1:
497 497 striplen1 += len(os.sep)
498 498 if evalpath(striplen1) > score:
499 499 striplen = striplen1
500 500 res = lambda p: os.path.join(dest,
501 501 util.localpath(p)[striplen:])
502 502 else:
503 503 # a file
504 504 if destdirexists:
505 505 res = lambda p: os.path.join(dest,
506 506 os.path.basename(util.localpath(p)))
507 507 else:
508 508 res = lambda p: dest
509 509 return res
510 510
511 511
512 512 pats = expandpats(pats)
513 513 if not pats:
514 514 raise util.Abort(_('no source or destination specified'))
515 515 if len(pats) == 1:
516 516 raise util.Abort(_('no destination specified'))
517 517 dest = pats.pop()
518 518 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
519 519 if not destdirexists:
520 520 if len(pats) > 1 or _match.patkind(pats[0]):
521 521 raise util.Abort(_('with multiple sources, destination must be an '
522 522 'existing directory'))
523 523 if util.endswithsep(dest):
524 524 raise util.Abort(_('destination %s is not a directory') % dest)
525 525
526 526 tfn = targetpathfn
527 527 if after:
528 528 tfn = targetpathafterfn
529 529 copylist = []
530 530 for pat in pats:
531 531 srcs = walkpat(pat)
532 532 if not srcs:
533 533 continue
534 534 copylist.append((tfn(pat, dest, srcs), srcs))
535 535 if not copylist:
536 536 raise util.Abort(_('no files to copy'))
537 537
538 538 errors = 0
539 539 for targetpath, srcs in copylist:
540 540 for abssrc, relsrc, exact in srcs:
541 541 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
542 542 errors += 1
543 543
544 544 if errors:
545 545 ui.warn(_('(consider using --after)\n'))
546 546
547 547 return errors
548 548
549 549 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
550 550 runargs=None):
551 551 '''Run a command as a service.'''
552 552
553 553 if opts['daemon'] and not opts['daemon_pipefds']:
554 554 rfd, wfd = os.pipe()
555 555 if not runargs:
556 556 runargs = sys.argv[:]
557 557 runargs.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
558 558 # Don't pass --cwd to the child process, because we've already
559 559 # changed directory.
560 560 for i in xrange(1,len(runargs)):
561 561 if runargs[i].startswith('--cwd='):
562 562 del runargs[i]
563 563 break
564 564 elif runargs[i].startswith('--cwd'):
565 565 del runargs[i:i+2]
566 566 break
567 567 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
568 568 runargs[0], runargs)
569 569 os.close(wfd)
570 570 os.read(rfd, 1)
571 571 if parentfn:
572 572 return parentfn(pid)
573 573 else:
574 574 os._exit(0)
575 575
576 576 if initfn:
577 577 initfn()
578 578
579 579 if opts['pid_file']:
580 580 fp = open(opts['pid_file'], 'w')
581 581 fp.write(str(os.getpid()) + '\n')
582 582 fp.close()
583 583
584 584 if opts['daemon_pipefds']:
585 585 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
586 586 os.close(rfd)
587 587 try:
588 588 os.setsid()
589 589 except AttributeError:
590 590 pass
591 591 os.write(wfd, 'y')
592 592 os.close(wfd)
593 593 sys.stdout.flush()
594 594 sys.stderr.flush()
595 595
596 596 nullfd = os.open(util.nulldev, os.O_RDWR)
597 597 logfilefd = nullfd
598 598 if logfile:
599 599 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
600 600 os.dup2(nullfd, 0)
601 601 os.dup2(logfilefd, 1)
602 602 os.dup2(logfilefd, 2)
603 603 if nullfd not in (0, 1, 2):
604 604 os.close(nullfd)
605 605 if logfile and logfilefd not in (0, 1, 2):
606 606 os.close(logfilefd)
607 607
608 608 if runfn:
609 609 return runfn()
610 610
611 611 class changeset_printer(object):
612 612 '''show changeset information when templating not requested.'''
613 613
614 614 def __init__(self, ui, repo, patch, diffopts, buffered):
615 615 self.ui = ui
616 616 self.repo = repo
617 617 self.buffered = buffered
618 618 self.patch = patch
619 619 self.diffopts = diffopts
620 620 self.header = {}
621 621 self.hunk = {}
622 622 self.lastheader = None
623 623
624 624 def flush(self, rev):
625 625 if rev in self.header:
626 626 h = self.header[rev]
627 627 if h != self.lastheader:
628 628 self.lastheader = h
629 629 self.ui.write(h)
630 630 del self.header[rev]
631 631 if rev in self.hunk:
632 632 self.ui.write(self.hunk[rev])
633 633 del self.hunk[rev]
634 634 return 1
635 635 return 0
636 636
637 637 def show(self, ctx, copies=(), **props):
638 638 if self.buffered:
639 639 self.ui.pushbuffer()
640 640 self._show(ctx, copies, props)
641 641 self.hunk[ctx.rev()] = self.ui.popbuffer()
642 642 else:
643 643 self._show(ctx, copies, props)
644 644
645 645 def _show(self, ctx, copies, props):
646 646 '''show a single changeset or file revision'''
647 647 changenode = ctx.node()
648 648 rev = ctx.rev()
649 649
650 650 if self.ui.quiet:
651 651 self.ui.write("%d:%s\n" % (rev, short(changenode)))
652 652 return
653 653
654 654 log = self.repo.changelog
655 655 date = util.datestr(ctx.date())
656 656
657 657 hexfunc = self.ui.debugflag and hex or short
658 658
659 659 parents = [(p, hexfunc(log.node(p)))
660 660 for p in self._meaningful_parentrevs(log, rev)]
661 661
662 662 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
663 663
664 664 branch = ctx.branch()
665 665 # don't show the default branch name
666 666 if branch != 'default':
667 667 branch = encoding.tolocal(branch)
668 668 self.ui.write(_("branch: %s\n") % branch)
669 669 for tag in self.repo.nodetags(changenode):
670 670 self.ui.write(_("tag: %s\n") % tag)
671 671 for parent in parents:
672 672 self.ui.write(_("parent: %d:%s\n") % parent)
673 673
674 674 if self.ui.debugflag:
675 675 mnode = ctx.manifestnode()
676 676 self.ui.write(_("manifest: %d:%s\n") %
677 677 (self.repo.manifest.rev(mnode), hex(mnode)))
678 678 self.ui.write(_("user: %s\n") % ctx.user())
679 679 self.ui.write(_("date: %s\n") % date)
680 680
681 681 if self.ui.debugflag:
682 682 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
683 683 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
684 684 files):
685 685 if value:
686 686 self.ui.write("%-12s %s\n" % (key, " ".join(value)))
687 687 elif ctx.files() and self.ui.verbose:
688 688 self.ui.write(_("files: %s\n") % " ".join(ctx.files()))
689 689 if copies and self.ui.verbose:
690 690 copies = ['%s (%s)' % c for c in copies]
691 691 self.ui.write(_("copies: %s\n") % ' '.join(copies))
692 692
693 693 extra = ctx.extra()
694 694 if extra and self.ui.debugflag:
695 695 for key, value in sorted(extra.items()):
696 696 self.ui.write(_("extra: %s=%s\n")
697 697 % (key, value.encode('string_escape')))
698 698
699 699 description = ctx.description().strip()
700 700 if description:
701 701 if self.ui.verbose:
702 702 self.ui.write(_("description:\n"))
703 703 self.ui.write(description)
704 704 self.ui.write("\n\n")
705 705 else:
706 706 self.ui.write(_("summary: %s\n") %
707 707 description.splitlines()[0])
708 708 self.ui.write("\n")
709 709
710 710 self.showpatch(changenode)
711 711
712 712 def showpatch(self, node):
713 713 if self.patch:
714 714 prev = self.repo.changelog.parents(node)[0]
715 715 chunks = patch.diff(self.repo, prev, node, match=self.patch,
716 716 opts=patch.diffopts(self.ui, self.diffopts))
717 717 for chunk in chunks:
718 718 self.ui.write(chunk)
719 719 self.ui.write("\n")
720 720
721 721 def _meaningful_parentrevs(self, log, rev):
722 722 """Return list of meaningful (or all if debug) parentrevs for rev.
723 723
724 724 For merges (two non-nullrev revisions) both parents are meaningful.
725 725 Otherwise the first parent revision is considered meaningful if it
726 726 is not the preceding revision.
727 727 """
728 728 parents = log.parentrevs(rev)
729 729 if not self.ui.debugflag and parents[1] == nullrev:
730 730 if parents[0] >= rev - 1:
731 731 parents = []
732 732 else:
733 733 parents = [parents[0]]
734 734 return parents
735 735
736 736
737 737 class changeset_templater(changeset_printer):
738 738 '''format changeset information.'''
739 739
740 740 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
741 741 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
742 742 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
743 743 self.t = templater.templater(mapfile, {'formatnode': formatnode},
744 744 cache={
745 745 'parent': '{rev}:{node|formatnode} ',
746 746 'manifest': '{rev}:{node|formatnode}',
747 747 'filecopy': '{name} ({source})'})
748 748 # Cache mapping from rev to a tuple with tag date, tag
749 749 # distance and tag name
750 750 self._latesttagcache = {-1: (0, 0, 'null')}
751 751
752 752 def use_template(self, t):
753 753 '''set template string to use'''
754 754 self.t.cache['changeset'] = t
755 755
756 756 def _meaningful_parentrevs(self, ctx):
757 757 """Return list of meaningful (or all if debug) parentrevs for rev.
758 758 """
759 759 parents = ctx.parents()
760 760 if len(parents) > 1:
761 761 return parents
762 762 if self.ui.debugflag:
763 763 return [parents[0], self.repo['null']]
764 764 if parents[0].rev() >= ctx.rev() - 1:
765 765 return []
766 766 return parents
767 767
768 768 def _latesttaginfo(self, rev):
769 769 '''return date, distance and name for the latest tag of rev'''
770 770 todo = [rev]
771 771 while todo:
772 772 rev = todo.pop()
773 773 if rev in self._latesttagcache:
774 774 continue
775 775 ctx = self.repo[rev]
776 776 tags = [t for t in ctx.tags() if self.repo.tagtype(t) == 'global']
777 777 if tags:
778 778 self._latesttagcache[rev] = ctx.date()[0], 0, ':'.join(sorted(tags))
779 779 continue
780 780 try:
781 781 # The tuples are laid out so the right one can be found by comparison.
782 782 pdate, pdist, ptag = max(
783 783 self._latesttagcache[p.rev()] for p in ctx.parents())
784 784 except KeyError:
785 785 # Cache miss - recurse
786 786 todo.append(rev)
787 787 todo.extend(p.rev() for p in ctx.parents())
788 788 continue
789 789 self._latesttagcache[rev] = pdate, pdist + 1, ptag
790 790 return self._latesttagcache[rev]
791 791
792 792 def _show(self, ctx, copies, props):
793 793 '''show a single changeset or file revision'''
794 794
795 795 def showlist(name, values, plural=None, **args):
796 796 '''expand set of values.
797 797 name is name of key in template map.
798 798 values is list of strings or dicts.
799 799 plural is plural of name, if not simply name + 's'.
800 800
801 801 expansion works like this, given name 'foo'.
802 802
803 803 if values is empty, expand 'no_foos'.
804 804
805 805 if 'foo' not in template map, return values as a string,
806 806 joined by space.
807 807
808 808 expand 'start_foos'.
809 809
810 810 for each value, expand 'foo'. if 'last_foo' in template
811 811 map, expand it instead of 'foo' for last key.
812 812
813 813 expand 'end_foos'.
814 814 '''
815 815 if plural: names = plural
816 816 else: names = name + 's'
817 817 if not values:
818 818 noname = 'no_' + names
819 819 if noname in self.t:
820 820 yield self.t(noname, **args)
821 821 return
822 822 if name not in self.t:
823 823 if isinstance(values[0], str):
824 824 yield ' '.join(values)
825 825 else:
826 826 for v in values:
827 827 yield dict(v, **args)
828 828 return
829 829 startname = 'start_' + names
830 830 if startname in self.t:
831 831 yield self.t(startname, **args)
832 832 vargs = args.copy()
833 833 def one(v, tag=name):
834 834 try:
835 835 vargs.update(v)
836 836 except (AttributeError, ValueError):
837 837 try:
838 838 for a, b in v:
839 839 vargs[a] = b
840 840 except ValueError:
841 841 vargs[name] = v
842 842 return self.t(tag, **vargs)
843 843 lastname = 'last_' + name
844 844 if lastname in self.t:
845 845 last = values.pop()
846 846 else:
847 847 last = None
848 848 for v in values:
849 849 yield one(v)
850 850 if last is not None:
851 851 yield one(last, tag=lastname)
852 852 endname = 'end_' + names
853 853 if endname in self.t:
854 854 yield self.t(endname, **args)
855 855
856 856 def showbranches(**args):
857 857 branch = ctx.branch()
858 858 if branch != 'default':
859 859 branch = encoding.tolocal(branch)
860 860 return showlist('branch', [branch], plural='branches', **args)
861 861
862 862 def showparents(**args):
863 863 parents = [[('rev', p.rev()), ('node', p.hex())]
864 864 for p in self._meaningful_parentrevs(ctx)]
865 865 return showlist('parent', parents, **args)
866 866
867 867 def showtags(**args):
868 868 return showlist('tag', ctx.tags(), **args)
869 869
870 870 def showextras(**args):
871 871 for key, value in sorted(ctx.extra().items()):
872 872 args = args.copy()
873 873 args.update(dict(key=key, value=value))
874 874 yield self.t('extra', **args)
875 875
876 876 def showcopies(**args):
877 877 c = [{'name': x[0], 'source': x[1]} for x in copies]
878 878 return showlist('file_copy', c, plural='file_copies', **args)
879 879
880 880 files = []
881 881 def getfiles():
882 882 if not files:
883 883 files[:] = self.repo.status(ctx.parents()[0].node(),
884 884 ctx.node())[:3]
885 885 return files
886 886 def showfiles(**args):
887 887 return showlist('file', ctx.files(), **args)
888 888 def showmods(**args):
889 889 return showlist('file_mod', getfiles()[0], **args)
890 890 def showadds(**args):
891 891 return showlist('file_add', getfiles()[1], **args)
892 892 def showdels(**args):
893 893 return showlist('file_del', getfiles()[2], **args)
894 894 def showmanifest(**args):
895 895 args = args.copy()
896 896 args.update(dict(rev=self.repo.manifest.rev(ctx.changeset()[0]),
897 897 node=hex(ctx.changeset()[0])))
898 898 return self.t('manifest', **args)
899 899
900 900 def showdiffstat(**args):
901 901 diff = patch.diff(self.repo, ctx.parents()[0].node(), ctx.node())
902 902 files, adds, removes = 0, 0, 0
903 903 for i in patch.diffstatdata(util.iterlines(diff)):
904 904 files += 1
905 905 adds += i[1]
906 906 removes += i[2]
907 907 return '%s: +%s/-%s' % (files, adds, removes)
908 908
909 909 def showlatesttag(**args):
910 910 return self._latesttaginfo(ctx.rev())[2]
911 911 def showlatesttagdistance(**args):
912 912 return self._latesttaginfo(ctx.rev())[1]
913 913
914 914 defprops = {
915 915 'author': ctx.user(),
916 916 'branches': showbranches,
917 917 'date': ctx.date(),
918 918 'desc': ctx.description().strip(),
919 919 'file_adds': showadds,
920 920 'file_dels': showdels,
921 921 'file_mods': showmods,
922 922 'files': showfiles,
923 923 'file_copies': showcopies,
924 924 'manifest': showmanifest,
925 925 'node': ctx.hex(),
926 926 'parents': showparents,
927 927 'rev': ctx.rev(),
928 928 'tags': showtags,
929 929 'extras': showextras,
930 930 'diffstat': showdiffstat,
931 931 'latesttag': showlatesttag,
932 932 'latesttagdistance': showlatesttagdistance,
933 933 }
934 934 props = props.copy()
935 935 props.update(defprops)
936 936
937 937 # find correct templates for current mode
938 938
939 939 tmplmodes = [
940 940 (True, None),
941 941 (self.ui.verbose, 'verbose'),
942 942 (self.ui.quiet, 'quiet'),
943 943 (self.ui.debugflag, 'debug'),
944 944 ]
945 945
946 946 types = {'header': '', 'changeset': 'changeset'}
947 947 for mode, postfix in tmplmodes:
948 948 for type in types:
949 949 cur = postfix and ('%s_%s' % (type, postfix)) or type
950 950 if mode and cur in self.t:
951 951 types[type] = cur
952 952
953 953 try:
954 954
955 955 # write header
956 956 if types['header']:
957 957 h = templater.stringify(self.t(types['header'], **props))
958 958 if self.buffered:
959 959 self.header[ctx.rev()] = h
960 960 else:
961 961 self.ui.write(h)
962 962
963 963 # write changeset metadata, then patch if requested
964 964 key = types['changeset']
965 965 self.ui.write(templater.stringify(self.t(key, **props)))
966 966 self.showpatch(ctx.node())
967 967
968 968 except KeyError, inst:
969 969 msg = _("%s: no key named '%s'")
970 970 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
971 971 except SyntaxError, inst:
972 972 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
973 973
974 974 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
975 975 """show one changeset using template or regular display.
976 976
977 977 Display format will be the first non-empty hit of:
978 978 1. option 'template'
979 979 2. option 'style'
980 980 3. [ui] setting 'logtemplate'
981 981 4. [ui] setting 'style'
982 982 If all of these values are either the unset or the empty string,
983 983 regular display via changeset_printer() is done.
984 984 """
985 985 # options
986 986 patch = False
987 987 if opts.get('patch'):
988 988 patch = matchfn or matchall(repo)
989 989
990 990 tmpl = opts.get('template')
991 991 style = None
992 992 if tmpl:
993 993 tmpl = templater.parsestring(tmpl, quoted=False)
994 994 else:
995 995 style = opts.get('style')
996 996
997 997 # ui settings
998 998 if not (tmpl or style):
999 999 tmpl = ui.config('ui', 'logtemplate')
1000 1000 if tmpl:
1001 1001 tmpl = templater.parsestring(tmpl)
1002 1002 else:
1003 1003 style = ui.config('ui', 'style')
1004 1004
1005 1005 if not (tmpl or style):
1006 1006 return changeset_printer(ui, repo, patch, opts, buffered)
1007 1007
1008 1008 mapfile = None
1009 1009 if style and not tmpl:
1010 1010 mapfile = style
1011 1011 if not os.path.split(mapfile)[0]:
1012 1012 mapname = (templater.templatepath('map-cmdline.' + mapfile)
1013 1013 or templater.templatepath(mapfile))
1014 1014 if mapname: mapfile = mapname
1015 1015
1016 1016 try:
1017 1017 t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
1018 1018 except SyntaxError, inst:
1019 1019 raise util.Abort(inst.args[0])
1020 1020 if tmpl: t.use_template(tmpl)
1021 1021 return t
1022 1022
1023 1023 def finddate(ui, repo, date):
1024 1024 """Find the tipmost changeset that matches the given date spec"""
1025 1025 df = util.matchdate(date)
1026 1026 m = matchall(repo)
1027 1027 results = {}
1028 1028
1029 1029 def prep(ctx, fns):
1030 1030 d = ctx.date()
1031 1031 if df(d[0]):
1032 1032 results[rev] = d
1033 1033
1034 1034 for ctx in walkchangerevs(ui, repo, m, {'rev':None}, prep):
1035 1035 rev = ctx.rev()
1036 1036 if rev in results:
1037 1037 ui.status(_("Found revision %s from %s\n") %
1038 1038 (rev, util.datestr(results[rev])))
1039 1039 return str(rev)
1040 1040
1041 1041 raise util.Abort(_("revision matching date not found"))
1042 1042
1043 1043 def walkchangerevs(ui, repo, match, opts, prepare):
1044 1044 '''Iterate over files and the revs in which they changed.
1045 1045
1046 1046 Callers most commonly need to iterate backwards over the history
1047 1047 in which they are interested. Doing so has awful (quadratic-looking)
1048 1048 performance, so we use iterators in a "windowed" way.
1049 1049
1050 1050 We walk a window of revisions in the desired order. Within the
1051 1051 window, we first walk forwards to gather data, then in the desired
1052 1052 order (usually backwards) to display it.
1053 1053
1054 1054 This function returns an iterator yielding contexts. Before
1055 1055 yielding each context, the iterator will first call the prepare
1056 1056 function on each context in the window in forward order.'''
1057 1057
1058 1058 def increasing_windows(start, end, windowsize=8, sizelimit=512):
1059 1059 if start < end:
1060 1060 while start < end:
1061 1061 yield start, min(windowsize, end-start)
1062 1062 start += windowsize
1063 1063 if windowsize < sizelimit:
1064 1064 windowsize *= 2
1065 1065 else:
1066 1066 while start > end:
1067 1067 yield start, min(windowsize, start-end-1)
1068 1068 start -= windowsize
1069 1069 if windowsize < sizelimit:
1070 1070 windowsize *= 2
1071 1071
1072 1072 follow = opts.get('follow') or opts.get('follow_first')
1073 1073
1074 1074 if not len(repo):
1075 1075 return []
1076 1076
1077 1077 if follow:
1078 1078 defrange = '%s:0' % repo['.'].rev()
1079 1079 else:
1080 1080 defrange = '-1:0'
1081 1081 revs = revrange(repo, opts['rev'] or [defrange])
1082 1082 wanted = set()
1083 1083 slowpath = match.anypats() or (match.files() and opts.get('removed'))
1084 1084 fncache = {}
1085 1085 change = util.cachefunc(repo.changectx)
1086 1086
1087 1087 if not slowpath and not match.files():
1088 1088 # No files, no patterns. Display all revs.
1089 1089 wanted = set(revs)
1090 1090 copies = []
1091 1091 if not slowpath:
1092 1092 # Only files, no patterns. Check the history of each file.
1093 1093 def filerevgen(filelog, node):
1094 1094 cl_count = len(repo)
1095 1095 if node is None:
1096 1096 last = len(filelog) - 1
1097 1097 else:
1098 1098 last = filelog.rev(node)
1099 1099 for i, window in increasing_windows(last, nullrev):
1100 1100 revs = []
1101 1101 for j in xrange(i - window, i + 1):
1102 1102 n = filelog.node(j)
1103 1103 revs.append((filelog.linkrev(j),
1104 1104 follow and filelog.renamed(n)))
1105 1105 for rev in reversed(revs):
1106 1106 # only yield rev for which we have the changelog, it can
1107 1107 # happen while doing "hg log" during a pull or commit
1108 1108 if rev[0] < cl_count:
1109 1109 yield rev
1110 1110 def iterfiles():
1111 1111 for filename in match.files():
1112 1112 yield filename, None
1113 1113 for filename_node in copies:
1114 1114 yield filename_node
1115 1115 minrev, maxrev = min(revs), max(revs)
1116 1116 for file_, node in iterfiles():
1117 1117 filelog = repo.file(file_)
1118 1118 if not len(filelog):
1119 1119 if node is None:
1120 1120 # A zero count may be a directory or deleted file, so
1121 1121 # try to find matching entries on the slow path.
1122 1122 if follow:
1123 1123 raise util.Abort(_('cannot follow nonexistent file: "%s"') % file_)
1124 1124 slowpath = True
1125 1125 break
1126 1126 else:
1127 1127 ui.warn(_('%s:%s copy source revision cannot be found!\n')
1128 1128 % (file_, short(node)))
1129 1129 continue
1130 1130 for rev, copied in filerevgen(filelog, node):
1131 1131 if rev <= maxrev:
1132 1132 if rev < minrev:
1133 1133 break
1134 1134 fncache.setdefault(rev, [])
1135 1135 fncache[rev].append(file_)
1136 1136 wanted.add(rev)
1137 1137 if follow and copied:
1138 1138 copies.append(copied)
1139 1139 if slowpath:
1140 1140 if follow:
1141 1141 raise util.Abort(_('can only follow copies/renames for explicit '
1142 1142 'filenames'))
1143 1143
1144 1144 # The slow path checks files modified in every changeset.
1145 1145 def changerevgen():
1146 1146 for i, window in increasing_windows(len(repo) - 1, nullrev):
1147 1147 for j in xrange(i - window, i + 1):
1148 1148 yield change(j)
1149 1149
1150 1150 for ctx in changerevgen():
1151 1151 matches = filter(match, ctx.files())
1152 1152 if matches:
1153 1153 fncache[ctx.rev()] = matches
1154 1154 wanted.add(ctx.rev())
1155 1155
1156 1156 class followfilter(object):
1157 1157 def __init__(self, onlyfirst=False):
1158 1158 self.startrev = nullrev
1159 1159 self.roots = []
1160 1160 self.onlyfirst = onlyfirst
1161 1161
1162 1162 def match(self, rev):
1163 1163 def realparents(rev):
1164 1164 if self.onlyfirst:
1165 1165 return repo.changelog.parentrevs(rev)[0:1]
1166 1166 else:
1167 1167 return filter(lambda x: x != nullrev,
1168 1168 repo.changelog.parentrevs(rev))
1169 1169
1170 1170 if self.startrev == nullrev:
1171 1171 self.startrev = rev
1172 1172 return True
1173 1173
1174 1174 if rev > self.startrev:
1175 1175 # forward: all descendants
1176 1176 if not self.roots:
1177 1177 self.roots.append(self.startrev)
1178 1178 for parent in realparents(rev):
1179 1179 if parent in self.roots:
1180 1180 self.roots.append(rev)
1181 1181 return True
1182 1182 else:
1183 1183 # backwards: all parents
1184 1184 if not self.roots:
1185 1185 self.roots.extend(realparents(self.startrev))
1186 1186 if rev in self.roots:
1187 1187 self.roots.remove(rev)
1188 1188 self.roots.extend(realparents(rev))
1189 1189 return True
1190 1190
1191 1191 return False
1192 1192
1193 1193 # it might be worthwhile to do this in the iterator if the rev range
1194 1194 # is descending and the prune args are all within that range
1195 1195 for rev in opts.get('prune', ()):
1196 1196 rev = repo.changelog.rev(repo.lookup(rev))
1197 1197 ff = followfilter()
1198 1198 stop = min(revs[0], revs[-1])
1199 1199 for x in xrange(rev, stop-1, -1):
1200 1200 if ff.match(x):
1201 1201 wanted.discard(x)
1202 1202
1203 1203 def iterate():
1204 1204 if follow and not match.files():
1205 1205 ff = followfilter(onlyfirst=opts.get('follow_first'))
1206 1206 def want(rev):
1207 1207 return ff.match(rev) and rev in wanted
1208 1208 else:
1209 1209 def want(rev):
1210 1210 return rev in wanted
1211 1211
1212 1212 for i, window in increasing_windows(0, len(revs)):
1213 change = util.cachefunc(repo.changectx)
1213 1214 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
1214 1215 for rev in sorted(nrevs):
1215 1216 fns = fncache.get(rev)
1216 1217 ctx = change(rev)
1217 1218 if not fns:
1218 1219 def fns_generator():
1219 1220 for f in ctx.files():
1220 1221 if match(f):
1221 1222 yield f
1222 1223 fns = fns_generator()
1223 1224 prepare(ctx, fns)
1224 1225 for rev in nrevs:
1225 1226 yield change(rev)
1226 1227 return iterate()
1227 1228
1228 1229 def commit(ui, repo, commitfunc, pats, opts):
1229 1230 '''commit the specified files or all outstanding changes'''
1230 1231 date = opts.get('date')
1231 1232 if date:
1232 1233 opts['date'] = util.parsedate(date)
1233 1234 message = logmessage(opts)
1234 1235
1235 1236 # extract addremove carefully -- this function can be called from a command
1236 1237 # that doesn't support addremove
1237 1238 if opts.get('addremove'):
1238 1239 addremove(repo, pats, opts)
1239 1240
1240 1241 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
1241 1242
1242 1243 def commiteditor(repo, ctx, subs):
1243 1244 if ctx.description():
1244 1245 return ctx.description()
1245 1246 return commitforceeditor(repo, ctx, subs)
1246 1247
1247 1248 def commitforceeditor(repo, ctx, subs):
1248 1249 edittext = []
1249 1250 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
1250 1251 if ctx.description():
1251 1252 edittext.append(ctx.description())
1252 1253 edittext.append("")
1253 1254 edittext.append("") # Empty line between message and comments.
1254 1255 edittext.append(_("HG: Enter commit message."
1255 1256 " Lines beginning with 'HG:' are removed."))
1256 1257 edittext.append(_("HG: Leave message empty to abort commit."))
1257 1258 edittext.append("HG: --")
1258 1259 edittext.append(_("HG: user: %s") % ctx.user())
1259 1260 if ctx.p2():
1260 1261 edittext.append(_("HG: branch merge"))
1261 1262 if ctx.branch():
1262 1263 edittext.append(_("HG: branch '%s'")
1263 1264 % encoding.tolocal(ctx.branch()))
1264 1265 edittext.extend([_("HG: subrepo %s") % s for s in subs])
1265 1266 edittext.extend([_("HG: added %s") % f for f in added])
1266 1267 edittext.extend([_("HG: changed %s") % f for f in modified])
1267 1268 edittext.extend([_("HG: removed %s") % f for f in removed])
1268 1269 if not added and not modified and not removed:
1269 1270 edittext.append(_("HG: no files changed"))
1270 1271 edittext.append("")
1271 1272 # run editor in the repository root
1272 1273 olddir = os.getcwd()
1273 1274 os.chdir(repo.root)
1274 1275 text = repo.ui.edit("\n".join(edittext), ctx.user())
1275 1276 text = re.sub("(?m)^HG:.*\n", "", text)
1276 1277 os.chdir(olddir)
1277 1278
1278 1279 if not text.strip():
1279 1280 raise util.Abort(_("empty commit message"))
1280 1281
1281 1282 return text
General Comments 0
You need to be logged in to leave comments. Login now