D3161: convert: look up branch only among branches

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG810413b745ff: convert: look up branch only among branches (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3161?vs=7788&id=7797

REVISION DETAIL
  https://phab.mercurial-scm.org/D3161

AFFECTED FILES
  hgext/convert/hg.py

CHANGE DETAILS

diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -363,10 +363,8 @@
         return p2
 
     def puttags(self, tags):
-        try:
-            tagparent = self.repo[self.tagsbranch].node()
-        except error.RepoError:
-            tagparent = nodemod.nullid
+        tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
+        tagparent = tagparent or nodemod.nullid
 
         oldlines = set()
         for branch, heads in self.repo.branchmap().iteritems():



To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel