This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1352

pushrebase: make conflict message a bit more helpful
ClosedPublic

Authored by phillco on Nov 9 2017, 1:30 PM.
Tags
None
Subscribers
durham, quark

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXa29e58daaacc: pushrebase: make conflict message a bit more helpful
Summary

A very minor change, but we should probably explain that local rebasing is
needed. (You might be forgiven for thinking that pushrebase would have
done that for you.)

Diff Detail

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

Event Timeline

phillco created this revision.Nov 9 2017, 1:30 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 9 2017, 1:30 PM
quark added a subscriber: quark.Nov 9 2017, 3:43 PM

error.Abort takes an optional hint parameter that is for this purpose.

phillco updated this revision to Diff 3384.Nov 9 2017, 9:23 PM
phillco added a comment.Nov 9 2017, 9:23 PM

ah, thanks!

durham accepted this revision.Nov 14 2017, 6:57 PM
durham added a subscriber: durham.
durham added inline comments.
hgext3rd/pushrebase.py
594

I'd drop the 'please'. Concise is better than polite

This revision is now accepted and ready to land.Nov 14 2017, 6:57 PM

Revision Contents
Changeset List

PathPackages
Mhgext3rd/pushrebase.py (7 lines)
Mtests/test-pushrebase.t (6 lines)

Diff 3384

hgext3rd/pushrebase.py

if bundle.revs('(%d %% %d) - not merge()', onto.rev(), oldonto.rev()): if bundle.revs('(%d %% %d) - not merge()', onto.rev(), oldonto.rev()):
# If anything between oldonto and newonto is a merge commit, use the # If anything between oldonto and newonto is a merge commit, use the
# slower manifest diff path. # slower manifest diff path.
conflicts = findconflicts() conflicts = findconflicts()
else: else:
conflicts = findconflictsfast() conflicts = findconflictsfast()
if conflicts: if conflicts:
raise error.Abort(_('conflicting changes in:\n%s') % msg = (_('conflicting changes in:\n%s\n') %
''.join(' %s\n' % f for f in sorted(conflicts))) ''.join(' %s\n' % f for f in sorted(conflicts))).strip()
hint = _('please pull and rebase your changes locally, then try '
durhamUnsubmitted
Not Done

I'd drop the 'please'. Concise is better than polite

durham: I'd drop the 'please'. Concise is better than polite
'again')
raise error.Abort(msg, hint=hint)
return revs, oldonto return revs, oldonto
def _getmanifest(op, rev): def _getmanifest(op, rev):
repo = rev._repo repo = rev._repo
if (not op.records[treepackrecords] and if (not op.records[treepackrecords] and
not repo.ui.configbool("pushrebase", "forcetreereceive")): not repo.ui.configbool("pushrebase", "forcetreereceive")):
m = rev.manifest() m = rev.manifest()

tests/test-pushrebase.t

$ commit 'a => quux' $ commit 'a => quux'
$ echo 'foofoo' > b $ echo 'foofoo' > b
$ commit 'b => foofoo' $ commit 'b => foofoo'
$ hg push --to default $ hg push --to default
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: conflicting changes in: remote: conflicting changes in:
a a
remote: (please pull and rebase your changes locally, then try again)
abort: push failed on remote abort: push failed on remote
[255] [255]
$ hg strip 5 $ hg strip 5
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/client/.hg/strip-backup/11a6a93eb344-7140e689-backup.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/11a6a93eb344-7140e689-backup.hg (glob)
$ cd ../server $ cd ../server
$ log $ log
$ commit 'b => foofoo' $ commit 'b => foofoo'
$ echo 'quux' > a $ echo 'quux' > a
$ commit 'a => quux' $ commit 'a => quux'
$ hg push --to default $ hg push --to default
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
remote: conflicting changes in: remote: conflicting changes in:
a a
remote: (please pull and rebase your changes locally, then try again)
abort: push failed on remote abort: push failed on remote
[255] [255]
$ hg strip 5 $ hg strip 5
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/client/.hg/strip-backup/98788efd81b0-93572e45-backup.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/98788efd81b0-93572e45-backup.hg (glob)
$ cd ../server $ cd ../server
> default = ../server2 > default = ../server2
> EOF > EOF
$ 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
(please pull and rebase your changes locally, then try again)
[255] [255]