Merge 7a1d6b228af6

Merge a41e4382ea6e

Remove usage of changectx The method has been removed in changeset 836867586b83 of Mercurial.

Use repo vfs to join the server log The method join on repo has been removed in changeset edb7f628ef8b of mercurial.

Set user as login name using a configuration index of the key path.

Log phase transitions (draft->public) Ensure phase transitions are logged in the mercurial-server.log file

Add support for phases This adds a "publish" permission level (between "init" and "write") required to be able to change the phase of a changeset from "draft" to "public". Update documentation accordingly. This is meant to be used for using the changeset evolution feature of mercurial, see http://evolution.experimentalworks.net/doc/

[test] add unit tests for ruleset We extract the rules building logic from readfile into a Ruleset.buildrules() method to ease testing.

Adding branch for phases

README.md edited online with Bitbucket

update README

Added tag release_1.3, debian_1.3-1 for changeset 660f5631013e

Don't use python-support's update-python-modules

Make it convenient to run the tests with new env vars in sudo

Remove no-longer-needed install of python-support

Tell dh to use python2

Add python to Build-depends

Update debian/changelog with Debian-specific compliance stuff

Use dh_python2 as per http://wiki.debian.org/Python/TransitionToDHPython2

Bump year in manual

Added a para warning that an hg account will be created, as suggested in email

Update year in README

Add Cygwin to NEWS and Tom to CREDITS

Merge in Tom's Windows work

No changes needed to comply with Standards-Version 3.9.3

Update the Debian changelog

Convert da.po to UTF-8

Add new translations

Allow the HOMEDIR and ETCDIR to be configurable via Makefile ENV. Add FreeBSD user creation support.

Fix windows issues that cropped up in the new install

Update windows guide and fix a couple of minor items in the Makefile

Initial notes and work towards a Windows install

Update NEWS

Documentation update - make it clear that you have to have an existing repo to clone - don't try to put the same key in different directories - explain the .mercurial-server file.

Move tag debian_1.2-1 to changeset 83de2f945bbe as per changeset 513de0130ac7

Added tag debian_1.2-1 for changeset 83de2f945bbe

Cherry-pick watch file changeset 83de2f945bbe

Cherry-pick changelog changeset f464756ab90f

Add a watch file

Bug closing changelog message

Bump the standards-version

Copy over CREDITS from default to avoid a patch

Disable dbuild_release and add TODO comments

Make dbuild_release call dbuild

Common dir for all files in orig.tar.gz

debian/rules should be executable

remember the Debian changelog too

Update NEWS and release checklists to reflect new way

Changes to the way we build means we need ignore less

Default to non-deb based test

Both upstream and debian are direct from local sources

Copy in and use environment vars to control test

Start work on single-headed way of doing things - merge debian into default

Merge default

Update year in README, add to release checklist

Lay groundwork for next release

Forgot to credit 1.9 fix

Bump standards version

Copy over CREDITS file from debian - entry there that was missing here

Added tag debian_1.2-1 for changeset 5259bc023d36

Update changelog

Merge default

Added tag release_1.2 for changeset 30d35aed0ae2

Update NEWS file

Fix white space

Merge default

Oops, test for the right attribute of json

Fix white space

Say something when all goes well.

Use old-style qinit for mercurial 1.0 compatibility

Make directory for cacheing .deb files if it doesn't exist

Demandimport fix for simplejson test

Replace 1.9 test with one that works with demandimport

Small fixup for that fix

Mercurial 1.9 compatibility

Allow mq clones

A failing test for mq

Further refactor, dispense with unnecessary method

Refactor ruleset.py so I can be more confident it's correct

Scan for all kinds of keys so we don't record one and get hung up on another

Copy pattern made no sense, brought into line

Fix error in rule matching: False overrides None even if later

Prefer import json over import simplejson

servelog: use simplejson and the % operator for python versions < 2.6 Both the json module and str format operator are new in version 2.6, so replace them with the simplejson module and the % operator, respectively.

Add release buildihng script

Added tag debian_1.1-1 for changeset 32dba1a70a54

Added tag release_1.1 for changeset 01eca64f77ab

Fix bug 604213

Reproduce bug 604123

Add Christian Perrier to CREDITS

Merge in NMU

Non-maintainer upload

Add pt_BR, vi translations

Change parts of test that need to be different for Debian

Merge in default

Break out all the stuff that needs to be different for Debian into separate files

Some improvements to the chroot test, try to make it work with Debian

Don't include dev stuff in sources; don't call pbuilder usually

Add crazy dbuild script

Use quilt; update sstandards version; fix dates; fix changelog

Update changelog

Merge default

Add docs changes to NEWS

Subrepo support

