This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1496

pushrebase: report details about public commits being pushed
ClosedPublic

Authored by simpkins on Nov 23 2017, 3:38 AM.
Tags
None
Subscribers
None

Details

Reviewers
durham
quark
Group Reviewers
Restricted Project
Commits
rFBHGX7a3b2b673eda: pushrebase: report details about public commits being pushed
Summary

When failing due to attempting to rebase already-public commits, include the
public commit node IDs in the error message.

Test Plan

Included new tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

simpkins created this revision.Nov 23 2017, 3:38 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 23 2017, 3:38 AM
quark accepted this revision.EditedNov 23 2017, 5:33 AM

Maybe we can show more information, like whether the nodes come from the received bundle or not. (I can do that as a follow up)

This revision is now accepted and ready to land.Nov 23 2017, 5:33 AM
durham accepted this revision.Nov 28 2017, 7:21 PM
Closed by commit rFBHGX7a3b2b673eda: pushrebase: report details about public commits being pushed (authored by simpkins). · Explain WhyNov 29 2017, 10:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/pushrebase.py (12 lines)
Mtests/test-pushrebase.t (25 lines)

Diff 3802

hgext3rd/pushrebase.py

return orig(repo, cg, heads, source, url) return orig(repo, cg, heads, source, url)
def validaterevset(repo, revset): def validaterevset(repo, revset):
"Abort if this is a rebasable revset, return None otherwise" "Abort if this is a rebasable revset, return None otherwise"
if not repo.revs(revset): if not repo.revs(revset):
raise error.Abort(_('nothing to rebase')) raise error.Abort(_('nothing to rebase'))
if repo.revs('%r and public()', revset): revs = repo.revs('%r and public()', revset)
raise error.Abort(_('cannot rebase public changesets')) if revs:
nodes = []
for count, rev in enumerate(revs):
if count >= 3:
nodes.append('...')
break
nodes.append(str(repo[rev]))
revstring = ', '.join(nodes)
raise error.Abort(_('cannot rebase public changesets: %s') % revstring)
if repo.revs('%r and obsolete()', revset): if repo.revs('%r and obsolete()', revset):
raise error.Abort(_('cannot rebase obsolete changesets')) raise error.Abort(_('cannot rebase obsolete changesets'))
heads = repo.revs('heads(%r)', revset) heads = repo.revs('heads(%r)', revset)
if len(heads) > 1: if len(heads) > 1:
raise error.Abort(_('cannot rebase divergent changesets')) raise error.Abort(_('cannot rebase divergent changesets'))

tests/test-pushrebase.t

$ hg push -r . --to default $ hg push -r . --to default
pushing to $TESTTMP/server2 (glob) pushing to $TESTTMP/server2 (glob)
searching for changes searching for changes
abort: conflicting changes in: abort: conflicting changes in:
A A
(pull and rebase your changes locally, then try again) (pull and rebase your changes locally, then try again)
[255] [255]
Push an already-public changeset and confirm it is rejected
$ hg update -q '.^'
$ echo 2 > C
$ hg commit -m C -A C
created new head
$ hg phase -r. --public
$ hg push -r . --to default
pushing to $TESTTMP/server2 (glob)
searching for changes
abort: cannot rebase public changesets: 3850a85c4706
[255]
$ echo 3 >> C
$ hg commit -m C2
$ echo 4 >> C
$ hg commit -m C3
$ echo 5 >> C
$ hg commit -m C4
$ hg phase -r. --public
$ hg push -r . --to default
pushing to $TESTTMP/server2 (glob)
searching for changes
abort: cannot rebase public changesets: 3850a85c4706, 50b1220b7c4e, de211a1843b7, ...
[255]