This is an archive of the discontinued Mercurial Phabricator instance.

Differential D516

pull: do not prompt "hg update" if update.requiredest is set
ClosedPublic

Authored by quark on Aug 24 2017, 11:30 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8abbae93045a: pull: do not prompt "hg update" if update.requiredest is set
Summary

Previously, after pull, we show:

(run 'hg update' to get a working copy)

unconditionally. People might run hg update and get an exception if
update.requiredest is set, and get a bit frustrated. This patch changes
the code to not prompt hg update in that case.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 24 2017, 11:30 PM
durin42 accepted this revision.Aug 28 2017, 2:46 PM
This revision is now accepted and ready to land.Aug 28 2017, 2:46 PM
Closed by commit rHG8abbae93045a: pull: do not prompt "hg update" if update.requiredest is set (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
Mmercurial/commands.py (2 lines)
Mtests/test-update-dest.t (13 lines)

Diff 1273

mercurial/commands.py

currentbranchheads = len(repo.branchheads()) currentbranchheads = len(repo.branchheads())
if currentbranchheads == modheads: if currentbranchheads == modheads:
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
elif currentbranchheads > 1: elif currentbranchheads > 1:
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
"merge)\n")) "merge)\n"))
else: else:
ui.status(_("(run 'hg heads' to see heads)\n")) ui.status(_("(run 'hg heads' to see heads)\n"))
else: elif not ui.configbool('commands', 'update.requiredest'):
ui.status(_("(run 'hg update' to get a working copy)\n")) ui.status(_("(run 'hg update' to get a working copy)\n"))
@command('^pull', @command('^pull',
[('u', 'update', None, [('u', 'update', None,
_('update to new branch head if changesets were pulled')), _('update to new branch head if changesets were pulled')),
('f', 'force', None, _('run even when remote repository is unrelated')), ('f', 'force', None, _('run even when remote repository is unrelated')),
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),

tests/test-update-dest.t

$ cd repo $ cd repo
$ echo a >> a $ echo a >> a
$ hg commit -qAm aa $ hg commit -qAm aa
$ cd ../clone $ cd ../clone
$ hg pull --update $ hg pull --update
abort: update destination required by configuration abort: update destination required by configuration
(use hg pull followed by hg update DEST) (use hg pull followed by hg update DEST)
[255] [255]
$ cd ..
update.requiredest should silent the "hg update" text after pull
$ hg init repo1
$ cd repo1
$ hg pull ../repo
pulling from ../repo
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files