equal
deleted
inserted
replaced
636 def graftwrapper(orig, ui, repo, *revs, **kwargs): |
636 def graftwrapper(orig, ui, repo, *revs, **kwargs): |
637 obsoleted = kwargs.setdefault('obsolete', []) |
637 obsoleted = kwargs.setdefault('obsolete', []) |
638 lock = repo.lock() |
638 lock = repo.lock() |
639 try: |
639 try: |
640 if kwargs.get('old_obsolete'): |
640 if kwargs.get('old_obsolete'): |
641 if kwargs['continue']: |
641 if kwargs.get('continue'): |
642 obsoleted.extend(repo.opener.read('graftstate').splitlines()) |
642 obsoleted.extend(repo.opener.read('graftstate').splitlines()) |
643 else: |
643 else: |
644 obsoleted.extend(revs) |
644 obsoleted.extend(revs) |
645 # convert obsolete target into revs to avoid alias joke |
645 # convert obsolete target into revs to avoid alias joke |
646 obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)] |
646 obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)] |