comparison hgext/bookmarks.py @ 8944:dda4ad7c9ea9

bookmarks: Change references to "repo" by references to "self" (issue1611)

Using "repo" instead of "self" inside bookmark_repo methods was causing a
circular reference and, thus, a memory leak.  It has been detected because the
method bundlerepository.__del__ is never called, therefore leaving dangling
uncompressed bundles inside .hg subdirectory.

8943:09ff905cdc86

            wlock = self.wlock() # do both commit and bookmark with lock held
            try:
                node  = super(bookmark_repo, self).commit(*k, **kw)
                if node is None:
                    return None
                parents = repo.changelog.parents(node)
                if parents[1] == nullid:
                    parents = (parents[0],)
                marks = parse(repo)
                update = False
                for mark, n in marks.items():
                    if ui.configbool('bookmarks', 'track.current'):
                        if mark == current(repo) and n in parents:
                            marks[mark] = node
                            update = True
                    else:
                        if n in parents:
                            marks[mark] = node
                            update = True
                if update:
                    write(repo, marks)
                return node
            finally:
                wlock.release()

        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

        def tags(self):
            """Merge bookmarks with normal tags"""
            if self.tagscache:
                return self.tagscache

            tagscache = super(bookmark_repo, self).tags()
            tagscache.update(parse(repo))
            return tagscache

    repo.__class__ = bookmark_repo

def uisetup(ui):

8944:dda4ad7c9ea9

            wlock = self.wlock() # do both commit and bookmark with lock held
            try:
                node  = super(bookmark_repo, self).commit(*k, **kw)
                if node is None:
                    return None
                parents = self.changelog.parents(node)
                if parents[1] == nullid:
                    parents = (parents[0],)
                marks = parse(self)
                update = False
                for mark, n in marks.items():
                    if ui.configbool('bookmarks', 'track.current'):
                        if mark == current(self) and n in parents:
                            marks[mark] = node
                            update = True
                    else:
                        if n in parents:
                            marks[mark] = node
                            update = True
                if update:
                    write(self, marks)
                return node
            finally:
                wlock.release()

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

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

        def tags(self):
            """Merge bookmarks with normal tags"""
            if self.tagscache:
                return self.tagscache

            tagscache = super(bookmark_repo, self).tags()
            tagscache.update(parse(self))
            return tagscache

    repo.__class__ = bookmark_repo

def uisetup(ui):