Mercurial > hg
changeset 25571:1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
If the conversion doesn't change the hash, and the cset is public in the source,
it should be public in the destination. (This can happen if file remapping is
done that doesn't affect the initial commits.) This also propagates the secret
phase from the source, regardless of the hash, because presumably the content is
what is secret. Otherwise, the destination commit stays in the draft phase.
Maybe any draft cset with an unchanged hash should be changed to public, because
it has effectively been shared, but convert pretty strongly implies throwing
away (or at least readonly archiving) the source repo.
The change in the rollback output is because the name of the outer transaction
is now 'convert', which seems more accurate. Unfortunately, the memctx won't
indicate the hash prior to committing, so the proper phase can't be applied with
the commit.
The repo is already write locked in mercurial_sink.before().
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 14 Jun 2015 13:08:11 -0400 |
| parents | 7cc1d33f0ba6 |
| children | 3d8c044ed513 |
| files | hgext/convert/common.py hgext/convert/hg.py tests/test-convert-cvs.t tests/test-convert-filemap.t tests/test-convert-hg-sink.t |
| diffstat | 5 files changed, 73 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/common.py Sun Jun 14 13:04:00 2015 -0400 +++ b/hgext/convert/common.py Sun Jun 14 13:08:11 2015 -0400 @@ -7,7 +7,7 @@ import base64, errno, subprocess, os, datetime, re import cPickle as pickle -from mercurial import util +from mercurial import phases, util from mercurial.i18n import _ propertycache = util.propertycache @@ -44,7 +44,7 @@ class commit(object): def __init__(self, author, date, desc, parents, branch=None, rev=None, - extra={}, sortkey=None, saverev=True): + extra={}, sortkey=None, saverev=True, phase=phases.draft): self.author = author or 'unknown' self.date = date or '0 0' self.desc = desc @@ -54,6 +54,7 @@ self.extra = extra self.sortkey = sortkey self.saverev = saverev + self.phase = phase class converter_source(object): """Conversion source interface"""
--- a/hgext/convert/hg.py Sun Jun 14 13:04:00 2015 -0400 +++ b/hgext/convert/hg.py Sun Jun 14 13:08:11 2015 -0400 @@ -22,6 +22,7 @@ from mercurial.i18n import _ from mercurial.node import bin, hex, nullid from mercurial import hg, util, context, bookmarks, error, scmutil, exchange +from mercurial import phases from common import NoRepo, commit, converter_source, converter_sink, mapfile @@ -258,7 +259,29 @@ fileset.update(self.repo[p2]) ctx = context.memctx(self.repo, (p1, p2), text, fileset, getfilectx, commit.author, commit.date, extra) - self.repo.commitctx(ctx) + + # We won't know if the conversion changes the node until after the + # commit, so copy the source's phase for now. + self.repo.ui.setconfig('phases', 'new-commit', + phases.phasenames[commit.phase], 'convert') + + tr = self.repo.transaction("convert") + + try: + node = hex(self.repo.commitctx(ctx)) + + # If the node value has changed, but the phase is lower than + # draft, set it back to draft since it hasn't been exposed + # anywhere. + if commit.rev != node: + ctx = self.repo[node] + if ctx.phase() < phases.draft: + phases.retractboundary(self.repo, tr, phases.draft, + [ctx.node()]) + tr.close() + finally: + tr.release() + text = "(octopus merge fixup)\n" p2 = hex(self.repo.changelog.tip()) @@ -479,7 +502,8 @@ date=util.datestr(ctx.date(), '%Y-%m-%d %H:%M:%S %1%2'), desc=ctx.description(), rev=crev, parents=parents, branch=ctx.branch(), extra=ctx.extra(), - sortkey=ctx.rev(), saverev=self.saverev) + sortkey=ctx.rev(), saverev=self.saverev, + phase=ctx.phase()) def gettags(self): # This will get written to .hgtags, filter non global tags out.
--- a/tests/test-convert-cvs.t Sun Jun 14 13:04:00 2015 -0400 +++ b/tests/test-convert-cvs.t Sun Jun 14 13:08:11 2015 -0400 @@ -121,7 +121,7 @@ 1 ci0 0 import filtering out empty revision - repository tip rolled back to revision 1 (undo commit) + repository tip rolled back to revision 1 (undo convert) updating tags $ hgcat b/c c
--- a/tests/test-convert-filemap.t Sun Jun 14 13:04:00 2015 -0400 +++ b/tests/test-convert-filemap.t Sun Jun 14 13:08:11 2015 -0400 @@ -477,7 +477,7 @@ 2 add 1 rename filtering out empty revision - repository tip rolled back to revision 0 (undo commit) + repository tip rolled back to revision 0 (undo convert) 0 modify $ glog -R renameundo2 o 1 "modify" files: a c
--- a/tests/test-convert-hg-sink.t Sun Jun 14 13:04:00 2015 -0400 +++ b/tests/test-convert-hg-sink.t Sun Jun 14 13:08:11 2015 -0400 @@ -41,6 +41,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo and bar + $ hg phase --public -r tip $ cd .. $ hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' initializing destination new repository @@ -52,6 +53,16 @@ 1 add foo/file 0 Added tag some-tag for changeset ad681a868e44 $ cd new + $ hg log -G --template '{rev} {node|short} ({phase}) "{desc}"\n' + o 3 593cbf6fb2b4 (public) "Added tag some-tag for changeset ad681a868e44" + | + o 2 ad681a868e44 (public) "add foo/file" + | + o 1 cbba8ecc03b7 (public) "remove foo" + | + o 0 327daa9251fa (public) "add foo and bar" + + $ hg out ../orig comparing with ../orig searching for changes @@ -132,7 +143,7 @@ $ glog() > { - > hg log -G --template '{rev} {node|short} "{desc}" files: {files}\n' $* + > hg log -G --template '{rev} {node|short} ({phase}) "{desc}" files: {files}\n' $* > } Create a tricky source repo @@ -171,20 +182,21 @@ dir/c dir/d e + $ hg phase --public -r tip $ glog - @ 6 0613c8e59a3d "6: change a" files: a + @ 6 0613c8e59a3d (public) "6: change a" files: a | - o 5 717e9b37cdb7 "5: merge 2 and 3, copy b to dir/d" files: dir/d e + o 5 717e9b37cdb7 (public) "5: merge 2 and 3, copy b to dir/d" files: dir/d e |\ - | o 4 86a55cb968d5 "4: change a" files: a + | o 4 86a55cb968d5 (public) "4: change a" files: a | | - o | 3 0e6e235919dd "3: copy a to e, change b" files: b e + o | 3 0e6e235919dd (public) "3: copy a to e, change b" files: b e | | - o | 2 0394b0d5e4f7 "2: add dir/c" files: dir/c + o | 2 0394b0d5e4f7 (public) "2: add dir/c" files: dir/c |/ - o 1 333546584845 "1: add a and dir/b" files: a dir/b + o 1 333546584845 (public) "1: add a and dir/b" files: a dir/b | - o 0 d1a24e2ebd23 "0: add 0" files: 0 + o 0 d1a24e2ebd23 (public) "0: add 0" files: 0 $ cd .. @@ -209,15 +221,15 @@ Verify that conversion skipped rev 2: $ glog -R dest - o 4 78814e84a217 "6: change a" files: a + o 4 78814e84a217 (draft) "6: change a" files: a | - o 3 f7cff662c5e5 "5: merge 2 and 3, copy b to dir/d" files: e + o 3 f7cff662c5e5 (draft) "5: merge 2 and 3, copy b to dir/d" files: e |\ - | o 2 ab40a95b0072 "4: change a" files: a + | o 2 ab40a95b0072 (draft) "4: change a" files: a | | - o | 1 bd51f17597bf "3: copy a to e, change b" files: b e + o | 1 bd51f17597bf (draft) "3: copy a to e, change b" files: b e |/ - o 0 a4a1dae0fe35 "1: add a and dir/b" files: 0 a + o 0 a4a1dae0fe35 (draft) "1: add a and dir/b" files: 0 a Verify mapping correct in both directions: @@ -347,17 +359,17 @@ e $ glog -r 6: - @ 11 0c8927d1f7f4 "11: source change" files: a + @ 11 0c8927d1f7f4 (draft) "11: source change" files: a | - o 10 9ccb7ee8d261 "10: source merge" files: a + o 10 9ccb7ee8d261 (draft) "10: source merge" files: a |\ - | o 9 f131b1518dba "9: source second branch" files: a + | o 9 f131b1518dba (draft) "9: source second branch" files: a | | - o | 8 669cf0e74b50 "8: source first branch" files: a + o | 8 669cf0e74b50 (draft) "8: source first branch" files: a | | - | o 7 e6d364a69ff1 "change in dest" files: dest + | o 7 e6d364a69ff1 (draft) "change in dest" files: dest |/ - o 6 0613c8e59a3d "6: change a" files: a + o 6 0613c8e59a3d (public) "6: change a" files: a | $ cd .. @@ -371,25 +383,25 @@ 0 11: source change $ glog -R dest - o 9 8432d597b263 "11: source change" files: a + o 9 8432d597b263 (draft) "11: source change" files: a | - o 8 632ffacdcd6f "10: source merge" files: a + o 8 632ffacdcd6f (draft) "10: source merge" files: a |\ - | o 7 049cfee90ee6 "9: source second branch" files: a + | o 7 049cfee90ee6 (draft) "9: source second branch" files: a | | - o | 6 9b6845e036e5 "8: source first branch" files: a + o | 6 9b6845e036e5 (draft) "8: source first branch" files: a | | - | @ 5 a2e0e3cc6d1d "change in dest" files: dest + | @ 5 a2e0e3cc6d1d (draft) "change in dest" files: dest |/ - o 4 78814e84a217 "6: change a" files: a + o 4 78814e84a217 (draft) "6: change a" files: a | - o 3 f7cff662c5e5 "5: merge 2 and 3, copy b to dir/d" files: e + o 3 f7cff662c5e5 (draft) "5: merge 2 and 3, copy b to dir/d" files: e |\ - | o 2 ab40a95b0072 "4: change a" files: a + | o 2 ab40a95b0072 (draft) "4: change a" files: a | | - o | 1 bd51f17597bf "3: copy a to e, change b" files: b e + o | 1 bd51f17597bf (draft) "3: copy a to e, change b" files: b e |/ - o 0 a4a1dae0fe35 "1: add a and dir/b" files: 0 a + o 0 a4a1dae0fe35 (draft) "1: add a and dir/b" files: 0 a $ cd .. @@ -520,7 +532,7 @@ Conversion after rollback $ hg -R a rollback -f - repository tip rolled back to revision 2 (undo commit) + repository tip rolled back to revision 2 (undo convert) $ hg convert --filemap filemap-b 0 a --config convert.hg.revs=1:: scanning source...