Mercurial > hg > mercurial-crew-with-dirclash
annotate rewrite-log @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
| author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
|---|---|
| date | Mon, 06 Feb 2006 17:32:06 -0600 |
| parents | 5f471a75d607 |
| children |
| rev | line source |
|---|---|
| 141 | 1 #!/usr/bin/env python |
| 2 import sys, os | |
| 3 from mercurial import hg | |
| 4 | |
| 5 f = sys.argv[1] | |
| 6 | |
| 7 r1 = hg.revlog(open, f + ".i", f + ".d") | |
| 8 r2 = hg.revlog(open, f + ".i2", f + ".d2") | |
| 9 | |
| 10 tr = hg.transaction(open, "journal") | |
| 11 | |
| 12 for i in xrange(r1.count()): | |
| 13 n = r1.node(i) | |
| 14 p1, p2 = r1.parents(n) | |
| 15 l = r1.linkrev(n) | |
| 16 t = r1.revision(n) | |
| 17 n2 = r2.addrevision(t, tr, l, p1, p2) | |
| 18 tr.close() | |
| 19 | |
| 20 os.rename(f + ".i", f + ".i.old") | |
| 21 os.rename(f + ".d", f + ".d.old") | |
| 22 os.rename(f + ".i2", f + ".i") | |
| 23 os.rename(f + ".d2", f + ".d") |