Mercurial > hg-git

comparison hggit/git_handler.py @ 1139:8e03a8ba04af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: find the right method to set active bookmark once
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 07 Feb 2018 22:30:17 -0600
parents 7fd9ee0f7b66
children 583ac3ddd54b
comparison
equal deleted inserted replaced
1138:c693541ee210 1139:8e03a8ba04af
16 from dulwich import diff_tree 16 from dulwich import diff_tree
17 17
18 from mercurial.i18n import _ 18 from mercurial.i18n import _
19 from mercurial.node import hex, bin, nullid 19 from mercurial.node import hex, bin, nullid
20 from mercurial import ( 20 from mercurial import (
21 bookmarks,
22 commands, 21 commands,
23 context, 22 context,
24 encoding, 23 encoding,
25 error, 24 error,
26 phases, 25 phases,
322 changes = [(rhead + suffix, rnode)] 321 changes = [(rhead + suffix, rnode)]
323 util.updatebookmarks(self.repo, changes) 322 util.updatebookmarks(self.repo, changes)
324 bms = [rhead + suffix] 323 bms = [rhead + suffix]
325 324
326 if bms: 325 if bms:
327 # COMPAT: hg 3.5 - bookmarks.setcurrent renamed to activate 326 compat.activatebookmark(self.repo, bms[0])
328 try:
329 bookmarks.activate(self.repo, bms[0])
330 except AttributeError:
331 bookmarks.setcurrent(self.repo, bms[0])
332 327
333 self.save_map(self.map_file) 328 self.save_map(self.map_file)
334 329
335 # also mark public any branches the user specified 330 # also mark public any branches the user specified
336 blist = [self.repo[branch].node() for branch in 331 blist = [self.repo[branch].node() for branch in
1154 if 'capabilities^{}' in new_refs: 1149 if 'capabilities^{}' in new_refs:
1155 del new_refs['capabilities^{}'] 1150 del new_refs['capabilities^{}']
1156 tip = hex(tip) 1151 tip = hex(tip)
1157 commands.bookmark(self.ui, self.repo, 'master', 1152 commands.bookmark(self.ui, self.repo, 'master',
1158 rev=tip, force=True) 1153 rev=tip, force=True)
1159 # COMPAT: hg 3.5 - bookmarks.setcurrent renamed to activate 1154 compat.activatebookmark(self.repo, 'master')
1160 try:
1161 bookmarks.activate(self.repo, 'master')
1162 except AttributeError:
1163 bookmarks.setcurrent(self.repo, 'master')
1164 new_refs['refs/heads/master'] = self.map_git_get(tip) 1155 new_refs['refs/heads/master'] = self.map_git_get(tip)
1165 1156
1166 # mapped nodes might be hidden 1157 # mapped nodes might be hidden
1167 unfiltered = self.repo.unfiltered() 1158 unfiltered = self.repo.unfiltered()
1168 for rev, rev_refs in exportable.iteritems(): 1159 for rev, rev_refs in exportable.iteritems():