Mercurial > hg > gitweb
changeset 3851:8f18e31c4441
add "requires" file to the repo, specifying the requirements
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 10 Dec 2006 00:06:59 +0100 |
| parents | a4457828ca1a |
| children | 8a9a1a7e1698 |
| files | mercurial/hg.py mercurial/localrepo.py mercurial/statichttprepo.py tests/test-hup.out tests/test-requires tests/test-requires.out |
| diffstat | 6 files changed, 65 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Sun Dec 10 00:06:45 2006 +0100 +++ b/mercurial/hg.py Sun Dec 10 00:06:59 2006 +0100 @@ -149,13 +149,23 @@ copy = False if copy: - # we lock here to avoid premature writing to the target + def force_copy(src, dst): + try: + util.copyfiles(src, dst) + except OSError, inst: + if inst.errno != errno.ENOENT: + raise + src_store = os.path.realpath(src_repo.spath) dest_path = os.path.realpath(os.path.join(dest, ".hg")) dest_store = dest_path if not os.path.exists(dest): os.mkdir(dest) os.mkdir(dest_path) + # copy the requires file + force_copy(src_repo.join("requires"), + os.path.join(dest_path, "requires")) + # we lock here to avoid premature writing to the target dest_lock = lock.lock(os.path.join(dest_store, "lock")) files = ("data", @@ -164,11 +174,7 @@ for f in files: src = os.path.join(src_store, f) dst = os.path.join(dest_store, f) - try: - util.copyfiles(src, dst) - except OSError, inst: - if inst.errno != errno.ENOENT: - raise + force_copy(src, dst) # we need to re-init the repo after manually copying the data # into it
--- a/mercurial/localrepo.py Sun Dec 10 00:06:45 2006 +0100 +++ b/mercurial/localrepo.py Sun Dec 10 00:06:59 2006 +0100 @@ -16,6 +16,7 @@ class localrepository(repo.repository): capabilities = ('lookup', 'changegroupsubset') + supported = ('revlogv1',) def __del__(self): self.transhandle = None @@ -44,10 +45,27 @@ os.mkdir(self.path) #if self.spath != self.path: # os.mkdir(self.spath) + requirements = ("revlogv1",) + reqfile = self.opener("requires", "w") + for r in requirements: + reqfile.write("%s\n" % r) + reqfile.close() else: raise repo.RepoError(_("repository %s not found") % path) elif create: raise repo.RepoError(_("repository %s already exists") % path) + else: + # find requirements + try: + requirements = self.opener("requires").read().splitlines() + except IOError, inst: + if inst.errno != errno.ENOENT: + raise + requirements = [] + # check them + for r in requirements: + if r not in self.supported: + raise repo.RepoError(_("requirement '%s' not supported") % r) # setup store self.spath = self.path
--- a/mercurial/statichttprepo.py Sun Dec 10 00:06:45 2006 +0100 +++ b/mercurial/statichttprepo.py Sun Dec 10 00:06:59 2006 +0100 @@ -37,7 +37,20 @@ self.ui = ui self.revlogversion = 0 self.opener = opener(self.path) + # find requirements + try: + requirements = self.opener("requires").read().splitlines() + except IOError: + requirements = [] + # check them + for r in requirements: + if r not in self.supported: + raise repo.RepoError(_("requirement '%s' not supported") % r) + + # setup store + self.spath = self.path self.sopener = opener(self.spath) + self.manifest = manifest.manifest(self.sopener) self.changelog = changelog.changelog(self.sopener) self.tagscache = None
--- a/tests/test-hup.out Sun Dec 10 00:06:45 2006 +0100 +++ b/tests/test-hup.out Sun Dec 10 00:06:59 2006 +0100 @@ -6,3 +6,4 @@ rollback completed 00changelog.i journal.dirstate +requires