Mercurial > hg > mercurial-crew-with-dirclash
view contrib/hg-relink @ 4865:439e2f2fde42
Fix inconsistency for the stream_out capability in hgweb
During some experiments of mine, the uncompressed cloning could not
be enabled for hgweb.cgi nor hgwebdir.cgi though the server claimed
to be stream_out capable.
The only solution was to enable it using the user's .hgrc file.
This solution is not acceptable when publishing the repos through
an HTTP server because the CGI runs as a www dedicated user whose's
home hgrc file may not be accessible to users publishing their repos
through their userdir.
For such cases we could end up with this typical debug output:
hg --debug clone --uncompressed http://server/hg/project
destination directory: project
sending capabilities command
capabilities: lookup changegroupsubset stream=1
unbundle=HG10GZ,HG10BZ,HG10UN
sending stream_out command
abort: operation forbidden by server
The error lies in the fact the hgweb object defines new accessors
to the repo configuration that trust things by default (untrusted=True)
but the streamclone:stream_out function uses the usual accessors to the
repo.ui object, which do not trust by default (untrusted=False)
Fix this inconsistency, adding a new parameter to the stream_out function.
hgweb then forces a "trust by default" behavior.
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sat, 12 May 2007 00:41:30 +0200 |
parents | 29eb88bd5c8d |
children |
line wrap: on
line source
#!/usr/bin/env python # # Copyright (C) 2007 Brendan Cully <brendan@kublai.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. import os, sys class ConfigError(Exception): pass def usage(): print """relink <source> <destination> Recreate hard links between source and destination repositories""" class Config: def __init__(self, args): if len(args) != 3: raise ConfigError("wrong number of arguments") self.src = os.path.abspath(args[1]) self.dst = os.path.abspath(args[2]) for d in (self.src, self.dst): if not os.path.exists(os.path.join(d, '.hg')): raise ConfigError("%s: not a mercurial repository" % d) def collect(src): seplen = len(os.path.sep) candidates = [] for dirpath, dirnames, filenames in os.walk(src): relpath = dirpath[len(src) + seplen:] for filename in filenames: if not filename.endswith('.i'): continue st = os.stat(os.path.join(dirpath, filename)) candidates.append((os.path.join(relpath, filename), st)) return candidates def prune(candidates, dst): def getdatafile(path): if not path.endswith('.i'): return None, None df = path[:-1] + 'd' try: st = os.stat(df) except OSError: return None, None return df, st def linkfilter(dst, st): try: ts = os.stat(dst) except OSError: # Destination doesn't have this file? return False if st.st_ino == ts.st_ino: return False if st.st_dev != ts.st_dev: # No point in continuing raise Exception('Source and destination are on different devices') if st.st_size != ts.st_size: # TODO: compare revlog heads return False return st targets = [] for fn, st in candidates: tgt = os.path.join(dst, fn) ts = linkfilter(tgt, st) if not ts: continue targets.append((fn, ts.st_size)) df, ts = getdatafile(tgt) if df: targets.append((fn[:-1] + 'd', ts.st_size)) return targets def relink(src, dst, files): def relinkfile(src, dst): bak = dst + '.bak' os.rename(dst, bak) try: os.link(src, dst) except OSError: os.rename(bak, dst) raise os.remove(bak) CHUNKLEN = 65536 relinked = 0 savedbytes = 0 for f, sz in files: source = os.path.join(src, f) tgt = os.path.join(dst, f) sfp = file(source) dfp = file(tgt) sin = sfp.read(CHUNKLEN) while sin: din = dfp.read(CHUNKLEN) if sin != din: break sin = sfp.read(CHUNKLEN) if sin: continue try: relinkfile(source, tgt) print 'Relinked %s' % f relinked += 1 savedbytes += sz except OSError, inst: print '%s: %s' % (tgt, str(inst)) print 'Relinked %d files (%d bytes reclaimed)' % (relinked, savedbytes) try: cfg = Config(sys.argv) except ConfigError, inst: print str(inst) usage() sys.exit(1) src = os.path.join(cfg.src, '.hg') dst = os.path.join(cfg.dst, '.hg') candidates = collect(src) targets = prune(candidates, dst) relink(src, dst, targets)