This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3650

serve: add an option to open in the default browser
Needs RevisionPublic

Authored by nspanti-logilab on May 24 2018, 9:35 AM.
Tags
  • Restricted Project
Subscribers
yuja, pulkit, av6 and 2 others

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

It is inspired by a similar functionality in pydoc. -g/--graphical may not be adequate, the only other idea that I have is -w/--window.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

nspanti-logilab edited the summary of this revision. (Show Details)May 24 2018, 9:39 AM
nspanti-logilab added a project: Restricted Project.
durin42 added a subscriber: durin42.May 31 2018, 3:15 PM

I don't love the flag name, and am -0 on the feature in general. All terminal emulators I've used in the last 10 years have URL detection logic and make clicking the link trivial...

av6 added a subscriber: av6.Jun 2 2018, 9:04 AM

D3649 mentions xdg-open "$(hg serve --print-url)", which shows that --print-url can nearly replace --graphical and is more versatile.

pulkit added a subscriber: pulkit.Jun 14 2018, 3:47 PM

Do we need this patch any more since D3649 has landed and we can do xdg-open "$(hg serve --print-url)"?

nspanti-logilab added a comment.Jun 15 2018, 4:40 AM

For laziness, this patch could be also useful. It is also better for text shell beginners, because they may not know that they can combine commands like that (even if it is basic). Moreover, you can still use hg serve in foreground or use it in background and give the result of --print-url to a non web browser application (but I imagine that there is a way to duplicate stdout to multiple programs). These are the advantages of this patch that I see over --print-url of D3649. It is better for convenience and require less knowledge for the user, but it is not a need. D3649 was precisely suggested to me because it can fulfill the functionality of the current patch and is more versatile.

yuja added a subscriber: yuja.Jun 16 2018, 9:21 AM

(Resend because I forgot to remove the "someone wrote:" line again, sorry.)

For laziness,  this patch could be also useful. It is also better for text shell beginners, because they may not know that they can combine commands like that (even if it is basic).

For laziness, we can add it to [alias]. I'm not a fan of adding lots of
one-off options since that's the source of man page bloat.

How about document the xdg-open example in hg help serve -v?

baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:33 PM

Revision Contents
Changeset List

Diff 8881

mercurial/commands.py

