Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 22207:8dda6f6ff564
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 15 Aug 2014 11:48:05 -0500 |
| parents | 269688a398c4 328efb5ca0b4 |
| children | 9be81b86ca97 |
comparison
equal
deleted
inserted
replaced
| 22206:6122ad50e38f | 22207:8dda6f6ff564 |
|---|---|
| 2337 succs = tuple(parsenodeid(succ) for succ in successors) | 2337 succs = tuple(parsenodeid(succ) for succ in successors) |
| 2338 l = repo.lock() | 2338 l = repo.lock() |
| 2339 try: | 2339 try: |
| 2340 tr = repo.transaction('debugobsolete') | 2340 tr = repo.transaction('debugobsolete') |
| 2341 try: | 2341 try: |
| 2342 repo.obsstore.create(tr, parsenodeid(precursor), succs, | 2342 try: |
| 2343 opts['flags'], metadata) | 2343 repo.obsstore.create(tr, parsenodeid(precursor), succs, |
| 2344 tr.close() | 2344 opts['flags'], metadata) |
| 2345 tr.close() | |
| 2346 except ValueError, exc: | |
| 2347 raise util.Abort(_('bad obsmarker input: %s') % exc) | |
| 2345 finally: | 2348 finally: |
| 2346 tr.release() | 2349 tr.release() |
| 2347 finally: | 2350 finally: |
| 2348 l.release() | 2351 l.release() |
| 2349 else: | 2352 else: |