Mercurial > hg-stable
changeset 19636:6bbce5efc67b
mq: look for modified subrepos when checking for local changes
It was possible to apply, unapply, fold, patches (etc) with modified subrepos,
which resulted in surprising behavior. For example it was easy to apply a patch
with a modified subrepo, and then the refresh it and accidentally end up
including the modified subrepo on the refreshed patch.
A test has been added to verify this new check.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1375742979 -7200
# Tue Aug 06 00:49:39 2013 +0200
# Node ID a5c90acff5e61aae714ba6c9457d766c54b4f124
# Parent 6ac206fb6f27492a98f46bbff090407ee1b1de72
mq: look for modified subrepos when checking for local changes
It was possible to apply, unapply, fold, patches (etc) with modified subrepos,
which resulted in surprising behavior. For example it was easy to apply a patch
with a modified subrepo, and then the refresh it and accidentally end up
including the modified subrepo on the refreshed patch.
A test has been added to verify this new check.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Tue, 06 Aug 2013 00:49:39 +0200 |
| parents | b9b7dc267e9f |
| children | cc338115d3b2 |
| files | hgext/mq.py tests/test-mq-subrepo.t |
| diffstat | 2 files changed, 52 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Aug 07 09:59:45 2013 +0800 +++ b/hgext/mq.py Tue Aug 06 00:49:39 2013 +0200 @@ -975,11 +975,20 @@ else: raise util.Abort(_("local changes found")) + def localchangedsubreposfound(self, refresh=True): + if refresh: + raise util.Abort(_("local changed subrepos found, refresh first")) + else: + raise util.Abort(_("local changed subrepos found")) + def checklocalchanges(self, repo, force=False, refresh=True): cmdutil.checkunfinished(repo) m, a, r, d = repo.status()[:4] - if (m or a or r or d) and not force: - self.localchangesfound(refresh) + if not force: + if (m or a or r or d): + self.localchangesfound(refresh) + if self.checksubstate(repo): + self.localchangedsubreposfound(refresh) return m, a, r, d _reserved = ('series', 'status', 'guards', '.', '..')
--- a/tests/test-mq-subrepo.t Wed Aug 07 09:59:45 2013 +0800 +++ b/tests/test-mq-subrepo.t Tue Aug 06 00:49:39 2013 +0200 @@ -213,6 +213,7 @@ handle subrepos safely on qpush/qpop +(and we cannot qpop / qpush with a modified subrepo) $ mkrepo repo-2499-qpush $ mksubrepo sub @@ -220,31 +221,57 @@ $ hg -R sub ci -m0sub $ echo sub = sub > .hgsub $ hg add .hgsub - $ hg qnew -m0 0.diff + $ hg commit -m0 + $ hg debugsub + path sub + source sub + revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 + $ echo foo > ./sub/a + $ hg -R sub commit -m foo + $ hg commit -m1 + $ hg qimport -r "0:tip" + +qpop + $ hg -R sub update 0000 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg qpop + abort: local changed subrepos found, refresh first + [255] + $ hg revert sub + reverting subrepo sub + adding sub/a + $ hg qpop + popping 1.diff + now at: 0.diff + $ hg status -AS + M sub/a + C .hgsub + C .hgsubstate $ hg debugsub path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 -qpop - $ hg qpop - popping 0.diff - patch queue now empty +qpush + $ hg -R sub update 0000 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg qpush + abort: local changed subrepos found, refresh first + [255] + $ hg revert sub + reverting subrepo sub + adding sub/a + $ hg qpush + applying 1.diff + now at: 1.diff $ hg status -AS - $ hg debugsub - -qpush - $ hg qpush - applying 0.diff - now at: 0.diff - $ hg status -AS + M .hgsubstate C .hgsub - C .hgsubstate C sub/a $ hg debugsub path sub source sub - revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 + revision aa037b301eba54f350c75951b5486727fb98cbb5 $ cd ..