| Submitter | Martin von Zweigbergk |
|---|---|
| Date | Feb. 18, 2015, 6:20 p.m. |
| Message ID | <139af1a7cf0ff45da104.1424283625@martinvonz.mtv.corp.google.com> |
| Download | mbox | patch |
| Permalink | /patch/7809/ |
| State | Accepted |
| Headers | show |
Comments
On Wed, Feb 18, 2015 at 10:20:25AM -0800, Martin von Zweigbergk wrote: > # HG changeset patch > # User Martin von Zweigbergk <martinvonz@google.com> > # Date 1424244055 28800 > # Tue Feb 17 23:20:55 2015 -0800 > # Node ID 139af1a7cf0ff45da10424e4000f14a4dcc22501 > # Parent 1b3b6d629d6c1f8544db349707e47293965b94c0 > subrepo: add tests for change/remove conflicts Queued for stable. > > There are currently no tests for change/remove conflicts of subrepos, > and it's pretty broken. Add some tests demonstrating some of the > breakages and fix the most obvious one (a KeyError when trying to look > up a subrepo in the wrong context). > > diff -r 1b3b6d629d6c -r 139af1a7cf0f mercurial/subrepo.py > --- a/mercurial/subrepo.py Wed Jan 21 17:11:37 2015 -0500 > +++ b/mercurial/subrepo.py Tue Feb 17 23:20:55 2015 -0800 > @@ -245,7 +245,7 @@ > 'use (c)hanged version or (d)elete?' > '$$ &Changed $$ &Delete') % s, 0) == 0: > debug(s, "prompt recreate", r) > - wctx.sub(s).get(r) > + mctx.sub(s).get(r) > sm[s] = r > > # record merged .hgsubstate > diff -r 1b3b6d629d6c -r 139af1a7cf0f tests/test-subrepo.t > --- a/tests/test-subrepo.t Wed Jan 21 17:11:37 2015 -0500 > +++ b/tests/test-subrepo.t Tue Feb 17 23:20:55 2015 -0800 > @@ -304,6 +304,138 @@ > t3 > >>>>>>> other: 7af322bc1198 - test: 7 > > +11: remove subrepo t > + > + $ hg co -C 5 > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + $ hg revert -r 4 .hgsub # remove t > + $ hg ci -m11 > + created new head > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + > +local removed, remote changed, keep changed > + > + $ hg merge 6 > + remote changed subrepository t which local removed > + use (c)hanged version or (d)elete? c > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > + (branch merge, don't forget to commit) > +BROKEN: should include subrepo t > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + 6747d179aa9a688023c4b0cad32e4c92bb7f34ad t > + $ hg ci -m 'local removed, remote changed, keep changed' > +BROKEN: should include subrepo t > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > +BROKEN: should include subrepo t > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + $ cat t/t > + t2 > + > +local removed, remote changed, keep removed > + > + $ hg co -C 11 > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + $ hg merge --config ui.interactive=true 6 <<EOF > + > d > + > EOF > + remote changed subrepository t which local removed > + use (c)hanged version or (d)elete? d > + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved > + (branch merge, don't forget to commit) > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + $ hg ci -m 'local removed, remote changed, keep removed' > + created new head > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + > +local changed, remote removed, keep changed > + > + $ hg co -C 6 > + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + $ hg merge 11 > + local changed subrepository t which remote removed > + use (c)hanged version or (d)elete? c > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + (branch merge, don't forget to commit) > +BROKEN: should include subrepo t > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > +BROKEN: should include subrepo t > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + $ hg ci -m 'local changed, remote removed, keep changed' > + created new head > +BROKEN: should include subrepo t > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > +BROKEN: should include subrepo t > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + $ cat t/t > + t2 > + > +local changed, remote removed, keep removed > + > + $ hg co -C 6 > + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + $ hg merge --config ui.interactive=true 11 <<EOF > + > d > + > EOF > + local changed subrepository t which remote removed > + use (c)hanged version or (d)elete? d > + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + (branch merge, don't forget to commit) > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + $ hg ci -m 'local changed, remote removed, keep removed' > + created new head > + $ hg debugsub > + path s > + source s > + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 > + $ cat .hgsubstate > + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s > + > +clean up to avoid having to fix up the tests below > + > + $ hg co -C 10 > + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved > + $ cat >> $HGRCPATH <<EOF > + > [extensions] > + > strip= > + > EOF > + $ hg strip -r 11:15 > + saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob) > + > clone > > $ cd .. > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff -r 1b3b6d629d6c -r 139af1a7cf0f mercurial/subrepo.py --- a/mercurial/subrepo.py Wed Jan 21 17:11:37 2015 -0500 +++ b/mercurial/subrepo.py Tue Feb 17 23:20:55 2015 -0800 @@ -245,7 +245,7 @@ 'use (c)hanged version or (d)elete?' '$$ &Changed $$ &Delete') % s, 0) == 0: debug(s, "prompt recreate", r) - wctx.sub(s).get(r) + mctx.sub(s).get(r) sm[s] = r # record merged .hgsubstate diff -r 1b3b6d629d6c -r 139af1a7cf0f tests/test-subrepo.t --- a/tests/test-subrepo.t Wed Jan 21 17:11:37 2015 -0500 +++ b/tests/test-subrepo.t Tue Feb 17 23:20:55 2015 -0800 @@ -304,6 +304,138 @@ t3 >>>>>>> other: 7af322bc1198 - test: 7 +11: remove subrepo t + + $ hg co -C 5 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg revert -r 4 .hgsub # remove t + $ hg ci -m11 + created new head + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + +local removed, remote changed, keep changed + + $ hg merge 6 + remote changed subrepository t which local removed + use (c)hanged version or (d)elete? c + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) +BROKEN: should include subrepo t + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + 6747d179aa9a688023c4b0cad32e4c92bb7f34ad t + $ hg ci -m 'local removed, remote changed, keep changed' +BROKEN: should include subrepo t + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 +BROKEN: should include subrepo t + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + $ cat t/t + t2 + +local removed, remote changed, keep removed + + $ hg co -C 11 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg merge --config ui.interactive=true 6 <<EOF + > d + > EOF + remote changed subrepository t which local removed + use (c)hanged version or (d)elete? d + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + $ hg ci -m 'local removed, remote changed, keep removed' + created new head + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + +local changed, remote removed, keep changed + + $ hg co -C 6 + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg merge 11 + local changed subrepository t which remote removed + use (c)hanged version or (d)elete? c + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) +BROKEN: should include subrepo t + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 +BROKEN: should include subrepo t + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + $ hg ci -m 'local changed, remote removed, keep changed' + created new head +BROKEN: should include subrepo t + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 +BROKEN: should include subrepo t + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + $ cat t/t + t2 + +local changed, remote removed, keep removed + + $ hg co -C 6 + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg merge --config ui.interactive=true 11 <<EOF + > d + > EOF + local changed subrepository t which remote removed + use (c)hanged version or (d)elete? d + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + $ hg ci -m 'local changed, remote removed, keep removed' + created new head + $ hg debugsub + path s + source s + revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 + $ cat .hgsubstate + e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s + +clean up to avoid having to fix up the tests below + + $ hg co -C 10 + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat >> $HGRCPATH <<EOF + > [extensions] + > strip= + > EOF + $ hg strip -r 11:15 + saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob) + clone $ cd ..