This is an archive of the discontinued Mercurial Phabricator instance.

Differential D511

phabsend: make --amend the default
ClosedPublic

Authored by quark on Aug 24 2017, 9:15 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHG07ffff841863: phabsend: make --amend the default
Summary

The local tag feature was intended to make phabsend closer to email
workflow. But its experience is not great in multiple ways:

  • after rebase, obsoleted changesets are still visible because of tags
  • without obsstore, the association information will get lost
  • even with obsstore, things could go wrong with graft, export+import
  • no easy way to tell which Differential Revision a commit is associated

Therefore make --amend the default. People wanting the old behavior can
use --no-amend.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Aug 24 2017, 9:15 PM
indygreg accepted this revision.Aug 24 2017, 11:50 PM
indygreg added a subscriber: indygreg.

I suspect most Mercurial developers are using evolve. So this seems reasonable.

This revision is now accepted and ready to land.Aug 24 2017, 11:50 PM
durin42 accepted this revision.Aug 28 2017, 2:42 PM
Closed by commit rHG07ffff841863: phabsend: make --amend the default (authored by quark). · Explain WhyAug 28 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (8 lines)

Diff 1360

contrib/phabricator.py

# phabricator.py - simple Phabricator integration # phabricator.py - simple Phabricator integration
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
"""simple Phabricator integration """simple Phabricator integration
This extension provides a ``phabsend`` command which sends a stack of This extension provides a ``phabsend`` command which sends a stack of
changesets to Phabricator without amending commit messages, and a ``phabread`` changesets to Phabricator, and a ``phabread`` command which prints a stack of
command which prints a stack of revisions in a format suitable revisions in a format suitable for :hg:`import`, and a ``phabupdate`` command
for :hg:`import`, and a ``phabupdate`` command to update statuses in batch. to update statuses in batch.
By default, Phabricator requires ``Test Plan`` which might prevent some By default, Phabricator requires ``Test Plan`` which might prevent some
changeset from being sent. The requirement could be disabled by changing changeset from being sent. The requirement could be disabled by changing
``differential.require-test-plan-field`` config server side. ``differential.require-test-plan-field`` config server side.
Config:: Config::
[phabricator] [phabricator]
unresolved = set(names) - resolved unresolved = set(names) - resolved
if unresolved: if unresolved:
raise error.Abort(_('unknown username: %s') raise error.Abort(_('unknown username: %s')
% ' '.join(sorted(unresolved))) % ' '.join(sorted(unresolved)))
return [entry[r'phid'] for entry in data] return [entry[r'phid'] for entry in data]
@command('phabsend', @command('phabsend',
[('r', 'rev', [], _('revisions to send'), _('REV')), [('r', 'rev', [], _('revisions to send'), _('REV')),
('', 'amend', False, _('update commit messages')), ('', 'amend', True, _('update commit messages')),
('', 'reviewer', [], _('specify reviewers')), ('', 'reviewer', [], _('specify reviewers')),
('', 'confirm', None, _('ask for confirmation before sending'))], ('', 'confirm', None, _('ask for confirmation before sending'))],
_('REV [OPTIONS]')) _('REV [OPTIONS]'))
def phabsend(ui, repo, *revs, **opts): def phabsend(ui, repo, *revs, **opts):
"""upload changesets to Phabricator """upload changesets to Phabricator
If there are multiple revisions specified, they will be send as a stack If there are multiple revisions specified, they will be send as a stack
with a linear dependencies relationship using the order specified by the with a linear dependencies relationship using the order specified by the