Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 16642:5cf18921bb7b
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 12 May 2012 00:06:11 +0200 |
| parents | 146a00c162a0 f30226b1a46a |
| children | e34106fa0dc3 |
comparison
equal
deleted
inserted
replaced
| 16629:1435866c1937 | 16642:5cf18921bb7b |
|---|---|
| 1309 # | | 1309 # | |
| 1310 # old o - changeset to amend | 1310 # old o - changeset to amend |
| 1311 # | | 1311 # | |
| 1312 # base o - parent of amending changeset | 1312 # base o - parent of amending changeset |
| 1313 | 1313 |
| 1314 # Update extra dict from amended commit (e.g. to preserve graft source) | |
| 1315 extra.update(old.extra()) | |
| 1316 | |
| 1317 # Also update it from the intermediate commit or from the wctx | |
| 1318 extra.update(ctx.extra()) | |
| 1319 | |
| 1314 files = set(old.files()) | 1320 files = set(old.files()) |
| 1315 | 1321 |
| 1316 # Second, we use either the commit we just did, or if there were no | 1322 # Second, we use either the commit we just did, or if there were no |
| 1317 # changes the parent of the working directory as the version of the | 1323 # changes the parent of the working directory as the version of the |
| 1318 # files in the final amend commit | 1324 # files in the final amend commit |
| 1320 ui.note(_('copying changeset %s to %s\n') % (ctx, base)) | 1326 ui.note(_('copying changeset %s to %s\n') % (ctx, base)) |
| 1321 | 1327 |
| 1322 user = ctx.user() | 1328 user = ctx.user() |
| 1323 date = ctx.date() | 1329 date = ctx.date() |
| 1324 message = ctx.description() | 1330 message = ctx.description() |
| 1325 extra = ctx.extra() | |
| 1326 # Recompute copies (avoid recording a -> b -> a) | 1331 # Recompute copies (avoid recording a -> b -> a) |
| 1327 copied = copies.pathcopies(base, ctx) | 1332 copied = copies.pathcopies(base, ctx) |
| 1328 | 1333 |
| 1329 # Prune files which were reverted by the updates: if old introduced | 1334 # Prune files which were reverted by the updates: if old introduced |
| 1330 # file X and our intermediate commit, node, renamed that file, then | 1335 # file X and our intermediate commit, node, renamed that file, then |