This is an archive of the discontinued Mercurial Phabricator instance.

Differential D747

metaedit: make it compatible with histedit
ClosedPublic

Authored by mitrandir on Sep 20 2017, 12:49 PM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGXeb0dfcb0a5df: metaedit: make it compatible with histedit
Summary

auto-rebasing stuff during metaedit doesn't really work well for histedit.
Let's specialcase it

Test Plan

see test

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Test Errors

Event Timeline

mitrandir created this revision.Sep 20 2017, 12:49 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 20 2017, 12:49 PM
ryanmce requested changes to this revision.Sep 20 2017, 1:20 PM
ryanmce added a subscriber: ryanmce.
ryanmce added inline comments.
hgext3rd/fbamend/metaedit.py
137

I don't think it needs to be a warning. Info probably so it shows up with -v?

187

Is there no built in way to check this from the histedit extension?

This revision now requires changes to proceed.Sep 20 2017, 1:20 PM
mitrandir added inline comments.Sep 21 2017, 8:12 AM
hgext3rd/fbamend/metaedit.py
137

I can do that.

187

Nothing that we could simply use here.

mitrandir updated this revision to Diff 1960.Sep 21 2017, 8:18 AM

s/warn/note

ryanmce accepted this revision.Sep 21 2017, 8:26 AM
This revision is now accepted and ready to land.Sep 21 2017, 8:26 AM
Closed by commit rFBHGXeb0dfcb0a5df: metaedit: make it compatible with histedit (authored by mitrandir). · Explain WhySep 21 2017, 5:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1960

hgext3rd/fbamend/metaedit.py

replacemap.get(c.p2().node(), c.p2().node()), replacemap.get(c.p2().node(), c.p2().node()),
] ]
newid, created = common.metarewrite(repo, c, bases, newid, created = common.metarewrite(repo, c, bases,
commitopts=_commitopts) commitopts=_commitopts)
if created: if created:
replacemap[c.node()] = newid replacemap[c.node()] = newid
for c in allctx: for c in allctx:
_rewritesingle(c, commitopts) _rewritesingle(c, commitopts)
if _histediting(repo):
ui.note(_('during histedit, the descendants of '
ryanmceUnsubmitted
Not Done

I don't think it needs to be a warning. Info probably so it shows up with -v?

ryanmce: I don't think it needs to be a warning. Info probably so it shows up with -v?
mitrandirAuthorUnsubmitted
Not Done

I can do that.

mitrandir: I can do that.
'the edited commit weren\'t auto-rebased\n'))
else:
for c in newunstablectx: for c in newunstablectx:
_rewritesingle(c, _rewritesingle(c,
{'date': commitopts.get('date') or None}) {'date': commitopts.get('date') or None})
if p1.node() in replacemap: if p1.node() in replacemap:
repo.setparents(replacemap[p1.node()]) repo.setparents(replacemap[p1.node()])
if len(replacemap) > 0: if len(replacemap) > 0:
mapping = dict(map(lambda oldnew: (oldnew[0], [oldnew[1]]), mapping = dict(map(lambda oldnew: (oldnew[0], [oldnew[1]]),
replacemap.iteritems())) replacemap.iteritems()))
scmutil.cleanupnodes(repo, mapping, 'metaedit') scmutil.cleanupnodes(repo, mapping, 'metaedit')
# TODO: set poroper phase boundaries (affects secret # TODO: set poroper phase boundaries (affects secret
tr.release() tr.release()
if opts['fold']: if opts['fold']:
ui.status(_('%i changesets folded\n') % len(revs)) ui.status(_('%i changesets folded\n') % len(revs))
if newp1 is not None: if newp1 is not None:
hg.update(repo, newp1) hg.update(repo, newp1)
finally: finally:
lockmod.release(lock, wlock) lockmod.release(lock, wlock)
def _histediting(repo):
ryanmceUnsubmitted
Not Done

Is there no built in way to check this from the histedit extension?

ryanmce: Is there no built in way to check this from the histedit extension?
mitrandirAuthorUnsubmitted
Not Done

Nothing that we could simply use here.

mitrandir: Nothing that we could simply use here.
return repo.vfs.exists('histedit-state')

tests/test-fbamend-metaedit.t

o 8:a1c80e4c2636@default(draft) metaedit o 8:a1c80e4c2636@default(draft) metaedit
| |
o 5:1aed0f31debd@default(draft) metaedit o 5:1aed0f31debd@default(draft) metaedit
| |
o 1:66f7d451a68b@default(draft) r1 o 1:66f7d451a68b@default(draft) r1
| |
o 0:1ea73414a91b@default(draft) r0 o 0:1ea73414a91b@default(draft) r0
make the top commit non-empty
$ echo xx > xx
$ hg add xx
$ hg amend
$ glog -r 'all()'
@ 10:90ef4d40a825@default(draft) metaedit
|
o 8:a1c80e4c2636@default(draft) metaedit
|
o 5:1aed0f31debd@default(draft) metaedit
|
o 1:66f7d451a68b@default(draft) r1
|
o 0:1ea73414a91b@default(draft) r0
test histedit compat
$ echo '[extensions]' >> $HGRCPATH
$ echo "fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py" >> $HGRCPATH
$ echo "histedit=" >> $HGRCPATH
$ hg export -r .
# HG changeset patch
# User debugbuilddag
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 90ef4d40a82572a220d8329eefb1d96a1fac3597
# Parent a1c80e4c26360f913ae3bdc5c70d6f29d465bfb0
metaedit
diff --git a/xx b/xx
new file mode 100644
--- /dev/null
+++ b/xx
@@ -0,0 +1,1 @@
+xx
$ hg histedit ".^^" --commands - <<EOF
> pick 1aed0f31debd
> x hg metaedit -m "histedit test"
> x hg commit --amend -m 'message from exec'
> pick a1c80e4c2636
> pick 90ef4d40a825
> EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a1c80e4c2636: skipping changeset (no changes)
$ glog -r 'all()'
@ 13:942d79297adf@default(draft) metaedit
|
o 12:b5e5d076151f@default(draft) message from exec
|
o 1:66f7d451a68b@default(draft) r1
|
o 0:1ea73414a91b@default(draft) r0