equal
deleted
inserted
replaced
3219 |
3219 |
3220 for rev in repo.changelog.findmissingrevs(revs, [crev]): |
3220 for rev in repo.changelog.findmissingrevs(revs, [crev]): |
3221 ctx = repo[rev] |
3221 ctx = repo[rev] |
3222 n = ctx.extra().get('source') |
3222 n = ctx.extra().get('source') |
3223 if n in ids: |
3223 if n in ids: |
3224 r = repo[n].rev() |
3224 try: |
|
3225 r = repo[n].rev() |
|
3226 except error.RepoLookupError: |
|
3227 r = None |
3225 if r in revs: |
3228 if r in revs: |
3226 ui.warn(_('skipping revision %s (already grafted to %s)\n') |
3229 ui.warn(_('skipping revision %s (already grafted to %s)\n') |
3227 % (r, rev)) |
3230 % (r, rev)) |
3228 revs.remove(r) |
3231 revs.remove(r) |
3229 elif ids[n] in revs: |
3232 elif ids[n] in revs: |
3230 ui.warn(_('skipping already grafted revision %s ' |
3233 if r is None: |
3231 '(%s also has origin %d)\n') % (ids[n], rev, r)) |
3234 ui.warn(_('skipping already grafted revision %s ' |
|
3235 '(%s also has unknown origin %s)\n') |
|
3236 % (ids[n], rev, n)) |
|
3237 else: |
|
3238 ui.warn(_('skipping already grafted revision %s ' |
|
3239 '(%s also has origin %d)\n') |
|
3240 % (ids[n], rev, r)) |
3232 revs.remove(ids[n]) |
3241 revs.remove(ids[n]) |
3233 elif ctx.hex() in ids: |
3242 elif ctx.hex() in ids: |
3234 r = ids[ctx.hex()] |
3243 r = ids[ctx.hex()] |
3235 ui.warn(_('skipping already grafted revision %s ' |
3244 ui.warn(_('skipping already grafted revision %s ' |
3236 '(was grafted from %d)\n') % (r, rev)) |
3245 '(was grafted from %d)\n') % (r, rev)) |