""" """
ui.write(repo.root + "\n") ui.write(repo.root + "\n")
@command('^serve', @command('^serve',
[('A', 'accesslog', '', _('name of access log file to write to'), [('A', 'accesslog', '', _('name of access log file to write to'),
_('FILE')), _('FILE')),
('d', 'daemon', None, _('run server in background')), ('d', 'daemon', None, _('run server in background')),
('', 'daemon-postexec', [], _('used internally by daemon mode')), ('', 'daemon-postexec', [], _('used internally by daemon mode')),
('g', 'gui', None, _('open in default web browser')),
('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
# use string type, then we can check if something was passed # use string type, then we can check if something was passed
('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
('a', 'address', '', _('address to listen on (default: all interfaces)'), ('a', 'address', '', _('address to listen on (default: all interfaces)'),
_('ADDR')), _('ADDR')),
('', 'prefix', '', _('prefix path to serve from (default: server root)'), ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
_('PREFIX')), _('PREFIX')),
('n', 'name', '', ('n', 'name', '',

mercurial/hgweb/__init__.py

# hgweb/__init__.py - web interface to a mercurial repository # hgweb/__init__.py - web interface to a mercurial repository
# #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005 Matt Mackall <mpm@selenic.com> # Copyright 2005 Matt Mackall <mpm@selenic.com>
# #
# 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.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import webbrowser
from ..i18n import _ from ..i18n import _
from .. import ( from .. import (
error, error,
pycompat, pycompat,
) )
def init(self): def init(self):
procutil.setsignalhandler() procutil.setsignalhandler()
self.httpd = server.create_server(self.ui, self.app) self.httpd = server.create_server(self.ui, self.app)
if self.opts['port'] and not self.ui.verbose: if self.opts['port'] and not self.ui.verbose:
return return
bindaddr = self._getbindaddr()
if self.opts['port']:
write = self.ui.status
else:
write = self.ui.write
write(_('listening at %s (bound to %s:%d)\n') %
(self._geturl(), pycompat.sysbytes(bindaddr), self.httpd.port))
self.ui.flush() # avoid buffering of status message
def _getbindaddr(self):
bindaddr = self.httpd.addr
if bindaddr == r'0.0.0.0':
bindaddr = r'*'
elif r':' in bindaddr: # IPv6
bindaddr = r'[%s]' % bindaddr
return bindaddr
def _geturl(self):
if self.httpd.prefix: if self.httpd.prefix:
prefix = self.httpd.prefix.strip('/') + '/' prefix = self.httpd.prefix.strip('/') + '/'
else: else:
prefix = '' prefix = ''
port = r':%d' % self.httpd.port port = r':%d' % self.httpd.port
if port == r':80': if port == r':80':
port = r'' port = r''
bindaddr = self.httpd.addr bindaddr = self._getbindaddr()
if bindaddr == r'0.0.0.0':
bindaddr = r'*'
elif r':' in bindaddr: # IPv6
bindaddr = r'[%s]' % bindaddr
fqaddr = self.httpd.fqaddr fqaddr = self.httpd.fqaddr
if r':' in fqaddr: if r':' in fqaddr:
fqaddr = r'[%s]' % fqaddr fqaddr = r'[%s]' % fqaddr
if self.opts['port']:
write = self.ui.status return 'http://%s%s/%s' % (
else: pycompat.sysbytes(fqaddr), pycompat.sysbytes(port), prefix)
write = self.ui.write
write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
(pycompat.sysbytes(fqaddr), pycompat.sysbytes(port),
prefix, pycompat.sysbytes(bindaddr), self.httpd.port))
self.ui.flush() # avoid buffering of status message
def run(self): def run(self):
if self.opts.pop('gui', None):
webbrowser.open(self._geturl())
self.httpd.serve_forever() self.httpd.serve_forever()
def createapp(baseui, repo, webconf): def createapp(baseui, repo, webconf):
if webconf: if webconf:
return hgwebdir_mod.hgwebdir(webconf, baseui=baseui) return hgwebdir_mod.hgwebdir(webconf, baseui=baseui)
else: else:
if not repo: if not repo:
raise error.RepoError(_("there is no Mercurial repository" raise error.RepoError(_("there is no Mercurial repository"
" here (.hg not found)")) " here (.hg not found)"))
return hgweb_mod.hgweb(repo, baseui=baseui) return hgweb_mod.hgweb(repo, baseui=baseui)

tests/test-completion.t

export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
forget: interactive, include, exclude, dry-run forget: interactive, include, exclude, dry-run
init: ssh, remotecmd, insecure init: ssh, remotecmd, insecure
log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
merge: force, rev, preview, abort, tool merge: force, rev, preview, abort, tool
pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure
remove: after, force, subrepos, include, exclude, dry-run remove: after, force, subrepos, include, exclude, dry-run
serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, subrepos serve: accesslog, daemon, daemon-postexec, graphical, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, subrepos
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
summary: remote summary: remote
update: clean, check, merge, date, rev, tool update: clean, check, merge, date, rev, tool
addremove: similarity, subrepos, include, exclude, dry-run addremove: similarity, subrepos, include, exclude, dry-run
archive: no-decode, prefix, rev, type, subrepos, include, exclude archive: no-decode, prefix, rev, type, subrepos, include, exclude
backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
bisect: reset, good, bad, skip, extend, command, noupdate bisect: reset, good, bad, skip, extend, command, noupdate
bookmarks: force, rev, delete, rename, inactive, template bookmarks: force, rev, delete, rename, inactive, template