equal
deleted
inserted
replaced
232 ], |
232 ], |
233 ), |
233 ), |
234 ) |
234 ) |
235 |
235 |
236 cmdtable = {} |
236 cmdtable = {} |
|
237 |
237 |
238 |
238 # for "historical portability": |
239 # for "historical portability": |
239 # define parsealiases locally, because cmdutil.parsealiases has been |
240 # define parsealiases locally, because cmdutil.parsealiases has been |
240 # available since 1.5 (or 6252852b4332) |
241 # available since 1.5 (or 6252852b4332) |
241 def parsealiases(cmd): |
242 def parsealiases(cmd): |
571 |
572 |
572 formatone(fm, results, title=title, result=r, displayall=displayall) |
573 formatone(fm, results, title=title, result=r, displayall=displayall) |
573 |
574 |
574 |
575 |
575 def formatone(fm, timings, title=None, result=None, displayall=False): |
576 def formatone(fm, timings, title=None, result=None, displayall=False): |
576 |
|
577 count = len(timings) |
577 count = len(timings) |
578 |
578 |
579 fm.startitem() |
579 fm.startitem() |
580 |
580 |
581 if title: |
581 if title: |
1472 ds._dirty = True |
1472 ds._dirty = True |
1473 |
1473 |
1474 def d(): |
1474 def d(): |
1475 ds.write(repo.currenttransaction()) |
1475 ds.write(repo.currenttransaction()) |
1476 |
1476 |
1477 timer(d, setup=setup) |
1477 with repo.wlock(): |
|
1478 timer(d, setup=setup) |
1478 fm.end() |
1479 fm.end() |
1479 |
1480 |
1480 |
1481 |
1481 def _getmergerevs(repo, opts): |
1482 def _getmergerevs(repo, opts): |
1482 """parse command argument to return rev involved in merge |
1483 """parse command argument to return rev involved in merge |