mercurial-scm/hg-stable: contrib/hg-ssh annotate

annotate contrib/hg-ssh @ 4531:b51a8138292a

Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sat, 09 Jun 2007 01:04:28 -0300
parents	9a5b778f7e2d
children	831ebc408ffb

rev	line source
1537 583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	1 #!/usr/bin/env python
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	2 #
1640 9a5b778f7e2d Added hint to hg-ssh that you can use shell pattern matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1537 diff changeset	3 # Copyright 2005, 2006 by Intevation GmbH <intevation@intevation.de>
1537 583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	4 # Author(s):
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	5 # Thomas Arendsen Hein <thomas@intevation.de>
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	6 #
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	7 # This software may be used and distributed according to the terms
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	8 # of the GNU General Public License, incorporated herein by reference.
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	9
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	10 """
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	11 hg-ssh - a wrapper for ssh access to a limited set of mercurial repos
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	12
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	13 To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8):
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	14 command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ...
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	15 (probably together with these other useful options:
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	16 no-port-forwarding,no-X11-forwarding,no-agent-forwarding)
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	17
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	18 This allows pull/push over ssh to to the repositories given as arguments.
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	19
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	20 If all your repositories are subdirectories of a common directory, you can
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	21 allow shorter paths with:
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	22 command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"
1640 9a5b778f7e2d Added hint to hg-ssh that you can use shell pattern matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1537 diff changeset	23
9a5b778f7e2d Added hint to hg-ssh that you can use shell pattern matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1537 diff changeset	24 You can use pattern matching of your normal shell, e.g.:
9a5b778f7e2d Added hint to hg-ssh that you can use shell pattern matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1537 diff changeset	25 command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}"
1537 583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	26 """
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	27
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	28 from mercurial import commands
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	29
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	30 import sys, os
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	31
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	32 cwd = os.getcwd()
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	33 allowed_paths = [os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	34 for path in sys.argv[1:]]
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	35 orig_cmd = os.getenv('SSH_ORIGINAL_COMMAND', '?')
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	36
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	37 if orig_cmd.startswith('hg -R ') and orig_cmd.endswith(' serve --stdio'):
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	38 path = orig_cmd[6:-14]
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	39 repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	40 if repo in allowed_paths:
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	41 commands.dispatch(['-R', repo, 'serve', '--stdio'])
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	42 else:
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	43 sys.stderr.write("Illegal repository %r\n" % repo)
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	44 sys.exit(-1)
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	45 else:
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	46 sys.stderr.write("Illegal command %r\n" % orig_cmd)
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	47 sys.exit(-1)
583b3696d24d Added hg-ssh - a wrapper for ssh access to a limited set of mercurial repos Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	48

Mercurial > public > mercurial-scm > hg-stable

annotate contrib/hg-ssh @ 4531:b51a8138292a