[tryton-debian-vcs] hgnested branch upstream created. cced3ae220e03517cc87f2200a8c70235375994c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:48:12 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/hgnested.git;a=commitdiff;h=cced3ae220e03517cc87f2200a8c70235375994c
commit cced3ae220e03517cc87f2200a8c70235375994c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 14:19:04 2013 +0100
Adding upstream version 0.6.
diff --git a/CHANGELOG b/CHANGELOG
index 464ebd6..d80b35b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.6 - 2012-12-29
+* Fix remote path on Windows
+* Port to mercurial 2.3
+* Drop support for mercurial 1.8
+
Version 0.5 - 2012-04-26
* Fix to not take root configuration as default
* Port to mercurial 1.9
diff --git a/PKG-INFO b/PKG-INFO
index 966a894..70358b6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: hgnested
-Version: 0.5
+Version: 0.6
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
@@ -18,6 +18,12 @@ Description: hgnested
repositories at once like pull, push etc. It allow also to fetch a complete
tree of repositories through ssh or http.
+ To enable the "hgnested" extension, create an entry for it in your hgrc, like
+ this::
+
+ [extensions]
+ hgnested =
+
See `hg help hgnested` for the complete list of commands.
To run the tests, do (run-tests.py comes from mercurial tests):
diff --git a/README b/README
index d3d85e8..ce4ab8f 100644
--- a/README
+++ b/README
@@ -9,6 +9,12 @@ The extension allow to apply common Mercurial commands to all the nested
repositories at once like pull, push etc. It allow also to fetch a complete
tree of repositories through ssh or http.
+To enable the "hgnested" extension, create an entry for it in your hgrc, like
+this::
+
+ [extensions]
+ hgnested =
+
See `hg help hgnested` for the complete list of commands.
To run the tests, do (run-tests.py comes from mercurial tests):
diff --git a/hgnested.egg-info/PKG-INFO b/hgnested.egg-info/PKG-INFO
index 966a894..70358b6 100644
--- a/hgnested.egg-info/PKG-INFO
+++ b/hgnested.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: hgnested
-Version: 0.5
+Version: 0.6
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
@@ -18,6 +18,12 @@ Description: hgnested
repositories at once like pull, push etc. It allow also to fetch a complete
tree of repositories through ssh or http.
+ To enable the "hgnested" extension, create an entry for it in your hgrc, like
+ this::
+
+ [extensions]
+ hgnested =
+
See `hg help hgnested` for the complete list of commands.
To run the tests, do (run-tests.py comes from mercurial tests):
diff --git a/hgnested.egg-info/requires.txt b/hgnested.egg-info/requires.txt
index 1bfbcb4..2683c26 100644
--- a/hgnested.egg-info/requires.txt
+++ b/hgnested.egg-info/requires.txt
@@ -1 +1 @@
-Mercurial >= 1.8.0
\ No newline at end of file
+Mercurial >= 1.9.0
\ No newline at end of file
diff --git a/hgnested/__init__.py b/hgnested/__init__.py
index 7958e07..5289435 100755
--- a/hgnested/__init__.py
+++ b/hgnested/__init__.py
@@ -10,24 +10,24 @@ import os
import time
from functools import partial
from mercurial import hg
-from mercurial import commands, localrepo, sshrepo, httprepo, hgweb
+from mercurial import commands, localrepo, hgweb
from mercurial import util
from mercurial import cmdutil
from mercurial import wireproto
from mercurial.error import CapabilityError
+from mercurial.scmutil import walkrepos
from mercurial.i18n import _
from mercurial.__version__ import version as mercurial_version
-try:
- test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 9]
-except ValueError:
- test = True
-if test:
- from mercurial.scmutil import walkrepos
+version = map(int, mercurial_version.split('.', 2)[:2])
+
+if version >= [2, 3]:
+ from mercurial import sshpeer, httppeer
else:
- from mercurial.util import walkrepos
+ from mercurial import sshrepo, httprepo
+ sshpeer, httppeer = None, None
-__version__ = '0.5'
+__version__ = '0.6'
_nested_cache = {}
_nested_refreshinterval = 20
@@ -86,29 +86,43 @@ localrepo.localrepository.nested = _localrepo_nested
@property
-def _sshrepo_nested(self):
+def _sshpeer_nested(self):
'''Return a list of nested repositories.'''
- if 'nested' not in self.capabilities:
+ if hasattr(self, 'capable'):
+ test = self.capable('nested')
+ else:
+ test = 'nested' in self.capabilities
+ if not test:
raise util.Abort(_("Remote repository doesn't support "
"the nested extension."))
if hasattr(self, '_call'):
return self._call('nested').splitlines()
return self.call('nested').splitlines()
-sshrepo.sshrepository.nested = _sshrepo_nested
+if sshpeer:
+ sshpeer.sshpeer.nested = _sshpeer_nested
+else:
+ sshrepo.sshrepository.nested = _sshpeer_nested
@property
-def _httprepo_nested(self):
+def _httppeer_nested(self):
'''Return a list of nested repositories.'''
- if 'nested' not in self.capabilities:
+ if hasattr(self, 'capable'):
+ test = self.capable('nested')
+ else:
+ test = 'nested' in self.capabilities
+ if not test:
raise util.Abort(_("Remote repository doesn't support "
"the nested extension."))
if hasattr(self, '_call'):
return self._call('nested').split()
return self.do_read('nested').split()
-httprepo.httprepository.nested = _httprepo_nested
+if httppeer:
+ httppeer.httppeer.nested = _httppeer_nested
+else:
+ httprepo.httprepository.nested = _httppeer_nested
_hgwebdir_refresh_parent = hgweb.hgwebdir_mod.hgwebdir.refresh
@@ -180,14 +194,24 @@ def nclone(ui, source, dest=None, **opts):
Look at the help of clone command for more informations.'''
origsource = ui.expandpath(source)
remotesource, remotebranch = hg.parseurl(origsource, opts.get('branch'))
- remoterepo = hg.repository(hg.remoteui(ui, opts), remotesource)
+ if hasattr(hg, 'peer'):
+ remoterepo = hg.peer(ui, opts, remotesource)
+ localrepo = remoterepo.local()
+ if localrepo:
+ remoterepo = localrepo
+ else:
+ remoterepo = hg.repository(hg.remoteui(ui, opts), remotesource)
if dest is None:
dest = hg.defaultdest(source)
ui.status(_("destination directory: %s\n") % dest)
for npath in remoterepo.nested:
if npath == '.':
npath = ''
- nsource = os.path.join(source, npath)
+ u = util.url(source)
+ if u.scheme:
+ nsource = '%s/%s' % (source, npath)
+ else:
+ nsource = os.path.join(source, npath)
ndest = os.path.join(dest, npath)
ui.status('[%s]\n' % os.path.normpath(
os.path.join(os.path.basename(dest),
diff --git a/setup.py b/setup.py
index 435aff3..ecba910 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup(name='hgnested',
- version='0.5',
+ version='0.6',
author='B2CK',
author_email='info at b2ck.com',
url="http://code.google.com/p/hgnested/",
@@ -29,6 +29,6 @@ setup(name='hgnested',
],
license='GPL-3',
install_requires=[
- 'Mercurial >= 1.8.0',
+ 'Mercurial >= 1.9.0',
],
)
commit e8f06152cbbcd9e57761cf6c68b9f3db9206533d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Apr 30 18:24:34 2012 +0200
Adding upstream version 0.5.
diff --git a/CHANGELOG b/CHANGELOG
index e4f43dc..464ebd6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.5 - 2012-04-26
+* Fix to not take root configuration as default
+* Port to mercurial 1.9
+* Improve ndiff
+
Version 0.4 - 2011-08-10
* Bug fixes (see mercurial logs for details)
* Add nincoming command
diff --git a/COPYRIGHT b/COPYRIGHT
index a6f0645..efe2419 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Cédric Krier.
+Copyright (c) 2010-2012 Cédric Krier.
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
diff --git a/PKG-INFO b/PKG-INFO
index 55efc9d..966a894 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.4
+Version: 0.5
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
diff --git a/hgnested.egg-info/PKG-INFO b/hgnested.egg-info/PKG-INFO
index 55efc9d..966a894 100644
--- a/hgnested.egg-info/PKG-INFO
+++ b/hgnested.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.4
+Version: 0.5
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
diff --git a/hgnested.egg-info/requires.txt b/hgnested.egg-info/requires.txt
index a3607c6..1bfbcb4 100644
--- a/hgnested.egg-info/requires.txt
+++ b/hgnested.egg-info/requires.txt
@@ -1 +1 @@
-Mercurial >= 1.5.0
\ No newline at end of file
+Mercurial >= 1.8.0
\ No newline at end of file
diff --git a/hgnested/__init__.py b/hgnested/__init__.py
index b332f32..7958e07 100755
--- a/hgnested/__init__.py
+++ b/hgnested/__init__.py
@@ -8,53 +8,48 @@ It was inspired by the forest extension by Robin Farine.
'''
import os
import time
+from functools import partial
from mercurial import hg
-from mercurial import commands, localrepo, sshrepo, sshserver, httprepo, hgweb
-from mercurial import ui as _ui
+from mercurial import commands, localrepo, sshrepo, httprepo, hgweb
from mercurial import util
from mercurial import cmdutil
+from mercurial import wireproto
+from mercurial.error import CapabilityError
from mercurial.i18n import _
-from mercurial.hgweb.common import HTTP_OK
-from mercurial.hgweb.protocol import HGTYPE
from mercurial.__version__ import version as mercurial_version
try:
- test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 6]
+ test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 9]
except ValueError:
test = True
if test:
- from mercurial.hg import remoteui
+ from mercurial.scmutil import walkrepos
else:
- from mercurial.cmdutil import remoteui
-try:
- test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 7]
-except ValueError:
- test = True
-if test:
- from mercurial import wireproto
-else:
- wireproto = None
+ from mercurial.util import walkrepos
-__version__ = '0.4'
+__version__ = '0.5'
_nested_cache = {}
_nested_refreshinterval = 20
-if wireproto:
- _capabilities_parent = wireproto.capabilities
- def capabilities(repo, proto):
- caps = _capabilities_parent(repo, proto).split()
- caps.append('nested')
- return ' '.join(caps)
- wireproto.capabilities = capabilities
- wireproto.commands['capabilities'] = ((capabilities,) +
- wireproto.commands['capabilities'][1:])
+_capabilities_parent = wireproto.capabilities
+
+
+def capabilities(repo, proto):
+ caps = _capabilities_parent(repo, proto).split()
+ caps.append('nested')
+ return ' '.join(caps)
+wireproto.capabilities = capabilities
+wireproto.commands['capabilities'] = ((capabilities,) +
+ wireproto.commands['capabilities'][1:])
- def nested(repo, proto):
- '''Return a list of nested repositories.'''
- return "\n".join(repo.nested)
- wireproto.commands['nested'] = (nested, '')
+def nested(repo, proto):
+ '''Return a list of nested repositories.'''
+ return "\n".join(repo.nested)
+
+wireproto.commands['nested'] = (nested, '')
+
@property
def _localrepo_nested(self):
@@ -89,6 +84,7 @@ def _localrepo_nested(self):
localrepo.localrepository.nested = _localrepo_nested
+
@property
def _sshrepo_nested(self):
'''Return a list of nested repositories.'''
@@ -101,14 +97,6 @@ def _sshrepo_nested(self):
sshrepo.sshrepository.nested = _sshrepo_nested
-if not wireproto:
- sshserver.sshserver.caps.append('nested')
-
- def _sshserver_do_nested(self):
- '''Return a list of nested repositories.'''
- self.respond("\n".join(self.repo.nested))
-
- sshserver.sshserver.do_nested = _sshserver_do_nested
@property
def _httprepo_nested(self):
@@ -122,27 +110,17 @@ def _httprepo_nested(self):
httprepo.httprepository.nested = _httprepo_nested
-if not wireproto:
- hgweb.protocol.basecaps.append('nested')
-
- def _hgweb_nested(repo, req):
- '''Return a list of nested repositories.'''
- rsp = ' '.join(repo.nested)
- req.respond(HTTP_OK, HGTYPE, length=len(rsp))
- yield rsp
-
- hgweb.protocol.nested = _hgweb_nested
- hgweb.protocol.__all__.append('nested')
_hgwebdir_refresh_parent = hgweb.hgwebdir_mod.hgwebdir.refresh
+
def _hgwebdir_refresh(self):
if self.lastrefresh + self.refreshinterval > time.time():
return
_hgwebdir_refresh_parent(self)
for prefix, root in self.ui.configitems('collections'):
prefix = util.pconvert(prefix)
- for path in util.walkrepos(root, followsym=True):
+ for path in walkrepos(root, followsym=True):
repo = hg.repository(self.ui, path)
for npath in repo.nested:
npath = os.path.normpath(os.path.join(path, npath))
@@ -156,6 +134,7 @@ def _hgwebdir_refresh(self):
hgweb.hgwebdir_mod.hgwebdir.refresh = _hgwebdir_refresh
+
def _nested_apply(ui, repo, function, status, *args, **kwargs):
'Apply function to all nested repositories'
for npath in repo.nested:
@@ -164,22 +143,34 @@ def _nested_apply(ui, repo, function, status, *args, **kwargs):
lui = ui
else:
lpath = os.path.join(repo.root, npath)
- lui = ui.copy()
+ lui = ui.__class__()
lui.readconfig(os.path.join(lpath, '.hg', 'hgrc'))
nrepo = hg.repository(lui, lpath)
+ if function is _nested_diff:
+ kwargs['prefix'] = npath
if status:
lui.status('[%s]\n' % npath)
function(lui, nrepo, *args, **kwargs)
if status:
lui.status('\n')
+
+def _nested_diff(ui, repo, *pats, **opts):
+ diffordiffstat = cmdutil.diffordiffstat
+ cmdutil.diffordiffstat = partial(diffordiffstat,
+ prefix=opts.get('prefix') or '')
+ commands.diff(ui, repo, *pats, **opts)
+ cmdutil.diffordiffstat = diffordiffstat
+
+
def ndiff(ui, repo, *pats, **opts):
'''diff nested repositories (or selected files)
Show differences between revisions for the specified files.
Look at the help of diff command for more informations.'''
- _nested_apply(ui, repo, commands.diff, False, *pats, **opts)
+ _nested_apply(ui, repo, _nested_diff, False, *pats, **opts)
+
def nclone(ui, source, dest=None, **opts):
'''make a copy of an existing repository and all nested repositories
@@ -189,7 +180,7 @@ def nclone(ui, source, dest=None, **opts):
Look at the help of clone command for more informations.'''
origsource = ui.expandpath(source)
remotesource, remotebranch = hg.parseurl(origsource, opts.get('branch'))
- remoterepo = hg.repository(remoteui(ui, opts), remotesource)
+ remoterepo = hg.repository(hg.remoteui(ui, opts), remotesource)
if dest is None:
dest = hg.defaultdest(source)
ui.status(_("destination directory: %s\n") % dest)
@@ -200,22 +191,25 @@ def nclone(ui, source, dest=None, **opts):
ndest = os.path.join(dest, npath)
ui.status('[%s]\n' % os.path.normpath(
os.path.join(os.path.basename(dest),
- ndest[len(dest)+ 1:])))
+ ndest[len(dest) + 1:])))
commands.clone(ui, nsource, dest=ndest, **opts)
ui.status('\n')
+
def nincoming(ui, repo, dest=None, **opts):
'''show changest not found in repository and all nested repositories
Look at the help of incoming command for more informations.'''
_nested_apply(ui, repo, commands.incoming, True, dest=dest, **opts)
+
def noutgoing(ui, repo, dest=None, **opts):
'''show changesest not found in the destination and all nested repositories
Look at the help of outgoing command for more informations.'''
_nested_apply(ui, repo, commands.outgoing, True, dest=dest, **opts)
+
def npull(ui, repo, source="default", **opts):
'''pull changes from the specified source and all nested repositories
@@ -225,13 +219,13 @@ def npull(ui, repo, source="default", **opts):
def test(ui, repo, source, **opts):
source, branches = hg.parseurl(ui.expandpath(source),
opts.get('branch'))
- other = hg.repository(remoteui(repo, opts), source)
+ other = hg.repository(hg.remoteui(repo, opts), source)
revs, checkout = hg.addbranchrevs(repo, other, branches,
opts.get('rev'))
if revs:
try:
- revs = [others.lookup(rev) for rev in revs]
- except error.CapabilityError:
+ revs = [other.lookup(rev) for rev in revs]
+ except CapabilityError:
err = _("Other repository doesn't support revision lookup, "
"so a rev cannot be specified.")
raise util.Abort(err)
@@ -241,6 +235,7 @@ def npull(ui, repo, source="default", **opts):
_nested_apply(ui, repo, test, False, source=source, **opts)
_nested_apply(ui, repo, commands.pull, True, source=source, **opts)
+
def npush(ui, repo, dest=None, **opts):
'''push changes to the specified destination and all nested repositories
@@ -252,12 +247,13 @@ def npush(ui, repo, dest=None, **opts):
dest, branches = hg.parseurl(dest, opts.get('branch'))
revs, checkout = hg.addbranchrevs(repo, repo, branches,
opts.get('rev'))
- other = hg.repository(remoteui(repo, opts), dest)
+ other = hg.repository(hg.remoteui(repo, opts), dest)
if revs:
- revs = [repo.lookup(rev) for rev in revs]
+ revs = [other.lookup(rev) for rev in revs]
_nested_apply(ui, repo, test, False, dest=dest, **opts)
_nested_apply(ui, repo, commands.push, True, dest=dest, **opts)
+
def nstatus(ui, repo, *pats, **opts):
'''show changed files in the working directory and all nested repositories
@@ -266,6 +262,7 @@ def nstatus(ui, repo, *pats, **opts):
Look at the help of status command for more informations.'''
_nested_apply(ui, repo, commands.status, True, *pats, **opts)
+
def nupdate(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
**opts):
'''update working directory and all nested repositories
diff --git a/setup.py b/setup.py
index 8a56a38..435aff3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,12 @@
import os
from setuptools import setup, find_packages
+
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup(name='hgnested',
- version='0.4',
+ version='0.5',
author='B2CK',
author_email='info at b2ck.com',
url="http://code.google.com/p/hgnested/",
@@ -28,6 +29,6 @@ setup(name='hgnested',
],
license='GPL-3',
install_requires=[
- 'Mercurial >= 1.5.0',
+ 'Mercurial >= 1.8.0',
],
)
diff --git a/test-hgnested b/test-hgnested
index 7178cbc..87f37d9 100755
--- a/test-hgnested
+++ b/test-hgnested
@@ -49,6 +49,9 @@ hg add --cwd toplevel/r f2
rm toplevel/r/r/f2
hg nstatus --cwd toplevel
+echo "# ndiff"
+hg ndiff --cwd toplevel --nodates
+
echo "# noutgoing"
echo "f3" > toplevel-clone/f3
echo "f3" > toplevel-clone/r/r/f3
@@ -56,7 +59,7 @@ echo "f3" > toplevel-clone/d/d/r/f3
hg commit --cwd toplevel-clone -A -m "add f3"
hg commit --cwd toplevel-clone/r/r -A -m "add f3"
hg commit --cwd toplevel-clone/d/d/r -A -m "add f3"
-hg noutgoing --cwd toplevel
+hg noutgoing --cwd toplevel-clone
echo "# npush"
hg npush --cwd toplevel-clone | sed -e "s,$HGTMP,\$HGTMP/,"
diff --git a/test-hgnested.out b/test-hgnested.out
index c410b84..28408d3 100644
--- a/test-hgnested.out
+++ b/test-hgnested.out
@@ -149,12 +149,56 @@ A f2
[r2]
+# ndiff
+diff -r 032a2c66592c r/f2
+--- /dev/null
++++ b/r/f2
+@@ -0,0 +1,1 @@
++f2
# noutgoing
adding f3
adding f3
adding f3
[.]
-abort: repository default-push not found!
+comparing with $TESTTMP/toplevel
+searching for changes
+changeset: 1:2e794a5d357a
+tag: tip
+user: test
+date: Thu Jan 01 00:00:00 1970 +0000
+summary: add f3
+
+
+[d/d/r]
+comparing with $TESTTMP/toplevel/d/d/r
+searching for changes
+changeset: 1:0dfff144d3ec
+tag: tip
+user: test
+date: Thu Jan 01 00:00:00 1970 +0000
+summary: add f3
+
+
+[r]
+comparing with $TESTTMP/toplevel/r
+searching for changes
+no changes found
+
+[r/r]
+comparing with $TESTTMP/toplevel/r/r
+searching for changes
+changeset: 2:f0c515605a0a
+tag: tip
+user: test
+date: Thu Jan 01 00:00:00 1970 +0000
+summary: add f3
+
+
+[r2]
+comparing with $TESTTMP/toplevel/r2
+searching for changes
+no changes found
+
# npush
[.]
pushing to $HGTMP//test-hgnested/toplevel
commit 1de71f4f1a88e7a6c5d6da8f36f31b04bb0e5845
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Aug 14 12:40:28 2011 +0200
Adding upstream version 0.4.
diff --git a/CHANGELOG b/CHANGELOG
index 41f5e02..e4f43dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 0.4 - 2011-08-10
+* Bug fixes (see mercurial logs for details)
+* Add nincoming command
+
Version 0.3 - 2011-02-27
* Port to mercurial 1.7
diff --git a/PKG-INFO b/PKG-INFO
index 53d0fac..55efc9d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.3
+Version: 0.4
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
diff --git a/hgnested.egg-info/PKG-INFO b/hgnested.egg-info/PKG-INFO
index 53d0fac..55efc9d 100644
--- a/hgnested.egg-info/PKG-INFO
+++ b/hgnested.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.3
+Version: 0.4
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
diff --git a/hgnested/__init__.py b/hgnested/__init__.py
index d02dc95..b332f32 100755
--- a/hgnested/__init__.py
+++ b/hgnested/__init__.py
@@ -17,16 +17,25 @@ from mercurial.i18n import _
from mercurial.hgweb.common import HTTP_OK
from mercurial.hgweb.protocol import HGTYPE
from mercurial.__version__ import version as mercurial_version
-if map(int, mercurial_version.split('.')) >= [1, 6]:
+
+try:
+ test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 6]
+except ValueError:
+ test = True
+if test:
from mercurial.hg import remoteui
else:
from mercurial.cmdutil import remoteui
-if map(int, mercurial_version.split('.')) >= [1, 7]:
+try:
+ test = map(int, mercurial_version.split('.', 2)[:2]) >= [1, 7]
+except ValueError:
+ test = True
+if test:
from mercurial import wireproto
else:
wireproto = None
-__version__ = '0.3'
+__version__ = '0.4'
_nested_cache = {}
_nested_refreshinterval = 20
@@ -195,6 +204,12 @@ def nclone(ui, source, dest=None, **opts):
commands.clone(ui, nsource, dest=ndest, **opts)
ui.status('\n')
+def nincoming(ui, repo, dest=None, **opts):
+ '''show changest not found in repository and all nested repositories
+
+ Look at the help of incoming command for more informations.'''
+ _nested_apply(ui, repo, commands.incoming, True, dest=dest, **opts)
+
def noutgoing(ui, repo, dest=None, **opts):
'''show changesest not found in the destination and all nested repositories
@@ -284,6 +299,9 @@ cmdtable = {
'^nclone': (nclone,
cmdutil.findcmd('clone', commands.table)[1][1],
_('[OPTION]... SOURCE [DEST]')),
+ 'nincoming|nin': (nincoming,
+ cmdutil.findcmd('incoming', commands.table)[1][1],
+ _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')),
'noutgoing|nout': (noutgoing,
cmdutil.findcmd('outgoing', commands.table)[1][1],
_('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
diff --git a/setup.py b/setup.py
index c858601..8a56a38 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup(name='hgnested',
- version='0.3',
+ version='0.4',
author='B2CK',
author_email='info at b2ck.com',
url="http://code.google.com/p/hgnested/",
diff --git a/test-hgnested b/test-hgnested
index b5f0dde..7178cbc 100755
--- a/test-hgnested
+++ b/test-hgnested
@@ -29,6 +29,9 @@ hg commit --cwd toplevel2 -A -m "init"
echo "# nclone"
hg nclone toplevel toplevel-clone
+echo "# nincoming"
+hg nincoming --cwd toplevel-clone
+
echo "# npull"
hg npull --cwd toplevel-clone | sed -e "s,$HGTMP,\$HGTMP/,"
echo "r/r/f2" > toplevel/r/r/f2
diff --git a/test-hgnested.out b/test-hgnested.out
index c844a9c..c410b84 100644
--- a/test-hgnested.out
+++ b/test-hgnested.out
@@ -27,6 +27,32 @@ updating to branch default
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+# nincoming
+[.]
+comparing with $TESTTMP/toplevel
+searching for changes
+no changes found
+
+[d/d/r]
+comparing with $TESTTMP/toplevel/d/d/r
+searching for changes
+no changes found
+
+[r]
+comparing with $TESTTMP/toplevel/r
+searching for changes
+no changes found
+
+[r/r]
+comparing with $TESTTMP/toplevel/r/r
+searching for changes
+no changes found
+
+[r2]
+comparing with $TESTTMP/toplevel/r2
+searching for changes
+no changes found
+
# npull
[.]
pulling from $HGTMP//test-hgnested/toplevel
commit 2105da8ccc00e34cfb7ac09157172aa844748472
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 27 13:15:16 2011 +0100
Adding upstream version 0.3.
diff --git a/CHANGELOG b/CHANGELOG
index 8007720..41f5e02 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 0.3 - 2011-02-27
+* Port to mercurial 1.7
+
Version 0.2 - 2010-09-05
* Bug fixes (see mercurial logs for details)
* Improve performance
diff --git a/COPYRIGHT b/COPYRIGHT
index 55c28fb..a6f0645 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (c) 2010 Cédric Krier.
+Copyright (c) 2010-2011 Cédric Krier.
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
diff --git a/PKG-INFO b/PKG-INFO
index 1a447fb..53d0fac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.2
+Version: 0.3
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
@@ -12,6 +12,14 @@ Description: hgnested
Mercurial extension to work with nested repositories.
+ It was inspired by the forest extension.
+
+ The extension allow to apply common Mercurial commands to all the nested
+ repositories at once like pull, push etc. It allow also to fetch a complete
+ tree of repositories through ssh or http.
+
+ See `hg help hgnested` for the complete list of commands.
+
To run the tests, do (run-tests.py comes from mercurial tests):
python run-tests.py test-hgnested
diff --git a/README b/README
index 2e89114..d3d85e8 100644
--- a/README
+++ b/README
@@ -3,6 +3,14 @@ hgnested
Mercurial extension to work with nested repositories.
+It was inspired by the forest extension.
+
+The extension allow to apply common Mercurial commands to all the nested
+repositories at once like pull, push etc. It allow also to fetch a complete
+tree of repositories through ssh or http.
+
+See `hg help hgnested` for the complete list of commands.
+
To run the tests, do (run-tests.py comes from mercurial tests):
python run-tests.py test-hgnested
diff --git a/hgnested.egg-info/PKG-INFO b/hgnested.egg-info/PKG-INFO
index 1a447fb..53d0fac 100644
--- a/hgnested.egg-info/PKG-INFO
+++ b/hgnested.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: hgnested
-Version: 0.2
+Version: 0.3
Summary: Mercurial extension to work with nested repositories
Home-page: http://code.google.com/p/hgnested/
Author: B2CK
@@ -12,6 +12,14 @@ Description: hgnested
Mercurial extension to work with nested repositories.
+ It was inspired by the forest extension.
+
+ The extension allow to apply common Mercurial commands to all the nested
+ repositories at once like pull, push etc. It allow also to fetch a complete
+ tree of repositories through ssh or http.
+
+ See `hg help hgnested` for the complete list of commands.
+
To run the tests, do (run-tests.py comes from mercurial tests):
python run-tests.py test-hgnested
diff --git a/hgnested/__init__.py b/hgnested/__init__.py
index 11f5dda..d02dc95 100755
--- a/hgnested/__init__.py
+++ b/hgnested/__init__.py
@@ -17,16 +17,36 @@ from mercurial.i18n import _
from mercurial.hgweb.common import HTTP_OK
from mercurial.hgweb.protocol import HGTYPE
from mercurial.__version__ import version as mercurial_version
-if mercurial_version >= '1.6':
+if map(int, mercurial_version.split('.')) >= [1, 6]:
from mercurial.hg import remoteui
else:
from mercurial.cmdutil import remoteui
+if map(int, mercurial_version.split('.')) >= [1, 7]:
+ from mercurial import wireproto
+else:
+ wireproto = None
-__version__ = '0.2'
+__version__ = '0.3'
_nested_cache = {}
_nested_refreshinterval = 20
+if wireproto:
+ _capabilities_parent = wireproto.capabilities
+ def capabilities(repo, proto):
+ caps = _capabilities_parent(repo, proto).split()
+ caps.append('nested')
+ return ' '.join(caps)
+ wireproto.capabilities = capabilities
+ wireproto.commands['capabilities'] = ((capabilities,) +
+ wireproto.commands['capabilities'][1:])
+
+ def nested(repo, proto):
+ '''Return a list of nested repositories.'''
+ return "\n".join(repo.nested)
+
+ wireproto.commands['nested'] = (nested, '')
+
@property
def _localrepo_nested(self):
'''Return a list of nested repositories.'''
@@ -66,17 +86,20 @@ def _sshrepo_nested(self):
if 'nested' not in self.capabilities:
raise util.Abort(_("Remote repository doesn't support "
"the nested extension."))
+ if hasattr(self, '_call'):
+ return self._call('nested').splitlines()
return self.call('nested').splitlines()
sshrepo.sshrepository.nested = _sshrepo_nested
-sshserver.sshserver.caps.append('nested')
+if not wireproto:
+ sshserver.sshserver.caps.append('nested')
-def _sshserver_do_nested(self):
- '''Return a list of nested repositories.'''
- self.respond("\n".join(self.repo.nested))
+ def _sshserver_do_nested(self):
+ '''Return a list of nested repositories.'''
+ self.respond("\n".join(self.repo.nested))
-sshserver.sshserver.do_nested = _sshserver_do_nested
+ sshserver.sshserver.do_nested = _sshserver_do_nested
@property
def _httprepo_nested(self):
@@ -84,20 +107,23 @@ def _httprepo_nested(self):
if 'nested' not in self.capabilities:
raise util.Abort(_("Remote repository doesn't support "
"the nested extension."))
+ if hasattr(self, '_call'):
+ return self._call('nested').split()
return self.do_read('nested').split()
httprepo.httprepository.nested = _httprepo_nested
-hgweb.protocol.basecaps.append('nested')
+if not wireproto:
+ hgweb.protocol.basecaps.append('nested')
-def _hgweb_nested(repo, req):
- '''Return a list of nested repositories.'''
- rsp = ' '.join(repo.nested)
- req.respond(HTTP_OK, HGTYPE, length=len(rsp))
- yield rsp
+ def _hgweb_nested(repo, req):
+ '''Return a list of nested repositories.'''
+ rsp = ' '.join(repo.nested)
+ req.respond(HTTP_OK, HGTYPE, length=len(rsp))
+ yield rsp
-hgweb.protocol.nested = _hgweb_nested
-hgweb.protocol.__all__.append('nested')
+ hgweb.protocol.nested = _hgweb_nested
+ hgweb.protocol.__all__.append('nested')
_hgwebdir_refresh_parent = hgweb.hgwebdir_mod.hgwebdir.refresh
diff --git a/setup.py b/setup.py
index df20b21..c858601 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup(name='hgnested',
- version='0.2',
+ version='0.3',
author='B2CK',
author_email='info at b2ck.com',
url="http://code.google.com/p/hgnested/",
commit 02ec3a2e5ff30d3b58f1dd21a37e3f6f7cd4187c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 31 23:58:27 2010 +0100
Adding upstream version 0.2.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..8007720
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,7 @@
+Version 0.2 - 2010-09-05
+* Bug fixes (see mercurial logs for details)
+* Improve performance
+* Fix to work with hgwebdir
+
+Version 0.1 - 2010-09-01
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..55c28fb
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,14 @@
+Copyright (c) 2010 Cédric Krier.
+
+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 3 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, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..d9ba79a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,26 @@
+Installing hgnested
+===================
+
+Prerequisites
+-------------
+
+ * Python (http://www.python.org/)
+ * Mercurial (http://mercurial.selenic.com/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the hgnested source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..711535e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include LICENSE
+include COPYRIGHT
+include README
+include CHANGELOG
+include INSTALL
+include test-hgnested
+include test-hgnested.out
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..1a447fb
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: hgnested
+Version: 0.2
+Summary: Mercurial extension to work with nested repositories
+Home-page: http://code.google.com/p/hgnested/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://code.google.com/p/hgnested/downloads/
+Description: hgnested
+ ========
+
+ Mercurial extension to work with nested repositories.
+
+ To run the tests, do (run-tests.py comes from mercurial tests):
+
+ python run-tests.py test-hgnested
+
+
+ For more information please visit the `hgnested website`_.
+
+ .. _hgnested website: http://code.google.com/p/hgnested/
+
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Version Control
diff --git a/README b/README
new file mode 100644
index 0000000..2e89114
--- /dev/null
+++ b/README
@@ -0,0 +1,13 @@
+hgnested
+========
+
+Mercurial extension to work with nested repositories.
+
+To run the tests, do (run-tests.py comes from mercurial tests):
+
+ python run-tests.py test-hgnested
+
+
+For more information please visit the `hgnested website`_.
+
+.. _hgnested website: http://code.google.com/p/hgnested/
diff --git a/hgnested.egg-info/PKG-INFO b/hgnested.egg-info/PKG-INFO
new file mode 100644
index 0000000..1a447fb
--- /dev/null
+++ b/hgnested.egg-info/PKG-INFO
@@ -0,0 +1,31 @@
+Metadata-Version: 1.0
+Name: hgnested
+Version: 0.2
+Summary: Mercurial extension to work with nested repositories
+Home-page: http://code.google.com/p/hgnested/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://code.google.com/p/hgnested/downloads/
+Description: hgnested
+ ========
+
+ Mercurial extension to work with nested repositories.
+
+ To run the tests, do (run-tests.py comes from mercurial tests):
+
+ python run-tests.py test-hgnested
+
+
+ For more information please visit the `hgnested website`_.
+
+ .. _hgnested website: http://code.google.com/p/hgnested/
+
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Version Control
diff --git a/hgnested.egg-info/SOURCES.txt b/hgnested.egg-info/SOURCES.txt
new file mode 100644
index 0000000..28b7640
--- /dev/null
+++ b/hgnested.egg-info/SOURCES.txt
@@ -0,0 +1,15 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+setup.py
+test-hgnested
+test-hgnested.out
+hgnested/__init__.py
+hgnested.egg-info/PKG-INFO
+hgnested.egg-info/SOURCES.txt
+hgnested.egg-info/dependency_links.txt
+hgnested.egg-info/requires.txt
+hgnested.egg-info/top_level.txt
\ No newline at end of file
diff --git a/hgnested.egg-info/dependency_links.txt b/hgnested.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/hgnested.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/hgnested.egg-info/requires.txt b/hgnested.egg-info/requires.txt
new file mode 100644
index 0000000..a3607c6
--- /dev/null
+++ b/hgnested.egg-info/requires.txt
@@ -0,0 +1 @@
+Mercurial >= 1.5.0
\ No newline at end of file
diff --git a/hgnested.egg-info/top_level.txt b/hgnested.egg-info/top_level.txt
new file mode 100644
index 0000000..5a6c45c
--- /dev/null
+++ b/hgnested.egg-info/top_level.txt
@@ -0,0 +1 @@
+hgnested
diff --git a/hgnested/__init__.py b/hgnested/__init__.py
new file mode 100755
index 0000000..11f5dda
--- /dev/null
+++ b/hgnested/__init__.py
@@ -0,0 +1,277 @@
+#This file is part of hgnested. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+'''commands to manage nested repositories.
+
+This extension provides commands that apply to all the nested repositories.
+
+It was inspired by the forest extension by Robin Farine.
+'''
+import os
+import time
+from mercurial import hg
+from mercurial import commands, localrepo, sshrepo, sshserver, httprepo, hgweb
+from mercurial import ui as _ui
+from mercurial import util
+from mercurial import cmdutil
+from mercurial.i18n import _
+from mercurial.hgweb.common import HTTP_OK
+from mercurial.hgweb.protocol import HGTYPE
+from mercurial.__version__ import version as mercurial_version
+if mercurial_version >= '1.6':
+ from mercurial.hg import remoteui
+else:
+ from mercurial.cmdutil import remoteui
+
+__version__ = '0.2'
+
+_nested_cache = {}
+_nested_refreshinterval = 20
+
+ at property
+def _localrepo_nested(self):
+ '''Return a list of nested repositories.'''
+ cache = _nested_cache.setdefault(self.root, {
+ 'lastrefresh': 0,
+ 'nested': None,
+ })
+ if cache['lastrefresh'] + _nested_refreshinterval > time.time():
+ return cache['nested']
+ res = {}
+ paths = [self.root]
+ while paths:
+ path = paths.pop()
+ if os.path.realpath(path) in res:
+ continue
+ for root, dirs, files in os.walk(path):
+ for dir in dirs[:]:
+ if dir == '.hg':
+ res[os.path.realpath(root)] = os.path.abspath(root)
+ else:
+ path = os.path.join(root, dir)
+ if (os.path.islink(path)
+ and os.path.realpath(path) not in res):
+ paths.append(path)
+ prefix = len(self.root) + 1
+ res = [x[prefix:] or '.' for x in res.itervalues()]
+ res.sort()
+ cache['nested'] = res
+ cache['lastrefresh'] = time.time()
+ return res
+
+localrepo.localrepository.nested = _localrepo_nested
+
+ at property
+def _sshrepo_nested(self):
+ '''Return a list of nested repositories.'''
+ if 'nested' not in self.capabilities:
+ raise util.Abort(_("Remote repository doesn't support "
+ "the nested extension."))
+ return self.call('nested').splitlines()
+
+sshrepo.sshrepository.nested = _sshrepo_nested
+
+sshserver.sshserver.caps.append('nested')
+
+def _sshserver_do_nested(self):
+ '''Return a list of nested repositories.'''
+ self.respond("\n".join(self.repo.nested))
+
+sshserver.sshserver.do_nested = _sshserver_do_nested
+
+ at property
+def _httprepo_nested(self):
+ '''Return a list of nested repositories.'''
+ if 'nested' not in self.capabilities:
+ raise util.Abort(_("Remote repository doesn't support "
+ "the nested extension."))
+ return self.do_read('nested').split()
+
+httprepo.httprepository.nested = _httprepo_nested
+
+hgweb.protocol.basecaps.append('nested')
+
+def _hgweb_nested(repo, req):
+ '''Return a list of nested repositories.'''
+ rsp = ' '.join(repo.nested)
+ req.respond(HTTP_OK, HGTYPE, length=len(rsp))
+ yield rsp
+
+hgweb.protocol.nested = _hgweb_nested
+hgweb.protocol.__all__.append('nested')
+
+_hgwebdir_refresh_parent = hgweb.hgwebdir_mod.hgwebdir.refresh
+
+def _hgwebdir_refresh(self):
+ if self.lastrefresh + self.refreshinterval > time.time():
+ return
+ _hgwebdir_refresh_parent(self)
+ for prefix, root in self.ui.configitems('collections'):
+ prefix = util.pconvert(prefix)
+ for path in util.walkrepos(root, followsym=True):
+ repo = hg.repository(self.ui, path)
+ for npath in repo.nested:
+ npath = os.path.normpath(os.path.join(path, npath))
+ name = util.pconvert(npath)
+ if name.startswith(prefix):
+ name = name[len(prefix):]
+ repo = (name.lstrip('/'), npath)
+ if repo not in self.repos:
+ self.repos.append(repo)
+ self.lastrefresh = time.time()
+
+hgweb.hgwebdir_mod.hgwebdir.refresh = _hgwebdir_refresh
+
+def _nested_apply(ui, repo, function, status, *args, **kwargs):
+ 'Apply function to all nested repositories'
+ for npath in repo.nested:
+ if npath == '.':
+ nrepo = repo
+ lui = ui
+ else:
+ lpath = os.path.join(repo.root, npath)
+ lui = ui.copy()
+ lui.readconfig(os.path.join(lpath, '.hg', 'hgrc'))
+ nrepo = hg.repository(lui, lpath)
+ if status:
+ lui.status('[%s]\n' % npath)
+ function(lui, nrepo, *args, **kwargs)
+ if status:
+ lui.status('\n')
+
+def ndiff(ui, repo, *pats, **opts):
+ '''diff nested repositories (or selected files)
+
+ Show differences between revisions for the specified files.
+
+ Look at the help of diff command for more informations.'''
+ _nested_apply(ui, repo, commands.diff, False, *pats, **opts)
+
+def nclone(ui, source, dest=None, **opts):
+ '''make a copy of an existing repository and all nested repositories
+
+ Create a copy of an existing repository in a new directory.
+
+ Look at the help of clone command for more informations.'''
+ origsource = ui.expandpath(source)
+ remotesource, remotebranch = hg.parseurl(origsource, opts.get('branch'))
+ remoterepo = hg.repository(remoteui(ui, opts), remotesource)
+ if dest is None:
+ dest = hg.defaultdest(source)
+ ui.status(_("destination directory: %s\n") % dest)
+ for npath in remoterepo.nested:
+ if npath == '.':
+ npath = ''
+ nsource = os.path.join(source, npath)
+ ndest = os.path.join(dest, npath)
+ ui.status('[%s]\n' % os.path.normpath(
+ os.path.join(os.path.basename(dest),
+ ndest[len(dest)+ 1:])))
+ commands.clone(ui, nsource, dest=ndest, **opts)
+ ui.status('\n')
+
+def noutgoing(ui, repo, dest=None, **opts):
+ '''show changesest not found in the destination and all nested repositories
+
+ Look at the help of outgoing command for more informations.'''
+ _nested_apply(ui, repo, commands.outgoing, True, dest=dest, **opts)
+
+def npull(ui, repo, source="default", **opts):
+ '''pull changes from the specified source and all nested repositories
+
+ Pull changes from a remote repository to a local one.
+
+ Look at the help of pull command for more informations.'''
+ def test(ui, repo, source, **opts):
+ source, branches = hg.parseurl(ui.expandpath(source),
+ opts.get('branch'))
+ other = hg.repository(remoteui(repo, opts), source)
+ revs, checkout = hg.addbranchrevs(repo, other, branches,
+ opts.get('rev'))
+ if revs:
+ try:
+ revs = [others.lookup(rev) for rev in revs]
+ except error.CapabilityError:
+ err = _("Other repository doesn't support revision lookup, "
+ "so a rev cannot be specified.")
+ raise util.Abort(err)
+ if (source != 'default'
+ or opts.get('branch')
+ or opts.get('rev')):
+ _nested_apply(ui, repo, test, False, source=source, **opts)
+ _nested_apply(ui, repo, commands.pull, True, source=source, **opts)
+
+def npush(ui, repo, dest=None, **opts):
+ '''push changes to the specified destination and all nested repositories
+
+ Push changes from the local repository to the specified destination.
+
+ Look at the help of status command for more informations.'''
+ def test(ui, repo, dest=None, **opts):
+ dest = ui.expandpath(dest or 'default-push', dest or 'default')
+ dest, branches = hg.parseurl(dest, opts.get('branch'))
+ revs, checkout = hg.addbranchrevs(repo, repo, branches,
+ opts.get('rev'))
+ other = hg.repository(remoteui(repo, opts), dest)
+ if revs:
+ revs = [repo.lookup(rev) for rev in revs]
+ _nested_apply(ui, repo, test, False, dest=dest, **opts)
+ _nested_apply(ui, repo, commands.push, True, dest=dest, **opts)
+
+def nstatus(ui, repo, *pats, **opts):
+ '''show changed files in the working directory and all nested repositories
+
+ Show status of files in the repository.
+
+ Look at the help of status command for more informations.'''
+ _nested_apply(ui, repo, commands.status, True, *pats, **opts)
+
+def nupdate(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
+ **opts):
+ '''update working directory and all nested repositories
+
+ Update the repository's working directory to the specified changeset.
+
+ Look at the help of update command for more informations.'''
+ def test(ui, repo, node=None, rev=None, date=None, check=False):
+ if rev and node:
+ raise util.Abort(_("please specify just one revision"))
+
+ if not rev:
+ rev = node
+
+ if check:
+ c = repo[None]
+ if c.modified() or c.added() or c.removed():
+ raise util.Abort(_("uncommitted local changes"))
+
+ if date:
+ rev = cmdutil.finddate(ui, repo, date)
+ _nested_apply(ui, repo, test, False, node=node, rev=rev, date=date,
+ check=check)
+ _nested_apply(ui, repo, commands.update, True, node=node, rev=rev,
+ clean=clean, date=date, check=check)
+
+cmdtable = {
+ '^ndiff': (ndiff,
+ cmdutil.findcmd('diff', commands.table)[1][1],
+ _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
+ '^nclone': (nclone,
+ cmdutil.findcmd('clone', commands.table)[1][1],
+ _('[OPTION]... SOURCE [DEST]')),
+ 'noutgoing|nout': (noutgoing,
+ cmdutil.findcmd('outgoing', commands.table)[1][1],
+ _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
+ 'npull': (npull,
+ cmdutil.findcmd('pull', commands.table)[1][1],
+ _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
+ '^npush': (npush,
+ cmdutil.findcmd('push', commands.table)[1][1],
+ _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
+ '^nstatus|nst': (nstatus,
+ cmdutil.findcmd('status', commands.table)[1][1],
+ _('[OPTION]... [FILE]...')),
+ '^nupdate|nup': (nupdate,
+ cmdutil.findcmd('update', commands.table)[1][1],
+ _('[-c] [-C] [-d DATE] [[-r] REV]')),
+}
+commands.norepo += " nclone"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..df20b21
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+#This file is part of hgnested. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import os
+from setuptools import setup, find_packages
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+setup(name='hgnested',
+ version='0.2',
+ author='B2CK',
+ author_email='info at b2ck.com',
+ url="http://code.google.com/p/hgnested/",
+ description="Mercurial extension to work with nested repositories",
+ long_description=read('README'),
+ download_url="http://code.google.com/p/hgnested/downloads/",
+ packages=find_packages(),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Software Development :: Version Control',
+ ],
+ license='GPL-3',
+ install_requires=[
+ 'Mercurial >= 1.5.0',
+ ],
+ )
diff --git a/test-hgnested b/test-hgnested
new file mode 100755
index 0000000..b5f0dde
--- /dev/null
+++ b/test-hgnested
@@ -0,0 +1,91 @@
+#! /bin/sh
+
+echo "[extensions]" >> $HGRCPATH
+echo "hgnested=" >> $HGRCPATH
+
+echo "# init repositories"
+hg init toplevel
+echo "f" > toplevel/f
+mkdir -p toplevel/d/d
+echo "d/d/f" > toplevel/d/d/f
+hg init toplevel/d/d/r
+echo "d/d/r/f" > toplevel/d/d/r/f
+hg init toplevel/r
+echo "r/f" > toplevel/r/f
+hg init toplevel/r/r
+echo "r/r/f" > toplevel/r/r/f
+hg init toplevel2
+echo "f" > toplevel2/f
+ln -s ${PWD}/toplevel2 toplevel/r2
+echo "syntax: glob" >>toplevel/.hgignore
+echo "r2" >>toplevel/.hgignore
+
+hg commit --cwd toplevel -A -m "init"
+hg commit --cwd toplevel/d/d/r -A -m "init"
+hg commit --cwd toplevel/r -A -m "init"
+hg commit --cwd toplevel/r/r -A -m "init"
+hg commit --cwd toplevel2 -A -m "init"
+
+echo "# nclone"
+hg nclone toplevel toplevel-clone
+
+echo "# npull"
+hg npull --cwd toplevel-clone | sed -e "s,$HGTMP,\$HGTMP/,"
+echo "r/r/f2" > toplevel/r/r/f2
+hg commit --cwd toplevel/r/r -A -m "add f2"
+hg npull --cwd toplevel-clone | sed -e "s,$HGTMP,\$HGTMP/,"
+
+echo "# nupdate"
+hg nupdate --cwd toplevel-clone
+
+echo "# nstatus"
+hg nstatus --cwd toplevel
+echo "f2" > toplevel/f2
+echo "f2" > toplevel/r/f2
+hg add --cwd toplevel/r f2
+rm toplevel/r/r/f2
+hg nstatus --cwd toplevel
+
+echo "# noutgoing"
+echo "f3" > toplevel-clone/f3
+echo "f3" > toplevel-clone/r/r/f3
+echo "f3" > toplevel-clone/d/d/r/f3
+hg commit --cwd toplevel-clone -A -m "add f3"
+hg commit --cwd toplevel-clone/r/r -A -m "add f3"
+hg commit --cwd toplevel-clone/d/d/r -A -m "add f3"
+hg noutgoing --cwd toplevel
+
+echo "# npush"
+hg npush --cwd toplevel-clone | sed -e "s,$HGTMP,\$HGTMP/,"
+
+echo "# nclone ssh"
+cat <<EOF > dummyssh
+import sys
+import os
+
+os.chdir(os.path.dirname(sys.argv[0]))
+if sys.argv[1] != "user at dummy":
+ sys.exit(-1)
+
+if not os.path.exists("dummyssh"):
+ sys.exit(-1)
+
+os.environ["SSH_CLIENT"] = "127.0.0.1 1 2"
+
+log = open("dummylog", "ab")
+log.write("Got arguments")
+for i, arg in enumerate(sys.argv[1:]):
+ log.write(" %d:%s" % (i+1, arg))
+log.write("\n")
+log.close()
+r = os.system(sys.argv[2])
+sys.exit(bool(r))
+EOF
+hg nclone -e "python ./dummyssh" ssh://user@dummy/toplevel toplevel-sshclone
+
+echo "# nclone http"
+echo "[collections]" >> toplevel.conf
+echo "${PWD} = ${PWD}" >> toplevel.conf
+hg serve -p $HGPORT -d --pid-file=hg1.pid --webdir-conf toplevel.conf
+cat hg1.pid >> $DAEMON_PIDS
+hg nclone http://localhost:$HGPORT/toplevel toplevel-httpclone 2>&1 | sed -e "s,:$HGPORT/,:\$HGPORT/,"
diff --git a/test-hgnested.out b/test-hgnested.out
new file mode 100644
index 0000000..c844a9c
--- /dev/null
+++ b/test-hgnested.out
@@ -0,0 +1,258 @@
+# init repositories
+adding .hgignore
+adding d/d/f
+adding f
+adding f
+adding f
+adding f
+adding f
+# nclone
+[toplevel-clone]
+updating to branch default
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-clone/d/d/r]
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-clone/r]
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-clone/r/r]
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-clone/r2]
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+# npull
+[.]
+pulling from $HGTMP//test-hgnested/toplevel
+searching for changes
+no changes found
+
+[d/d/r]
+pulling from $HGTMP//test-hgnested/toplevel/d/d/r
+searching for changes
+no changes found
+
+[r]
+pulling from $HGTMP//test-hgnested/toplevel/r
+searching for changes
+no changes found
+
+[r/r]
+pulling from $HGTMP//test-hgnested/toplevel/r/r
+searching for changes
+no changes found
+
+[r2]
+pulling from $HGTMP//test-hgnested/toplevel/r2
+searching for changes
+no changes found
+
+adding f2
+[.]
+pulling from $HGTMP//test-hgnested/toplevel
+searching for changes
+no changes found
+
+[d/d/r]
+pulling from $HGTMP//test-hgnested/toplevel/d/d/r
+searching for changes
+no changes found
+
+[r]
+pulling from $HGTMP//test-hgnested/toplevel/r
+searching for changes
+no changes found
+
+[r/r]
+pulling from $HGTMP//test-hgnested/toplevel/r/r
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+(run 'hg update' to get a working copy)
+
+[r2]
+pulling from $HGTMP//test-hgnested/toplevel/r2
+searching for changes
+no changes found
+
+# nupdate
+[.]
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[d/d/r]
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[r]
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[r/r]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[r2]
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+# nstatus
+[.]
+
+[d/d/r]
+
+[r]
+
+[r/r]
+
+[r2]
+
+[.]
+? f2
+
+[d/d/r]
+
+[r]
+A f2
+
+[r/r]
+! f2
+
+[r2]
+
+# noutgoing
+adding f3
+adding f3
+adding f3
+[.]
+abort: repository default-push not found!
+# npush
+[.]
+pushing to $HGTMP//test-hgnested/toplevel
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+
+[d/d/r]
+pushing to $HGTMP//test-hgnested/toplevel/d/d/r
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+
+[r]
+pushing to $HGTMP//test-hgnested/toplevel/r
+searching for changes
+no changes found
+
+[r/r]
+pushing to $HGTMP//test-hgnested/toplevel/r/r
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+
+[r2]
+pushing to $HGTMP//test-hgnested/toplevel/r2
+searching for changes
+no changes found
+
+# nclone ssh
+[toplevel-sshclone]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 4 changes to 4 files
+updating to branch default
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-sshclone/d/d/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 2 files
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-sshclone/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-sshclone/r/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 3 changesets with 3 changes to 3 files
+updating to branch default
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-sshclone/r2]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+# nclone http
+[toplevel-httpclone]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 4 changes to 4 files
+updating to branch default
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-httpclone/d/d/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 2 files
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-httpclone/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-httpclone/r/r]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 3 changesets with 3 changes to 3 files
+updating to branch default
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[toplevel-httpclone/r2]
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+updating to branch default
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
--
hgnested
More information about the tryton-debian-vcs
mailing list