# HG changeset patch # User mpm@selenic.com # Date 1116462711 28800 # Node ID 589f507bb2598b9ebd32b876e3e9ea60320545c2 # Parent 7daef883134f1ef6ea976368a6313aa0e7047917 Beginnings of transaction undo support diff -r 7daef883134f -r 589f507bb259 mercurial/hg.py --- a/mercurial/hg.py Wed May 18 16:29:39 2005 -0800 +++ b/mercurial/hg.py Wed May 18 16:31:51 2005 -0800 @@ -294,7 +294,8 @@ return filelog(self.opener, f) def transaction(self): - return transaction(self.opener, self.join("journal")) + return transaction(self.opener, self.join("journal"), + self.join("undo")) def commit(self, parent, update = None, text = ""): tr = self.transaction() diff -r 7daef883134f -r 589f507bb259 mercurial/transaction.py --- a/mercurial/transaction.py Wed May 18 16:29:39 2005 -0800 +++ b/mercurial/transaction.py Wed May 18 16:31:51 2005 -0800 @@ -14,16 +14,16 @@ import os class transaction: - def __init__(self, opener, journal): + def __init__(self, opener, journal, after = None): self.opener = opener + self.after = after self.entries = [] self.map = {} self.journal = journal # abort here if the journal already exists if os.path.exists(self.journal): - print "journal already exists, recovering" - self.recover() + raise "journal already exists!" self.file = open(self.journal, "w") @@ -43,7 +43,10 @@ def close(self): self.file.close() self.entries = [] - os.unlink(self.journal) + if self.after: + os.rename(self.journal, self.after) + else: + os.unlink(self.journal) def abort(self): if not self.entries: return