equal
deleted
inserted
replaced
57 |
57 |
58 def _destupdatetopic(repo, clean, check=None): |
58 def _destupdatetopic(repo, clean, check=None): |
59 """decide on an update destination from current topic""" |
59 """decide on an update destination from current topic""" |
60 movemark = node = None |
60 movemark = node = None |
61 topic = repo.currenttopic |
61 topic = repo.currenttopic |
62 revs = repo.revs('.::topic("%s")' % topic) |
62 if topic: |
|
63 revs = repo.revs('.::topic(%s)', topic) |
|
64 else: |
|
65 revs = [] |
63 if not revs: |
66 if not revs: |
64 return None, None, None |
67 return None, None, None |
65 node = revs.last() |
68 node = revs.last() |
66 if bookmarks.isactivewdirparent(repo): |
69 if bookmarks.isactivewdirparent(repo): |
67 movemark = repo['.'].node() |
70 movemark = repo['.'].node() |