Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/transaction.py @ 1237:227cfbe34109
Fix off by one in convert-repo tags
--- crew.orig/contrib/convert-repo 2005-07-16 11:52:06.000000000 -0400
+++ crew/contrib/convert-repo 2005-09-02 02:58:14.000000000 -0400
@@ -86,9 +86,7 @@ class convert_git:
for f in os.listdir(self.path + "/.git/refs/tags"):
try:
h = file(self.path + "/.git/refs/tags/" + f).read().strip()
- p, a, d, m = self.getcommit(h)
- if not p: p = [h] # git is ugly, don't blame me
- tags[f] = p[0]
+ tags[f] = h
except:
pass
return tags
--
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
author | mason@suse.com |
---|---|
date | Tue, 13 Sep 2005 19:32:43 -0500 |
parents | 7b35a980b982 |
children | cf9a1233738a |
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 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. import os import util class transaction: 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.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): if file in self.map: return self.entries.append((file, offset)) self.map[file] = 1 # add enough data to the journal to do the truncate self.file.write("%s\0%d\n" % (file, offset)) self.file.flush() def close(self): 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 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): for l in open(file).readlines(): f, o = l.split('\0') opener(f, "a").truncate(int(o)) os.unlink(file)