( )⚙ D221 infinitepush: always require a pattern for --list-remote

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D221

infinitepush: always require a pattern for --list-remote
ClosedPublic

Authored by stash on Aug 3 2017, 6:49 AM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGXb3db2e2160f3: infinitepush: always require a pattern for --list-remote
Summary

--list-remote can return too many nodes if used without a pattern.
Let's require a pattern.

Test Plan

Run unittests

Diff Detail

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

Event Timeline

stash created this revision.Aug 3 2017, 6:49 AM
ryanmce retitled this revision from infinitepush: always require for --list-remote to infinitepush: always require a pattern for --list-remote.Aug 3 2017, 6:51 AM
ryanmce edited the summary of this revision. (Show Details)
ryanmce accepted this revision.Aug 3 2017, 7:00 AM
ryanmce added a subscriber: ryanmce.

I modified the summary and title; code changes seem fine to me.

infinitepush/__init__.py
356

I'd slightly prefer the full command name: hg bookmarks

This revision is now accepted and ready to land.Aug 3 2017, 7:00 AM
Closed by commit rFBHGXb3db2e2160f3: infinitepush: always require a pattern for --list-remote (authored by stash). · Explain WhyAug 22 2017, 10:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1167

infinitepush/__init__.py

def exbookmarks(orig, ui, repo, *names, **opts): def exbookmarks(orig, ui, repo, *names, **opts):
pattern = opts.get('list_remote') pattern = opts.get('list_remote')
if pattern: if pattern:
remotepath = opts.get('remote_path') remotepath = opts.get('remote_path')
path = ui.paths.getpath(remotepath or None, default=('default')) path = ui.paths.getpath(remotepath or None, default=('default'))
destpath = path.pushloc or path.loc destpath = path.pushloc or path.loc
other = hg.peer(repo, opts, destpath) other = hg.peer(repo, opts, destpath)
if not names: if not names:
defaultscratchpatterns = ui.configlist( raise error.Abort(
'infinitepush', 'defaultremotepatterns', ['*']) '--list-remote requires a bookmark pattern',
fetchedbookmarks = other.listkeyspatterns( hint='use "hg book" to get a list of your local bookmarks')
ryanmceUnsubmitted
Not Done

I'd slightly prefer the full command name: hg bookmarks

ryanmce: I'd slightly prefer the full command name: hg bookmarks
'bookmarks', patterns=defaultscratchpatterns)
fetchedbookmarks.update(other.listkeys('bookmarks'))
else: else:
fetchedbookmarks = other.listkeyspatterns('bookmarks', fetchedbookmarks = other.listkeyspatterns('bookmarks',
patterns=names) patterns=names)
_showbookmarks(ui, fetchedbookmarks, **opts) _showbookmarks(ui, fetchedbookmarks, **opts)
return return
return orig(ui, repo, *names, **opts) return orig(ui, repo, *names, **opts)
def _checkheads(orig, pushop): def _checkheads(orig, pushop):

tests/test-infinitepush-bundlestore.t

| o scratchcommit draft | o scratchcommit draft
|/ |/
o initialcommit public o initialcommit public
$ hg book --list-remote scratch/* $ hg book --list-remote scratch/*
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
$ hg book --list-remote $ hg book --list-remote
newbook 0000000000000000000000000000000000000000 abort: --list-remote requires a bookmark pattern
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 (use "hg book" to get a list of your local bookmarks)
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 [255]
$ hg book --config infinitepush.defaultremotepatterns=scratch/another* --list-remote $ hg book --config infinitepush.defaultremotepatterns=scratch/another* --list-remote
newbook 0000000000000000000000000000000000000000 abort: --list-remote requires a bookmark pattern
scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 (use "hg book" to get a list of your local bookmarks)
[255]
$ hg book --list-remote scratch/my $ hg book --list-remote scratch/my
$ hg book --list-remote scratch/my* $ hg book --list-remote scratch/my*
scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547
$ hg book --list-remote scratch/my* -T json $ hg book --list-remote scratch/my* -T json
[ [
{ {
"bookmark": "scratch/mybranch", "bookmark": "scratch/mybranch",
"node": "8872775dd97a750e1533dc1fbbca665644b32547" "node": "8872775dd97a750e1533dc1fbbca665644b32547"