comparison hgext/bookmarks.py @ 7316:9737041646bc

bookmarks: Use dirstate to determine the current node in addchangegroup

Using the changectx might result in a lookup error during the strip command.
Thefore we use the current dirstate to get the parents of the working directory.

7312:82f80c16fc16

            if update:
                write(repo, marks)
            return node

        def addchangegroup(self, source, srctype, url, emptyok=False):
            try:
                onode = repo.changectx('.').node()
            except RepoError, inst:
                pass

            result = super(bookmark_repo, self).addchangegroup(
                source, srctype, url, emptyok)
            if result > 1:
                # We have more heads than before
                return result
            node = repo.changelog.tip()
            marks = parse(repo)
            update = False
            for mark, n in marks.items():
                if n == onode:
                    marks[mark] = node
                    update = True
            if update:
                write(repo, marks)
            return result

7316:9737041646bc

            if update:
                write(repo, marks)
            return node

        def addchangegroup(self, source, srctype, url, emptyok=False):
            parents = repo.dirstate.parents()

            result = super(bookmark_repo, self).addchangegroup(
                source, srctype, url, emptyok)
            if result > 1:
                # We have more heads than before
                return result
            node = repo.changelog.tip()
            marks = parse(repo)
            update = False
            for mark, n in marks.items():
                if n in parents:
                    marks[mark] = node
                    update = True
            if update:
                write(repo, marks)
            return result