This is an archive of the discontinued Mercurial Phabricator instance.

Differential D488

split: only do checkunfinished if rebase is needed
ClosedPublic

Authored by quark on Aug 23 2017, 4:13 AM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX5dbb2195c40e: split: only do checkunfinished if rebase is needed
Summary

It's a valid use-case to run split inside a histedit plan. The
checkunfinished was added by D161, which was caused by a user report that
the split changes got lost because of rebase failure. If there is no need to
rebase, then checkunfinished is not necessary.

In the future we might want a splitstate to make it harder to lose split
commits.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 23 2017, 4:13 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 23 2017, 4:13 AM
ryanmce accepted this revision.Aug 23 2017, 4:45 AM
This revision is now accepted and ready to land.Aug 23 2017, 4:45 AM
Closed by commit rFBHGX5dbb2195c40e: split: only do checkunfinished if rebase is needed (authored by quark). · Explain WhyAug 24 2017, 12:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/split.py (3 lines)

Diff 1193

hgext3rd/fbamend/split.py

if opts.get('no_rebase'): if opts.get('no_rebase'):
torebase = () torebase = ()
else: else:
torebase = repo.revs('descendants(%d) - (%d)', rev, rev) torebase = repo.revs('descendants(%d) - (%d)', rev, rev)
try: try:
wlock = repo.wlock() wlock = repo.wlock()
lock = repo.lock() lock = repo.lock()
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if torebase:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
tr = repo.transaction('split') tr = repo.transaction('split')
ctx = repo[rev] ctx = repo[rev]
r = ctx.rev() r = ctx.rev()
disallowunstable = not obsolete.isenabled(repo, disallowunstable = not obsolete.isenabled(repo,
obsolete.allowunstableopt) obsolete.allowunstableopt)
if disallowunstable: if disallowunstable:
# XXX We should check head revs # XXX We should check head revs
if repo.revs("(%d::) - %d", rev, rev): if repo.revs("(%d::) - %d", rev, rev):