comparison mercurial/commands.py @ 40656:3bc2e550f2bd stable

graft: do not try to skip rev derived from ancestor more than once (issue6024)

We check 'x in revs' in other cases, so let's do the same.

The test case credits to Tom Prince.

40655:69d4c8c5c25e

                                  '(%d:%s also has origin %d:%s)\n')
                                % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
                    revs.remove(ids[n])
            elif ctx.hex() in ids:
                r = ids[ctx.hex()]
                ui.warn(_('skipping already grafted revision %d:%s '
                          '(was grafted from %d:%s)\n') %
                        (r, repo[r], rev, ctx))
                revs.remove(r)
        if not revs:
            return -1

    if opts.get('no_commit'):
        statedata['no_commit'] = True

40656:3bc2e550f2bd

                                  '(%d:%s also has origin %d:%s)\n')
                                % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
                    revs.remove(ids[n])
            elif ctx.hex() in ids:
                r = ids[ctx.hex()]
                if r in revs:
                    ui.warn(_('skipping already grafted revision %d:%s '
                              '(was grafted from %d:%s)\n') %
                            (r, repo[r], rev, ctx))
                    revs.remove(r)
        if not revs:
            return -1

    if opts.get('no_commit'):
        statedata['no_commit'] = True