Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/transaction.py @ 5378:8a2915f57dfc
convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 6b4127c7d52a |
children |
line wrap: on
line source
# transaction.py - simple journalling scheme for mercurial # # This transaction scheme is intended to gracefully handle program # errors and interruptions. More serious failures like system crashes # can be recovered with an fsck-like tool. As the whole repository is # effectively log-structured, this should amount to simply truncating # anything that isn't referenced in the changelog. # # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from i18n import _ import os class transaction(object): def __init__(self, report, opener, journal, after=None): self.journal = None # abort here if the journal already exists if os.path.exists(journal): raise AssertionError(_("journal already exists - run hg recover")) self.count = 1 self.report = report self.opener = opener self.after = after self.entries = [] self.map = {} self.journal = journal self.file = open(self.journal, "w") def __del__(self): if self.journal: if self.entries: self.abort() self.file.close() try: os.unlink(self.journal) except: pass def add(self, file, offset, data=None): if file in self.map: return self.entries.append((file, offset, data)) self.map[file] = len(self.entries) - 1 # add enough data to the journal to do the truncate self.file.write("%s\0%d\n" % (file, offset)) self.file.flush() def find(self, file): if file in self.map: return self.entries[self.map[file]] return None def replace(self, file, offset, data=None): if file not in self.map: raise KeyError(file) index = self.map[file] self.entries[index] = (file, offset, data) self.file.write("%s\0%d\n" % (file, offset)) self.file.flush() def nest(self): self.count += 1 return self def running(self): return self.count > 0 def close(self): self.count -= 1 if self.count != 0: return self.file.close() self.entries = [] if self.after: self.after() else: os.unlink(self.journal) self.journal = None def abort(self): if not self.entries: return self.report(_("transaction abort!\n")) for f, o, ignore in self.entries: try: self.opener(f, "a").truncate(o) except: self.report(_("failed to truncate %s\n") % f) self.entries = [] self.report(_("rollback completed\n")) def rollback(opener, file): files = {} for l in open(file).readlines(): f, o = l.split('\0') files[f] = o for f in files: o = files[f] opener(f, "a").truncate(int(o)) os.unlink(file)