comparison mercurial/commands.py @ 26286:4b685712fa45

bookmark: do not crash when active bookmark is forward and --date is used

The logic that decides where to update according to the active bookmark
location (when not on ".") was setting the rev to update to before we process
--date.  This lead to --date processing aborting because of duplicated
specification.

We reorder the two pieces of code and add a test for this.

26285:91cad8eb7951

    wlock = repo.wlock()
    try:
        cmdutil.clearunfinished(repo)

        # with no argument, we also move the active bookmark, if any
        rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)

        # if we defined a bookmark, we have to remember the original name
        brev = rev
        rev = scmutil.revsingle(repo, rev, rev).rev()

        if check and clean:
            raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))

        if date:
            if rev is not None:
                raise util.Abort(_("you can't specify a revision and a date"))
            rev = cmdutil.finddate(ui, repo, date)

        if check:
            cmdutil.bailifchanged(repo, merge=False)
            if rev is None:
                rev = repo[repo[None].branch()].rev()

26286:4b685712fa45

    wlock = repo.wlock()
    try:
        cmdutil.clearunfinished(repo)

        if date:
            if rev is not None:
                raise util.Abort(_("you can't specify a revision and a date"))
            rev = cmdutil.finddate(ui, repo, date)

        # with no argument, we also move the active bookmark, if any
        rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)

        # if we defined a bookmark, we have to remember the original name
        brev = rev
        rev = scmutil.revsingle(repo, rev, rev).rev()

        if check and clean:
            raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))

        if check:
            cmdutil.bailifchanged(repo, merge=False)
            if rev is None:
                rev = repo[repo[None].branch()].rev()