equal
deleted
inserted
replaced
3019 ctx = repo[rev] |
3019 ctx = repo[rev] |
3020 n = ctx.extra().get('source') |
3020 n = ctx.extra().get('source') |
3021 if n in ids: |
3021 if n in ids: |
3022 r = repo[n].rev() |
3022 r = repo[n].rev() |
3023 if r in revs: |
3023 if r in revs: |
3024 ui.warn(_('skipping already grafted revision %s\n') % r) |
3024 ui.warn(_('skipping revision %s (already grafted to %s)\n') |
|
3025 % (r, rev)) |
3025 revs.remove(r) |
3026 revs.remove(r) |
3026 elif ids[n] in revs: |
3027 elif ids[n] in revs: |
3027 ui.warn(_('skipping already grafted revision %s ' |
3028 ui.warn(_('skipping already grafted revision %s ' |
3028 '(same origin %d)\n') % (ids[n], r)) |
3029 '(%s also has origin %d)\n') % (ids[n], rev, r)) |
3029 revs.remove(ids[n]) |
3030 revs.remove(ids[n]) |
3030 elif ctx.hex() in ids: |
3031 elif ctx.hex() in ids: |
3031 r = ids[ctx.hex()] |
3032 r = ids[ctx.hex()] |
3032 ui.warn(_('skipping already grafted revision %s ' |
3033 ui.warn(_('skipping already grafted revision %s ' |
3033 '(was grafted from %d)\n') % (r, rev)) |
3034 '(was grafted from %d)\n') % (r, rev)) |