##// END OF EJS Templates
graft: introduce --base option for using custom base revision while merging...
graft: introduce --base option for using custom base revision while merging The graft command usually performs an internal merge of the current parent revision with the graft revision, using p1 of the grafted revision as base for the merge. As a trivial extension of this, we introduce the --base option to allow for using another base revision. This can be used as a building block for grafting and collapsing multiple changesets at once, or for grafting the resulting change from a merge as a single simple change. (This is kind of similar to backout --parent ... only different: this graft base must be an ancestor, but is usually *not* a parent.) This is probably an advanced use case, and we do thus not show it in the non-verbose help.

File last commit:

r39851:c31ce080 default
r40460:3c0d5016 default
Show More
factotum.py
151 lines | 4.8 KiB | text/x-python | PythonLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 # factotum.py - Plan 9 factotum integration for Mercurial
#
# Copyright (C) 2012 Steven Stallion <sstallion@gmail.com>
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
'''http authentication with factotum
Steven Stallion
factotum: add man reference to help output
r16582 This extension allows the factotum(4) facility on Plan 9 from Bell Labs
platforms to provide authentication information for HTTP access. Configuration
entries specified in the auth section as well as authentication information
provided in the repository URL are fully supported. If no prefix is specified,
a value of "*" will be assumed.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
By default, keys are specified as::
proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
If the factotum extension is unable to read the required key, one will be
requested interactively.
A configuration section is available to customize runtime behavior. By
default, these entries are::
[factotum]
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 executable = /bin/auth/factotum
mountpoint = /mnt/factotum
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 service = hg
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 The executable entry defines the full path to the factotum binary. The
mountpoint entry defines the path to the factotum file service. Lastly, the
service entry controls the service name used when reading keys.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
'''
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from __future__ import absolute_import
import os
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 from mercurial.i18n import _
Matt Harbison
py3: convert arguments, cwd and env to native strings when spawning subprocess...
r39851 from mercurial.utils import (
procutil,
)
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from mercurial import (
error,
httpconnection,
configitems: register the 'factotum.executable' config
r33238 registrar,
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 url,
util,
)
urlreq = util.urlreq
passwordmgr = url.passwordmgr
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
ERRMAX = 128
Yuya Nishihara
factotum: initialize global variables to suppress pyflakes warning
r21228 _executable = _mountpoint = _service = None
configitems: register the 'factotum.executable' config
r33238 configtable = {}
configitem = registrar.configitem(configtable)
configitem('factotum', 'executable',
default='/bin/auth/factotum',
)
configitems: register the 'factotum.mountpoint' config
r33239 configitem('factotum', 'mountpoint',
default='/mnt/factotum',
)
configitems: register the 'factotum.service' config
r33240 configitem('factotum', 'service',
default='hg',
)
configitems: register the 'factotum.executable' config
r33238
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def auth_getkey(self, params):
if not self.ui.interactive():
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('factotum not interactive'))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if 'user=' not in params:
params = '%s user?' % params
params = '%s !password?' % params
Matt Harbison
py3: convert arguments, cwd and env to native strings when spawning subprocess...
r39851 os.system(procutil.tonativestr("%s -g '%s'" % (_executable, params)))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
def auth_getuserpasswd(self, getkey, params):
params = 'proto=pass %s' % params
while True:
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 fd = os.open('%s/rpc' % _mountpoint, os.O_RDWR)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 try:
Matt Mackall
factotum: use try/except/finally
r25078 os.write(fd, 'start %s' % params)
l = os.read(fd, ERRMAX).split()
if l[0] == 'ok':
os.write(fd, 'read')
status, user, passwd = os.read(fd, ERRMAX).split(None, 2)
if status == 'ok':
if passwd.startswith("'"):
if passwd.endswith("'"):
passwd = passwd[1:-1].replace("''", "'")
else:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('malformed password string'))
Matt Mackall
factotum: use try/except/finally
r25078 return (user, passwd)
except (OSError, IOError):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('factotum not responding'))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 finally:
os.close(fd)
getkey(self, params)
def monkeypatch_method(cls):
def decorator(func):
setattr(cls, func.__name__, func)
return func
return decorator
@monkeypatch_method(passwordmgr)
def find_user_password(self, realm, authuri):
liscju
url: extract password database from password manager...
r29377 user, passwd = self.passwddb.find_user_password(realm, authuri)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if user and passwd:
self._writedebug(user, passwd)
return (user, passwd)
prefix = ''
res = httpconnection.readauthforuri(self.ui, authuri, user)
if res:
_, auth = res
prefix = auth.get('prefix')
user, passwd = auth.get('username'), auth.get('password')
if not user or not passwd:
if not prefix:
Jeff Sickel
factotum: clean up keychain for multiple hg repository authentication
r19614 prefix = realm.split(' ')[0].lower()
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 params = 'service=%s prefix=%s' % (_service, prefix)
if user:
params = '%s user=%s' % (params, user)
user, passwd = auth_getuserpasswd(self, auth_getkey, params)
self.add_password(realm, authuri, user, passwd)
self._writedebug(user, passwd)
return (user, passwd)
def uisetup(ui):
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _executable
configitems: register the 'factotum.executable' config
r33238 _executable = ui.config('factotum', 'executable')
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _mountpoint
configitems: register the 'factotum.mountpoint' config
r33239 _mountpoint = ui.config('factotum', 'mountpoint')
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 global _service
configitems: register the 'factotum.service' config
r33240 _service = ui.config('factotum', 'service')