dev/chroot-test fixups

Merge in testing code

Move everything into subdirectory

Improve automated tests

Change rules to test the hard case

Change back to non-Debian testing, fix test to work around NULL problem

Test file access conditions - they don't work

Evil hack: make it so it instead uses the Debian package.

Runs a real live test of mercurial-server from beginning to end

More complete test - inhibit daemons, mount proc, add safety guard

Do something with unionfs - it works

Bump version number to 1.1; big documentation update; correct dates; add to NEWS and CREDITS.

New log file format based on JSON/YAML

Fix Debian bug #605584

Fix permissions of authorized_keys file for sshd StrictModes

That's where the pt file went

Merge translation heads

Add ru translation

Actually add pt.po

pt translation

Add translations

Add Waldemar Augustyn to CREDITS

Add section on logging, merge later sections

Spanish translation

Added tag debian_1.0.1-1 for changeset c7aca8658582

Update changelog

Merge in changes from upstream

Added tag release_1.0.1 for changeset 92cb6640a641

Document the white space change in hg-ssh

Version number is 1.0.1

Strip repo name in case of tortoiseHG

Clean up CREDITS

Tidy up file prologues; move credits to CREDITS

"Checker" class isn't doing any work, replace with function

Add changelog entry for translations

Add translations

Use wildcard in rule to match instructions

Handle maybe matches properly

Aargh, ConfigParser smashes case, breaking security

Added tag debian_1.0-1 for changeset 60c2d676a754

Added tag release_1.0 for changeset 8ce190faa5c2

Install NEWS

Add debconf translation support

Start of new changelog

New directory remote-hgrc.d

Merge in new upstream version

Merge changes into post-tag revision

More descriptive name for var describing path to stylesheets

Merge in XSL configurability change#

Fix configExists properly

Purge repositories if debconf says so.

Avoid suggestion that package is inert at install time

Bug 558387: ensure synopsis is a noun phrase

Switch to remote-hgrc.d

Another NEWS entry

Add NEWS file

make docbook stylesheet path changeable

Fix /home/paul if it's broken when we start

fix configExists test

Use ConfigParser istead of mercurial.config

Script docstring was full of lies - now up to date

Don't hardwire location of authorized_keys file

Use env section of config instead of handling only HGRCPATH

Rename paths.py ot config.py

Added tag debian_0.9-1 for changeset b6887a9b8792

Up to 0.9; new, clean changelog per skx's suggestions

Added tag release_0.9 for changeset fed42d3f5311

Bump up to 0.9

Add new Vcs-* fields

Add a non-functional watch file, per #debian-mentors/jackyf's recommendation

Merge in makefile changes, update to DESTDIR

Use DESTDIR instead of TOPDIR

Never access the net during xslt - recommended by jwilk@#debian-mentors

Add DocBook dependencies to build-depends

Add ${python:Depends} as recommended by jwilk on #debian-mentors

Added tag debian_0.8-1 for changeset 1e4050abb96e

Version bump to 0.8-1

Added tag release_0.8 for changeset 1ad9d5841a48

Bump to 0.8

HTML docs now have their own directory

Move html docs into their own directory

More lintian fixes, adding a doc-base

More lintian fixes

Accept backports of debhelper

Bump debhelper dependency since we use overrides

Use dh(1) for very short debian/rules.

Switch off by-hadn changelogging in favour of debhelper

Now with Lintian cleanness!

Merge in docs fixes

Remove all installation talk from docbook

Add PDF building to Makefile

Added tag debian_0.7 for changeset 95c9ab8e4bfc

Bump version number, fix control

Merge in changes from default

Added tag release_0.7 for changeset 243dd21d0dbc

Make this version 0.7 (by hand rather clunkily)

Don't copy etc files into /usr/share too

Don't copy etc files into /usr/share too

use dh_pysupport

Ignore debian files

merge in directory fix

Fix directory creation

Adapt Debian stuff to new build process

Add TOPDIR variable

Update README to cover using the makefile

Make the build target default

Kill install in favour of setup.py and Makefile

Ignore files in build directory

Need dot-mercurial-server file itself

Use .mercurial-sever file instead of hardcoding

Start work on fixing install to use html

remove precursors to Docbook manual

Remove stray apostrophe

Sam's machine is called saucer

Use shorter remote repo name

Use shorter name for clone example project

Use short meaningless hostnames

Use markup, not quote marks

Silly to use literal inside code

ssh:// is the start of a URI

Repository names are directories

replace generalities with specific examples

Improvements to access.conf documentation

cleanups to the security section

Improvements to how it works section

Improvements to file conditions section

Fixes to /etc/mercurial-server discussion

Move conditions next to rules

