equal
deleted
inserted
replaced
668 raise error.Abort(_("changeset %s cannot obsolete itself") % prec) |
668 raise error.Abort(_("changeset %s cannot obsolete itself") % prec) |
669 |
669 |
670 if saveeffectflag: |
670 if saveeffectflag: |
671 # The effect flag is saved in a versioned field name for |
671 # The effect flag is saved in a versioned field name for |
672 # future evolution |
672 # future evolution |
673 effectflag = obsutil.geteffectflag(prec, (succ,)) |
673 try: |
|
674 effectflag = obsutil.geteffectflag(prec, (succ,)) |
|
675 except TypeError: |
|
676 # hg <= 4.7 |
|
677 effectflag = obsutil.geteffectflag((prec, (succ,))) |
674 metadata[obsutil.EFFECTFLAGFIELD] = "%d" % effectflag |
678 metadata[obsutil.EFFECTFLAGFIELD] = "%d" % effectflag |
675 |
679 |
676 # create markers |
680 # create markers |
677 repo.obsstore.create(tr, nprec, nsucs, flag, parents=npare, |
681 repo.obsstore.create(tr, nprec, nsucs, flag, parents=npare, |
678 metadata=metadata, ui=repo.ui) |
682 metadata=metadata, ui=repo.ui) |