Mercurial > hg
changeset 20958:df33c9014430
shelve: repo['.'] is not a wctx but a pctx
Don't confuse hackers!
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 07 Apr 2014 23:10:20 +0200 |
| parents | dbf0fa39a5b8 |
| children | b6e0616d08cb |
| files | hgext/shelve.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/shelve.py Fri Apr 04 16:41:51 2014 -0700 +++ b/hgext/shelve.py Mon Apr 07 23:10:20 2014 +0200 @@ -526,13 +526,13 @@ tr = repo.transaction('unshelve', report=lambda x: None) oldtiprev = len(repo) - wctx = repo['.'] - tmpwctx = wctx + pctx = repo['.'] + tmpwctx = pctx # The goal is to have a commit structure like so: - # ...-> wctx -> tmpwctx -> shelvectx + # ...-> pctx -> tmpwctx -> shelvectx # where tmpwctx is an optional commit with the user's pending changes # and shelvectx is the unshelved changes. Then we merge it all down - # to the original wctx. + # to the original pctx. # Store pending changes in a commit m, a, r, d = repo.status()[:4] @@ -587,7 +587,7 @@ stripnodes = [repo.changelog.node(rev) for rev in xrange(oldtiprev, len(repo))] - shelvedstate.save(repo, basename, wctx, tmpwctx, stripnodes) + shelvedstate.save(repo, basename, pctx, tmpwctx, stripnodes) util.rename(repo.join('rebasestate'), repo.join('unshelverebasestate')) @@ -602,7 +602,7 @@ # rebase was a no-op, so it produced no child commit shelvectx = tmpwctx - mergefiles(ui, repo, wctx, shelvectx) + mergefiles(ui, repo, pctx, shelvectx) shelvedstate.clear(repo) # The transaction aborting will strip all the commits for us,