Mercurial > public > mercurial-scm > hg
comparison mercurial/changegroup.py @ 22070:c1ca47204590
phase: add a transaction argument to retractboundary
We now pass a transaction option to this phase movement function. The
object is currently not used by the function, but it will be in the
future.
All call sites have been updated. Most call sites were already enclosed in a
transaction for a long time. The handful of others have been recently
updated in previous commit.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 05 Aug 2014 23:52:21 -0700 |
| parents | 616a455b02ca |
| children | e2806b8613ca |
comparison
equal
deleted
inserted
replaced
| 22069:616a455b02ca | 22070:c1ca47204590 |
|---|---|
| 704 else: | 704 else: |
| 705 # Those changesets have been pushed from the outside, their | 705 # Those changesets have been pushed from the outside, their |
| 706 # phases are going to be pushed alongside. Therefor | 706 # phases are going to be pushed alongside. Therefor |
| 707 # `targetphase` is ignored. | 707 # `targetphase` is ignored. |
| 708 phases.advanceboundary(repo, tr, phases.draft, srccontent) | 708 phases.advanceboundary(repo, tr, phases.draft, srccontent) |
| 709 phases.retractboundary(repo, phases.draft, added) | 709 phases.retractboundary(repo, tr, phases.draft, added) |
| 710 elif srctype != 'strip': | 710 elif srctype != 'strip': |
| 711 # publishing only alter behavior during push | 711 # publishing only alter behavior during push |
| 712 # | 712 # |
| 713 # strip should not touch boundary at all | 713 # strip should not touch boundary at all |
| 714 phases.retractboundary(repo, targetphase, added) | 714 phases.retractboundary(repo, tr, targetphase, added) |
| 715 | 715 |
| 716 # make changelog see real files again | 716 # make changelog see real files again |
| 717 cl.finalize(trp) | 717 cl.finalize(trp) |
| 718 | 718 |
| 719 tr.close() | 719 tr.close() |