Mercurial > evolve
comparison hgext3rd/topic/destination.py @ 4538:31c1645ef8bf stable
topic: only wrap _destupdatetopic for repo with topic
This helps repository with and without topic to coexist in the same process.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 18 Apr 2019 12:40:53 +0200 |
| parents | db3e17adee3e |
| children | 91628e5c0f6d |
comparison
equal
deleted
inserted
replaced
| 4537:db3e17adee3e | 4538:31c1645ef8bf |
|---|---|
| 60 raise error.ManyMergeDestAbort(msg) | 60 raise error.ManyMergeDestAbort(msg) |
| 61 return orig(repo, action, sourceset, onheadcheck, destspace=destspace) | 61 return orig(repo, action, sourceset, onheadcheck, destspace=destspace) |
| 62 | 62 |
| 63 def _destupdatetopic(repo, clean, check=None): | 63 def _destupdatetopic(repo, clean, check=None): |
| 64 """decide on an update destination from current topic""" | 64 """decide on an update destination from current topic""" |
| 65 if not common.hastopicext(repo): | |
| 66 return None, None, None | |
| 65 movemark = node = None | 67 movemark = node = None |
| 66 topic = repo.currenttopic | 68 topic = repo.currenttopic |
| 67 if topic: | 69 if topic: |
| 68 revs = repo.revs('.::topic(%s)', topic) | 70 revs = repo.revs('.::topic(%s)', topic) |
| 69 else: | 71 else: |