Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/transaction.py @ 569:3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 1/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the template pages contain two entry named #parent1# and #parent2#;
this is no +good because with the template system implemented in hgweb
both the functions can be replaced with only one entry named
"#parent#". The code in hgweb will replace this tag with the
appropriate number of parents (+one, two... or more if and when will
be used ).
The first two patch perform this change in two step:
1) change the code to manage only one entry ( #parent1# )
2) remove any reference to #parent2#, and change both the code and the
templates to rename #parent1# in #parent2#
the last three patchs are clean-up.
The patch are five
- - patch #1:
- - clean the code in order to ignore #parent2# and use only #parent1#
hgweb: chanage the parent1/parent2 code managment
manifest hash: 6ba707904edf176c7269f2d9b80502902e6934c6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvivywK+sNU5EO8RAkotAJ4vbR0KE+Jem20rQbaJxy8NRFeyJgCdHy2M
hxmeD9erv17BrSKLGd5QAQI=
=Or/F
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 12:27:27 -0800 |
parents | 0ceea19182a9 |
children | fbfbd4e506c3 |
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, opener, journal, after = None): self.journal = None # abort here if the journal already exists if os.path.exists(journal): raise "journal already exists - run hg recover" 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: util.rename(self.journal, self.after) else: os.unlink(self.journal) def abort(self): if not self.entries: return print "transaction abort!" for f, o in self.entries: try: self.opener(f, "a").truncate(o) except: print "failed to truncate", f self.entries = [] print "rollback completed" def rollback(opener, file): for l in open(file).readlines(): f, o = l.split('\0') opener(f, "a").truncate(int(o)) os.unlink(file)