Mercurial > hg
view tests/test-remotefilelog-clone-tree.t @ 42050:03f6480bfdda
unshelve: disable unshelve during merge (issue5123)
As stated in the issue5123, unshelve can destroy the second parent of
the context when tried to unshelve with an uncommitted merge. This
patch makes unshelve to abort when called with an uncommitted merge.
See how shelve.mergefiles works. Commit structure looks like this:
```
... -> pctx -> tmpwctx -> shelvectx
/
/
second
merge parent
pctx = parent before merging working context(first merge parent)
tmpwctx = commited working directory after merge(with two parents)
shelvectx = shelved context
```
shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with:
```
cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
*pathtofiles(repo, files),
**{'no_backup': True})
```
Reverting tmpwctx files that were merged from second parent to pctx makes them
added because they are not in pctx.
Changing this revert operation is crucial to restore parents after unshelve.
This is a complicated issue as this is not fixing a regression. Thus, for the
time being, unshelve during an uncommitted merge can be aborted.
(Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408)
Differential Revision: https://phab.mercurial-scm.org/D6169
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Mon, 25 Mar 2019 12:33:41 +0530 |
parents | a0886a4d6dce |
children | db9e33beb0fb |
line wrap: on
line source
#require no-windows $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ echo treemanifest >> .hg/requires $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > EOF # uppercase directory name to test encoding $ mkdir -p A/B $ echo x > A/B/x $ hg commit -qAm x $ cd .. # shallow clone from full $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 4 files to transfer, 449 bytes of data transferred 449 bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow $ cat .hg/requires dotencode exp-remotefilelog-repo-req-1 fncache generaldelta revlogv1 sparserevlog store treemanifest $ find .hg/store/meta | sort .hg/store/meta .hg/store/meta/_a .hg/store/meta/_a/00manifest.i .hg/store/meta/_a/_b .hg/store/meta/_a/_b/00manifest.i $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) $ cat A/B/x x $ ls .hg/store/data $ echo foo > A/B/F $ hg add A/B/F $ hg ci -m 'local content' $ ls .hg/store/data ca31988f085bfb945cb8115b78fabdee40f741aa $ cd .. # shallow clone from shallow $ hgcloneshallow ssh://user@dummy/shallow shallow2 --noupdate streaming all changes 5 files to transfer, 1008 bytes of data transferred 1008 bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow2 $ cat .hg/requires dotencode exp-remotefilelog-repo-req-1 fncache generaldelta revlogv1 sparserevlog store treemanifest $ ls .hg/store/data ca31988f085bfb945cb8115b78fabdee40f741aa $ hg update 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat A/B/x x $ cd .. # full clone from shallow # - send stderr to /dev/null because the order of stdout/err causes # flakiness here $ hg clone --noupdate ssh://user@dummy/shallow full 2>/dev/null streaming all changes remote: abort: Cannot clone from a shallow repo to a full repo. [255] # getbundle full clone $ printf '[server]\npreferuncompressed=False\n' >> master/.hg/hgrc $ hgcloneshallow ssh://user@dummy/master shallow3 requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files new changesets 18d955ee7ba0 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ ls shallow3/.hg/store/data $ cat shallow3/.hg/requires dotencode exp-remotefilelog-repo-req-1 fncache generaldelta revlogv1 sparserevlog store treemanifest