annotate rewrite-log @ 3295:764688cf51e5

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents 5f471a75d607
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
141
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
1 #!/usr/bin/env python
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
2 import sys, os
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
3 from mercurial import hg
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
4
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
5 f = sys.argv[1]
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
6
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
7 r1 = hg.revlog(open, f + ".i", f + ".d")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
8 r2 = hg.revlog(open, f + ".i2", f + ".d2")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
9
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
10 tr = hg.transaction(open, "journal")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
11
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
12 for i in xrange(r1.count()):
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
13 n = r1.node(i)
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
14 p1, p2 = r1.parents(n)
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
15 l = r1.linkrev(n)
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
16 t = r1.revision(n)
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
17 n2 = r2.addrevision(t, tr, l, p1, p2)
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
18 tr.close()
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
19
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
20 os.rename(f + ".i", f + ".i.old")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
21 os.rename(f + ".d", f + ".d.old")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
22 os.rename(f + ".i2", f + ".i")
5f471a75d607 Simple script to recompress a log file
mpm@selenic.com
parents:
diff changeset
23 os.rename(f + ".d2", f + ".d")