Simplify Pat story

tiny reword

programlisting also needs no initial blank lines

Merge

Remove blank lines before screen output

fix output that should read "repository-host"

Beef up the caution

There are only three decisions, honest

Remove cut/paste error in commands

Tweak security para

Move the cd up one section

Missed something in change to sam

Change the way we link to SSH tutorial

Let next para do the work of discussing what OS it runs on

Move basic access control to the start of access control

Assume they have SSH set up; talk about hgadmin first

don't write about alternatives; best done elsewhere.

move legalese to the bottom

Reword caution

Talk about remote-hgrc

Move how it works section later

Explain why we configure access twice

Forgot a filename tag

Call the other user "Sam"

Call the user jay rather than user, and use pat instead of other-user

Document file and branch conditions in Docbook

Huge update to docbook docs

Start work on a docbook manual

Fold in change from default

fix call to checkDots

Looks like the start of a working Debianization

get up to date

Remove no longer correct assertion about paths

where did that line break come from?

Documentation improvements

Fix a minor inaccuracy in the security docs

Less canonicalisation, use os.path to check for dotfiles

Don't mix exceptions and sys.exit based failures

Improve check on whether user supplied a command

Fixes, plus base64 what you don't trust

Much less strict about most things

Remove obsolete documentation

Fix remark in security documentation

Just use rstrip

Make sure purge extension is available if we're to use it

Link to new mercurial-server website in README

share not lib in docs

Don't know if I'm making progress here

Added tag release_0.6 for changeset 975fb921c3f3

Start work on Debianization

abolish that one last path

One last hardcoded path left dammit

Install documentation

remove duplication - don't know how that got there!

use share not lib

Don't try to create user if we're installing outside /

abolish "dest", use options.prefix directly

reword comment for clarity

Added tag release_0.5 for changeset 535502c18eaa

Give install real command line options

Move check for hg user where it belongs

Safety check must actually exit

Force install as root and allow path to change.

Move some docs out of the README to make it less daunting

License properly

Update README to reflect absence of wrappers

Rewrite install script in Python

abolish hg-ssh-wrapper

Replaced env vars with Python globals

Most of the way through abolishing env vars

Abolish wrapper around refresh-auth

give refreshauth.py a hook and call that in hgadmin hgrc

Move meat of do-refresh-auth into a module

do-refresh-auth now does all the work

All work now in hg-ssh

Move more into hg-ssh

Move more into hg-ssh

Starting to move stuff out of hg-ssh-wrapper

Add __init__.py

Put .py files into a directory of their own

Change intro to README and linewrap at column 75

Describe plan to abolish shell scripts and un-hard-wire paths

Ignore more

merged

Regularise one NL before EOF

Security of mercurial-server

Add link to source website

give logging module a more specific name

reference logging extension explicitly

re-wrap paras to be consistent; briefly document logging

Give log more appropriate name now it has pulls too

Log pulls too

Add push logging

small fix

Encapsulate change finding with backwards compatibility

Use the context API

update dates and copyright notices

New README

Don't use keyword arguments everywhere

Fix test for user existence

Introduced a bug in last hg-ssh change

Remove root user now we have new way

Add non-admin users to make it easier to get started

todispatch unnecessary

Don't just complain, fail

Fix from belinda.lawson@onair.aero

unite install scripts

New system. No breaking in, just putting files in /etc/mercurial-server

Add start of script for breaking in

fixes to installer

Change the name to mercurial-server

fix path references for break-in stuff

more actual file moves - forgot to tell hg

moved stuff into subdirectories

new break-in system

start to move towards things living where they should and new break-in system. Big change.

refresh-auth now takes ~/.ssh/authorized_keys as an argument, and it checks that it wrote it last time before rewriting it.

Convert PuTTY-style public keys automatically

update README to reflect new scripted installer

Installer to set things up automatically

Explain limitations of branch/file rule combination

properly name the rule parameter for user

fix changeset handling, remove broken debug statements

merge in branch support fixes

branch is local not member

simplify by allowing some params to be preset in rules

Add support for locking by branch, and document breaking in.

fixes following actual testing

Big change to support file conditions; format of hg-ssh-access.conf changed.

Started work on acl.py replacement - currently broken.

don't assume Python path for refresh-auth

minor changes to README and script

fix repo confusion in README per Matthias's comments

more README fixes

rewrote README

add newline to error message

wrap overlong lines

merge fixes

improve hg-ssh-wrapper, suggest HGRCPATH trick

syntax error

syntax error

disallow dots

move config out of Python files; don't make hg-ssh-wrapper a dotfile; update documentation.

make more robus and less crufty

added a README to describe how this works.

rename wrapper command

separate out executables and data