##// END OF EJS Templates
destmerge: extract logic based on bookmark into its own function...
Pierre-Yves David -
r26727:5b7fd48f default
parent child Browse files
Show More
@@ -131,8 +131,9 b' def destupdate(repo, clean=False, check='
131 131
132 132 return rev, movemark, activemark
133 133
134 def destmerge(repo):
135 if repo._activebookmark:
134 def _destmergebook(repo):
135 """find merge destination in the active bookmark case"""
136 node = None
136 137 bmheads = repo.bookmarkheads(repo._activebookmark)
137 138 curhead = repo[repo._activebookmark].node()
138 139 if len(bmheads) == 2:
@@ -148,6 +149,12 b' def destmerge(repo):'
148 149 raise error.Abort(_("no matching bookmark to merge - "
149 150 "please merge with an explicit rev or bookmark"),
150 151 hint=_("run 'hg heads' to see all heads"))
152 assert node is not None
153 return node
154
155 def destmerge(repo):
156 if repo._activebookmark:
157 node = _destmergebook(repo)
151 158 else:
152 159 branch = repo[None].branch()
153 160 bheads = repo.branchheads(branch)
General Comments 0
You need to be logged in to leave comments. Login now