comparison hgext/hbisect.py @ 5732:2060cad9fabd

bisect: simplify state handling and init

- use a single bisect.state file
- unify init and reset (delete the state)
- move write into good/bad

5731:19691160d7f5

class bisect(object):
    """dichotomic search in the DAG of changesets"""
    def __init__(self, ui, repo):
        self.repo = repo
        self.path = repo.join("bisect")
        self.opener = util.opener(self.path)
        self.ui = ui
        self.goodnodes = []
        self.badnode = None
        self.good_path = "good"
        self.bad_path = "bad"
        self.is_reset = False

        if os.path.exists(os.path.join(self.path, self.good_path)):
            self.goodnodes = self.opener(self.good_path).read().splitlines()
            self.goodnodes = [hg.bin(x) for x in self.goodnodes]
        if os.path.exists(os.path.join(self.path, self.bad_path)):
            r = self.opener(self.bad_path).read().splitlines()
            if r:
                self.badnode = hg.bin(r.pop(0))

    def write(self):
        if self.is_reset:
            return
        if not os.path.isdir(self.path):
            os.mkdir(self.path)
        f = self.opener(self.good_path, "w")
        f.write("\n".join([hg.hex(r) for r in  self.goodnodes]))
        if len(self.goodnodes) > 0:
            f.write("\n")
        f = self.opener(self.bad_path, "w")
        if self.badnode:
            f.write(hg.hex(self.badnode) + "\n")

    def init(self):
        """start a new bisection"""
        if os.path.isdir(self.path):
            raise util.Abort(_("bisect directory already exists\n"))
        os.mkdir(self.path)
        return 0

    def reset(self):
        """finish a bisection"""
        if os.path.isdir(self.path):
            sl = [os.path.join(self.path, p)
                  for p in [self.bad_path, self.good_path]]
            for s in sl:
                if os.path.exists(s):
                    os.unlink(s)
            os.rmdir(self.path)
        # Not sure about this
        #self.ui.write("Going back to tip\n")
        #self.repo.update(self.repo.changelog.tip())
        self.is_reset = True
        return 0

    def bisect(self):
        cl = self.repo.changelog
        clparents = cl.parentrevs
        bad = self.badnode

            return hg.clean(self.repo, node)

    def good(self, rev=None):
        """mark revision as good and update to the next revision to test"""
        self.goodnodes.append(self.repo.lookup(rev or '.'))
        if self.badnode:
            return self.next()

    def bad(self, rev=None):
        """mark revision as bad and update to the next revision to test"""
        self.badnode = self.repo.lookup(rev or '.')
        if self.goodnodes:
            self.next()

def bisect_run(ui, repo, cmd=None, *args):
    """Subdivision search of changesets

    bisectcmdtable = {
        "init": (b.init, 0, _("hg bisect init")),
        "bad": (b.bad, 1, _("hg bisect bad [<rev>]")),
        "good": (b.good, 1, _("hg bisect good [<rev>]")),
        "next": (b.next, 0, _("hg bisect next")),
        "reset": (b.reset, 0, _("hg bisect reset")),
        "help": (help_, 1, _("hg bisect help [<subcommand>]")),
    }

    if not bisectcmdtable.has_key(cmd):
        ui.warn(_("bisect: Unknown sub-command\n"))
        return help_()
    if len(args) > bisectcmdtable[cmd][1]:
        ui.warn(_("bisect: Too many arguments\n"))
        return help_()
    ret = bisectcmdtable[cmd][0](*args)
    b.write()
    return ret

cmdtable = {
    "bisect": (bisect_run, [], _("hg bisect [help|init|reset|next|good|bad]")),
    #"bisect-test": (test, [], "hg bisect-test rev"),

5732:2060cad9fabd

class bisect(object):
    """dichotomic search in the DAG of changesets"""
    def __init__(self, ui, repo):
        self.repo = repo
        self.ui = ui
        self.goodnodes = []
        self.badnode = None

        p = self.repo.join("bisect.state")
        if os.path.exists(p):
            for l in self.repo.opener("bisect.state"):
                type, node = l[:-1].split()
                node = self.repo.lookup(node)
                if type == "good":
                    self.goodnodes.append(node)
                elif type == "bad":
                    self.badnode = node

    def write(self):
        f = self.repo.opener("bisect.state", "w")
        for n in self.goodnodes:
            f.write("good %s\n" % hg.hex(n))
        if self.badnode:
            f.write("bad %s\n" % hg.hex(self.badnode))

    def init(self):
        """start a new bisection"""
        p = self.repo.join("bisect.state")
        if os.path.exists(p):
            os.unlink(p)

    def bisect(self):
        cl = self.repo.changelog
        clparents = cl.parentrevs
        bad = self.badnode

            return hg.clean(self.repo, node)

    def good(self, rev=None):
        """mark revision as good and update to the next revision to test"""
        self.goodnodes.append(self.repo.lookup(rev or '.'))
        self.write()
        if self.badnode:
            return self.next()

    def bad(self, rev=None):
        """mark revision as bad and update to the next revision to test"""
        self.badnode = self.repo.lookup(rev or '.')
        self.write()
        if self.goodnodes:
            self.next()

def bisect_run(ui, repo, cmd=None, *args):
    """Subdivision search of changesets

    bisectcmdtable = {
        "init": (b.init, 0, _("hg bisect init")),
        "bad": (b.bad, 1, _("hg bisect bad [<rev>]")),
        "good": (b.good, 1, _("hg bisect good [<rev>]")),
        "next": (b.next, 0, _("hg bisect next")),
        "help": (help_, 1, _("hg bisect help [<subcommand>]")),
    }

    if cmd == "reset":
        cmd = "init"

    if not bisectcmdtable.has_key(cmd):
        ui.warn(_("bisect: Unknown sub-command\n"))
        return help_()
    if len(args) > bisectcmdtable[cmd][1]:
        ui.warn(_("bisect: Too many arguments\n"))
        return help_()
    ret = bisectcmdtable[cmd][0](*args)
    return ret

cmdtable = {
    "bisect": (bisect_run, [], _("hg bisect [help|init|reset|next|good|bad]")),
    #"bisect-test": (test, [], "hg bisect-test rev"),