hg/pyhgsh: mercurial/hg.py annotate

annotate mercurial/hg.py @ 85:58a1a0425c9b

Fix merge bug, I hope

author	mpm@selenic.com
date	Tue, 17 May 2005 11:40:45 -0800
parents	9fd5b35cfc45
children	ab9ebff09dcd

rev	line source
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1 # hg.py - repository classes for mercurial
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
37 a8811676c85a Move hex/bin bits to revlog mpm@selenic.com parents: 33 diff changeset	8 import sys, struct, sha, socket, os, time, base64, re, urllib2
15 6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	9 import urllib
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	10 from mercurial import byterange
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	11 from mercurial.transaction import *
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	12 from mercurial.revlog import *
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	13 from difflib import SequenceMatcher
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	14
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	15 class filelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	16 def __init__(self, opener, path):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	17 s = self.encodepath(path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	18 revlog.__init__(self, opener, os.path.join("data", s + "i"),
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	19 os.path.join("data", s))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	20
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21 def encodepath(self, path):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	22 s = sha.sha(path).digest()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	23 s = base64.encodestring(s)[:-3]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	24 s = re.sub("\+", "%", s)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	25 s = re.sub("/", "_", s)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	26 return s
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	27
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	28 def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	29 return self.revision(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	30 def add(self, text, transaction, link, p1=None, p2=None):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	31 return self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	32
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	33 def resolvedag(self, old, new, transaction, link):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	34 """resolve unmerged heads in our DAG"""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	35 if old == new: return None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	36 a = self.ancestor(old, new)
48 9f64181ff9a9 Fix resolve bug putting unchanged files in resolve cset mpm@selenic.com parents: 46 diff changeset	37 if old == a: return None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	38 return self.merge3(old, new, a, transaction, link)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	39
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	40 def merge3(self, my, other, base, transaction, link):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	41 """perform a 3-way merge and append the result"""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	42 def temp(prefix, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	43 (fd, name) = tempfile.mkstemp(prefix)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	44 f = os.fdopen(fd, "w")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	45 f.write(self.revision(node))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	46 f.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	47 return name
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	48
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	49 a = temp("local", my)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	50 b = temp("remote", other)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	51 c = temp("parent", base)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	52
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	53 cmd = os.environ["HGMERGE"]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	54 r = os.system("%s %s %s %s" % (cmd, a, b, c))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	55 if r:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	56 raise "Merge failed, implement rollback!"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	57
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	58 t = open(a).read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	59 os.unlink(a)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	60 os.unlink(b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	61 os.unlink(c)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	62 return self.addrevision(t, transaction, link, my, other)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	63
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	64 def merge(self, other, transaction, linkseq, link):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	65 """perform a merge and resolve resulting heads"""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	66 (o, n) = self.mergedag(other, transaction, linkseq)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	67 return self.resolvedag(o, n, transaction, link)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	68
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	69 def annotate(self, node):
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	70 revs = []
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	71 while node != nullid:
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	72 revs.append(node)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	73 node = self.parents(node)[0]
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	74 revs.reverse()
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	75 prev = []
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	76 annotate = []
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	77 for node in revs:
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	78 curr = self.read(node).splitlines(1)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	79 linkrev = self.linkrev(node)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	80 sm = SequenceMatcher(None, prev, curr)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	81 offset = 0
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	82 for o, m, n, s, t in sm.get_opcodes():
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	83 if o in ('insert','replace'):
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	84 annotate[m+offset:n+offset] = \
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	85 [ (linkrev, l) for l in curr[s:t]]
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	86 if o == 'insert':
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	87 offset += m-n
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	88 elif o == 'delete':
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	89 del annotate[m+offset:n+offset]
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	90 offset -= m-n
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	91 assert len(annotate) == len(curr)
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	92 prev = curr
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	93 return annotate
837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	94
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 class manifest(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	96 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 self.mapcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	98 self.listcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 self.addlist = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	100 revlog.__init__(self, opener, "00manifest.i", "00manifest.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	101
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102 def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103 if self.mapcache and self.mapcache[0] == node:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	104 return self.mapcache[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 text = self.revision(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	106 map = {}
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	107 self.listcache = (text, text.splitlines(1))
daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	108 for l in self.listcache[1]:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109 (f, n) = l.split('\0')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	110 map[f] = bin(n[:40])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	111 self.mapcache = (node, map)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	112 return map
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	113
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	114 def diff(self, a, b):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	115 # this is sneaky, as we're not actually using a and b
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	116 if self.listcache and len(self.listcache[0]) == len(a):
daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	117 return mdiff.diff(self.listcache[1], self.addlist, 1)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	118 else:
44 e825a68d7227 Fix occassional diff bug with manifests mpm@selenic.com parents: 40 diff changeset	119 return mdiff.textdiff(a, b)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	120
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	121 def add(self, map, transaction, link, p1=None, p2=None):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	122 files = map.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	123 files.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	124
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	125 self.addlist = ["%s\000%s\n" % (f, hex(map[f])) for f in files]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	126 text = "".join(self.addlist)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	127
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	128 n = self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129 self.mapcache = (n, map)
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	130 self.listcache = (text, self.addlist)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	131
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	132 return n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	133
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	134 class changelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	135 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	136 revlog.__init__(self, opener, "00changelog.i", "00changelog.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	137
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	138 def extract(self, text):
37 a8811676c85a Move hex/bin bits to revlog mpm@selenic.com parents: 33 diff changeset	139 if not text:
40 5f87633e1ea2 Date is an int as a string in changelog mpm@selenic.com parents: 37 diff changeset	140 return (nullid, "", "0", [], "")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141 last = text.index("\n\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	142 desc = text[last + 2:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143 l = text[:last].splitlines()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	144 manifest = bin(l[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	145 user = l[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	146 date = l[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	147 files = l[3:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	148 return (manifest, user, date, files, desc)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	149
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	150 def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	151 return self.extract(self.revision(node))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	152
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	153 def add(self, manifest, list, desc, transaction, p1=None, p2=None):
55 2add70d51441 From: Thomas Arendsen Hein <thomas@intevation.de> mpm@selenic.com parents: 48 diff changeset	154 user = (os.environ.get("HGUSER") or
2add70d51441 From: Thomas Arendsen Hein <thomas@intevation.de> mpm@selenic.com parents: 48 diff changeset	155 os.environ.get("EMAIL") or
2add70d51441 From: Thomas Arendsen Hein <thomas@intevation.de> mpm@selenic.com parents: 48 diff changeset	156 os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn())
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 date = "%d %d" % (time.time(), time.timezone)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	158 list.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159 l = [hex(manifest), user, date] + list + ["", desc]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 text = "\n".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	161 return self.addrevision(text, transaction, self.count(), p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	162
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	163 def merge3(self, my, other, base):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	164 pass
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	165
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	166 class dircache:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	167 def __init__(self, opener, ui):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	168 self.opener = opener
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	169 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	170 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	171 self.map = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	172 def __del__(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	173 if self.dirty: self.write()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	174 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	175 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	176 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	177 except TypeError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	178 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	179 return self[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	180
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	181 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	182 if self.map is not None: return self.map
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	183
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	184 self.map = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	185 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	186 st = self.opener("dircache").read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	187 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	188
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	189 pos = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	190 while pos < len(st):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	191 e = struct.unpack(">llll", st[pos:pos+16])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	192 l = e[3]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	193 pos += 16
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	194 f = st[pos:pos + l]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	195 self.map[f] = e[:3]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	196 pos += l
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	197
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	198 def update(self, files):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	199 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	200 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	201 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	202 for f in files:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	203 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	204 s = os.stat(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	205 self.map[f] = (s.st_mode, s.st_size, s.st_mtime)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	206 except IOError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	207 self.remove(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	208
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	209 def taint(self, files):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	210 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213 for f in files:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	214 self.map[f] = (0, -1, 0)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	215
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	216 def remove(self, files):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	217 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	218 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	219 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	220 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	221 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	222 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	223 except KeyError:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	224 self.ui.warn("Not in dircache: %s\n" % f)
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	225 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	226
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	227 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	228 self.map = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	229 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	230
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	231 def write(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	232 st = self.opener("dircache", "w")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	233 for f, e in self.map.items():
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	234 e = struct.pack(">llll", e[0], e[1], e[2], len(f))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	235 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	236 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	237
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	238 def copy(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	239 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	240 return self.map.copy()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	241
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	242 # used to avoid circular references so destructors work
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	243 def opener(base):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	244 p = base
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	245 def o(path, mode="r"):
15 6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	246 if p[:7] == "http://":
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	247 f = os.path.join(p, urllib.quote(path))
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	248 return httprangereader(f)
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	249
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	250 f = os.path.join(p, path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	251
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	252 if mode != "r" and os.path.isfile(f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	253 s = os.stat(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	254 if s.st_nlink > 1:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	255 file(f + ".tmp", "w").write(file(f).read())
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	256 os.rename(f+".tmp", f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	257
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	258 return file(f, mode)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	259
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	260 return o
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	261
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	262 class localrepository:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	263 def __init__(self, ui, path=None, create=0):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	264 self.remote = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	265 if path and path[:7] == "http://":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	266 self.remote = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	267 self.path = path
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	268 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269 if not path:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	270 p = os.getcwd()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	271 while not os.path.isdir(os.path.join(p, ".hg")):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 p = os.path.dirname(p)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	273 if p == "/": raise "No repo found"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	274 path = p
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	275 self.path = os.path.join(path, ".hg")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	276
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	277 self.root = path
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	278 self.ui = ui
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	279
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	280 if create:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	281 os.mkdir(self.path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	282 os.mkdir(self.join("data"))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	283
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	284 self.opener = opener(self.path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	285 self.manifest = manifest(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	286 self.changelog = changelog(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	287 self.ignorelist = None
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	288 self.tags = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	289
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	290 if not self.remote:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	291 self.dircache = dircache(self.opener, ui)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	292 try:
4 ce3bd728b858 Fix exception handling for reading current working version mpm@selenic.com parents: 0 diff changeset	293 self.current = bin(self.opener("current").read())
ce3bd728b858 Fix exception handling for reading current working version mpm@selenic.com parents: 0 diff changeset	294 except IOError:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	295 self.current = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	296
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	297 def setcurrent(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	298 self.current = node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	299 self.opener("current", "w").write(hex(node))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	300
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	301 def ignore(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	302 if self.ignorelist is None:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	303 self.ignorelist = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	304 try:
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	305 l = open(os.path.join(self.root, ".hgignore"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	306 for pat in l:
9 b4d0c3786ad3 Ignore empty ignore patterns mpm@selenic.com parents: 4 diff changeset	307 if pat != "\n":
b4d0c3786ad3 Ignore empty ignore patterns mpm@selenic.com parents: 4 diff changeset	308 self.ignorelist.append(re.compile(pat[:-1]))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	309 except IOError: pass
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	310 for pat in self.ignorelist:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	311 if pat.search(f): return True
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	312 return False
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	313
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	314 def lookup(self, key):
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	315 if self.tags is None:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	316 self.tags = {}
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	317 try:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	318 fl = self.file(".hgtags")
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	319 for l in fl.revision(fl.tip()).splitlines():
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	320 if l:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	321 n, k = l.split(" ")
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	322 self.tags[k] = bin(n)
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	323 except KeyError: pass
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	324 try:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	325 return self.tags[key]
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	326 except KeyError:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	327 return self.changelog.lookup(key)
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	328
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	329 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	330 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	331
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	332 def file(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	333 return filelog(self.opener, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	334
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	335 def transaction(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	336 return transaction(self.opener, self.join("journal"))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	337
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	338 def merge(self, other):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	339 tr = self.transaction()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	340 changed = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	341 new = {}
10 e76ed1e480ef Fix linking of changeset revs when merging oxymoron@cinder.waste.org parents: 9 diff changeset	342 seqrev = self.changelog.count()
e76ed1e480ef Fix linking of changeset revs when merging oxymoron@cinder.waste.org parents: 9 diff changeset	343 # some magic to allow fiddling in nested scope
e76ed1e480ef Fix linking of changeset revs when merging oxymoron@cinder.waste.org parents: 9 diff changeset	344 nextrev = [seqrev]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	345
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	346 # helpers for back-linking file revisions to local changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	347 # revisions so we can immediately get to changeset from annotate
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	348 def accumulate(text):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	349 # track which files are added in which changeset and the
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	350 # corresponding _local_ changeset revision
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	351 files = self.changelog.extract(text)[3]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	352 for f in files:
10 e76ed1e480ef Fix linking of changeset revs when merging oxymoron@cinder.waste.org parents: 9 diff changeset	353 changed.setdefault(f, []).append(nextrev[0])
e76ed1e480ef Fix linking of changeset revs when merging oxymoron@cinder.waste.org parents: 9 diff changeset	354 nextrev[0] += 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	355
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	356 def seq(start):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	357 while 1:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	358 yield start
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	359 start += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	360
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	361 def lseq(l):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	362 for r in l:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	363 yield r
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	364
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	365 # begin the import/merge of changesets
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	366 self.ui.status("merging new changesets\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	367 (co, cn) = self.changelog.mergedag(other.changelog, tr,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	368 seq(seqrev), accumulate)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	369 resolverev = self.changelog.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	370
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	371 # is there anything to do?
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	372 if co == cn:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	373 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	374 return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	375
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	376 # do we need to resolve?
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	377 simple = (co == self.changelog.ancestor(co, cn))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	378
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	379 # merge all files changed by the changesets,
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	380 # keeping track of the new tips
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381 changelist = changed.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	382 changelist.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	383 for f in changelist:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	384 sys.stdout.write(".")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	385 sys.stdout.flush()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	386 r = self.file(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	387 node = r.merge(other.file(f), tr, lseq(changed[f]), resolverev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	388 if node:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	389 new[f] = node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	390 sys.stdout.write("\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	391
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	392 # begin the merge of the manifest
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	393 self.ui.status("merging manifests\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	394 (mm, mo) = self.manifest.mergedag(other.manifest, tr, seq(seqrev))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	395
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	396 # For simple merges, we don't need to resolve manifests or changesets
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	397 if simple:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	398 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	399 return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	400
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	401 ma = self.manifest.ancestor(mm, mo)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	402
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	403 # resolve the manifest to point to all the merged files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	404 self.ui.status("resolving manifests\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	405 mmap = self.manifest.read(mm) # mine
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	406 omap = self.manifest.read(mo) # other
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	407 amap = self.manifest.read(ma) # ancestor
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	408 nmap = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	409
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	410 for f, mid in mmap.iteritems():
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	411 if f in omap:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	412 if mid != omap[f]:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	413 nmap[f] = new.get(f, mid) # use merged version
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	414 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	415 nmap[f] = new.get(f, mid) # they're the same
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	416 del omap[f]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	417 elif f in amap:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	418 if mid != amap[f]:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	419 pass # we should prompt here
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	420 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	421 pass # other deleted it
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	422 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	423 nmap[f] = new.get(f, mid) # we created it
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	424
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	425 del mmap
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	426
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	427 for f, oid in omap.iteritems():
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	428 if f in amap:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	429 if oid != amap[f]:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	430 pass # this is the nasty case, we should prompt
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	431 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	432 pass # probably safe
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	433 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	434 nmap[f] = new.get(f, oid) # remote created it
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	435
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	436 del omap
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	437 del amap
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	438
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	439 node = self.manifest.add(nmap, tr, resolverev, mm, mo)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	440
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	441 # Now all files and manifests are merged, we add the changed files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	442 # and manifest id to the changelog
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	443 self.ui.status("committing merge changeset\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	444 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	445 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	446 if co == cn: cn = -1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	447
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	448 edittext = "\n"+"".join(["HG: changed %s\n" % f for f in new])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	449 edittext = self.ui.edit(edittext)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	450 n = self.changelog.add(node, new, edittext, tr, co, cn)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	451
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	452 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	453
30 12f598340423 Fix up commit arg breakage mpm@selenic.com parents: 29 diff changeset	454 def commit(self, parent, update = None, text = ""):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	455 tr = self.transaction()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	456
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	457 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	458 remove = [ l[:-1] for l in self.opener("to-remove") ]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	459 os.unlink(self.join("to-remove"))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	460
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	461 except IOError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	462 remove = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	463
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	464 if update == None:
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	465 update = self.diffdir(self.root, parent)[0]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	466
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	467 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	468 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	469 linkrev = self.changelog.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	470 for f in update:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	471 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	472 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	473 t = file(f).read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	474 except IOError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	475 remove.append(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	476 continue
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	477 r = self.file(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	478 new[f] = r.add(t, tr, linkrev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	479
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	480 # update manifest
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	481 mmap = self.manifest.read(self.manifest.tip())
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	482 mmap.update(new)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	483 for f in remove:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	484 del mmap[f]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	485 mnode = self.manifest.add(mmap, tr, linkrev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	486
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	487 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	488 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	489 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	490
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	491 edittext = text + "\n"+"".join(["HG: changed %s\n" % f for f in new])
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	492 edittext += "".join(["HG: removed %s\n" % f for f in remove])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	493 edittext = self.ui.edit(edittext)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	494
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	495 n = self.changelog.add(mnode, new, edittext, tr)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	496 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	497
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	498 self.setcurrent(n)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	499 self.dircache.update(new)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	500 self.dircache.remove(remove)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	502 def checkdir(self, path):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	503 d = os.path.dirname(path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	504 if not d: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	505 if not os.path.isdir(d):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	506 self.checkdir(d)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	507 os.mkdir(d)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	508
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	509 def checkout(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	510 # checkout is really dumb at the moment
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	511 # it ought to basically merge
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	512 change = self.changelog.read(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	513 mmap = self.manifest.read(change[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	514
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	515 l = mmap.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	516 l.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	517 stats = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	518 for f in l:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	519 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	520 r = self.file(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	521 t = r.revision(mmap[f])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	522 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	523 file(f, "w").write(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	524 except:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	525 self.checkdir(f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	526 file(f, "w").write(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	527
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	528 self.setcurrent(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	529 self.dircache.clear()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	530 self.dircache.update(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	531
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	532 def diffdir(self, path, changeset):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	533 changed = []
4 ce3bd728b858 Fix exception handling for reading current working version mpm@selenic.com parents: 0 diff changeset	534 mf = {}
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	535 added = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	536
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	537 if changeset:
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	538 change = self.changelog.read(changeset)
4 ce3bd728b858 Fix exception handling for reading current working version mpm@selenic.com parents: 0 diff changeset	539 mf = self.manifest.read(change[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	540
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	541 if changeset == self.current:
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	542 dc = self.dircache.copy()
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	543 else:
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	544 dc = dict.fromkeys(mf)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	545
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	546 def fcmp(fn):
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 60 diff changeset	547 t1 = file(os.path.join(self.root, fn)).read()
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	548 t2 = self.file(fn).revision(mf[fn])
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	549 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	550
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	551 for dir, subdirs, files in os.walk(self.root):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	552 d = dir[len(self.root)+1:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	553 if ".hg" in subdirs: subdirs.remove(".hg")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	554
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	555 for f in files:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	556 fn = os.path.join(d, f)
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 60 diff changeset	557 try: s = os.stat(os.path.join(self.root, fn))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	558 except: continue
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	559 if fn in dc:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	560 c = dc[fn]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	561 del dc[fn]
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	562 if not c:
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	563 if fcmp(fn):
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	564 changed.append(fn)
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 32 diff changeset	565 elif c[1] != s.st_size:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	566 changed.append(fn)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	567 elif c[0] != s.st_mode or c[2] != s.st_mtime:
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	568 if fcmp(fn):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	569 changed.append(fn)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	570 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	571 if self.ignore(fn): continue
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	572 added.append(fn)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	573
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	574 deleted = dc.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	575 deleted.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	576
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	577 return (changed, added, deleted)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	578
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	579 def diffrevs(self, node1, node2):
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 32 diff changeset	580 changed, added = [], []
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	581
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	582 change = self.changelog.read(node1)
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	583 mf1 = self.manifest.read(change[0])
33 98633e60067c Support for 0, 1, or 2 diff revs mpm@selenic.com parents: 32 diff changeset	584 change = self.changelog.read(node2)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	585 mf2 = self.manifest.read(change[0])
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	586
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	587 for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	588 if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	589 if mf1[fn] != mf2[fn]:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	590 changed.append(fn)
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	591 del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	592 else:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	593 added.append(fn)
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	594
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	595 deleted = mf1.keys()
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	596 deleted.sort()
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	597
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	598 return (changed, added, deleted)
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	599
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	600 def add(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	601 self.dircache.taint(list)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	602
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	603 def remove(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	604 dl = self.opener("to-remove", "a")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	605 for f in list:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	606 dl.write(f + "\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	607
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	608 def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	609 if not nodes: nodes = [self.changelog.tip()]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	610 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	611 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	612 t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	613 while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	614 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	615 if p[1] != nullid or p[0] == nullid:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	616 b.append((t, n, p[0], p[1]))
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	617 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	618 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	619 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	620
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	621 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	622 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	623
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	624 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	625 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	626 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	627
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	628 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	629 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	630 if i == f:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	631 l.append(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	632 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	633 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	634 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	635
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	636 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	637
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	638 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	639
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	640 def newer(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	641 m = {}
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	642 nl = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	643 cl = self.changelog
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	644 t = l = cl.count()
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	645 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	646 l = min(l, cl.rev(n))
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	647 for p in cl.parents(n):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	648 m[p] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	649
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	650 for i in xrange(l, t):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	651 n = cl.node(i)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	652 for p in cl.parents(n):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	653 if p in m and n not in m:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	654 m[n] = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	655 nl.append(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	656
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	657 return nl
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	658
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	659 def getchangegroup(self, remote):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	660 tip = remote.branches([])[0]
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	661 self.ui.debug("remote tip branch is %s:%s\n" %
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	662 (short(tip[0]), short(tip[1])))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	663 m = self.changelog.nodemap
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	664 unknown = [tip]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	665 search = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	666 fetch = []
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	667
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	668 if tip[0] in m:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	669 self.ui.note("nothing to do!\n")
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	670 return None
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	671
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	672 while unknown:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	673 n = unknown.pop(0)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	674 if n == nullid: break
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	675 if n[1] and n[1] in m: # do we know the base?
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	676 self.ui.debug("found incomplete branch %s\n" % short(n[1]))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	677 search.append(n) # schedule branch range for scanning
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	678 else:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	679 for b in remote.branches([n[2], n[3]]):
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	680 if b[0] in m:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	681 if n[1] not in fetch:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	682 self.ui.debug("found new changeset %s\n" %
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	683 short(n[1]))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	684 fetch.append(n[1]) # earliest unknown
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	685 else:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	686 unknown.append(b)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	687
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	688 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	689 n = search.pop(0)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	690 l = remote.between([(n[0], n[1])])[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	691 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	692 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	693 for i in l + [n[1]]:
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	694 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	695 if f <= 2:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	696 self.ui.debug("found new branch changeset %s\n" %
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	697 short(p))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	698 fetch.append(p)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	699 else:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	700 self.ui.debug("narrowed branch search to %s:%s\n"
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	701 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	702 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	703 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	704 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	705
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	706 for f in fetch:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	707 if f in m:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	708 raise "already have", short(f[:4])
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	709
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	710 self.ui.note("merging new changesets starting at " +
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	711 " ".join([short(f) for f in fetch]) + "\n")
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	712
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	713 return remote.changegroup(fetch)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	714
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	715 def changegroup(self, basenodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	716 nodes = self.newer(basenodes)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	717
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	718 # construct the link map
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	719 linkmap = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	720 for n in nodes:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	721 linkmap[self.changelog.rev(n)] = n
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	722
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	723 # construct a list of all changed files
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	724 changed = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	725 for n in nodes:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	726 c = self.changelog.read(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	727 for f in c[3]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	728 changed[f] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	729 changed = changed.keys()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	730 changed.sort()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	731
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	732 # the changegroup is changesets + manifests + all file revs
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	733 revs = [ self.changelog.rev(n) for n in nodes ]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	734
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	735 yield self.changelog.group(linkmap)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	736 yield self.manifest.group(linkmap)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	737
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	738 for f in changed:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	739 g = self.file(f).group(linkmap)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	740 if not g: raise "couldn't find change to %s" % f
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	741 l = struct.pack(">l", len(f))
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	742 yield "".join([l, f, g])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	743
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	744 def addchangegroup(self, generator):
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	745 class genread:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	746 def __init__(self, generator):
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	747 self.g = generator
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	748 self.buf = ""
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	749 def read(self, l):
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	750 while l > len(self.buf):
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	751 try:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	752 self.buf += self.g.next()
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	753 except StopIteration:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	754 break
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	755 d, self.buf = self.buf[:l], self.buf[l:]
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	756 return d
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	757
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	758 if not generator: return
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	759 source = genread(generator)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	760
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	761 def getchunk(add = 0):
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	762 d = source.read(4)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	763 if not d: return ""
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	764 l = struct.unpack(">l", d)[0]
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	765 return source.read(l - 4 + add)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	766
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	767 tr = self.transaction()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	768 simple = True
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	769
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	770 self.ui.status("merging changesets\n")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	771 # pull off the changeset group
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	772 csg = getchunk()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	773 co = self.changelog.tip()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	774 cn = self.changelog.addgroup(csg, lambda x: self.changelog.count(), tr)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	775
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	776 self.ui.status("merging manifests\n")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	777 # pull off the manifest group
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	778 mfg = getchunk()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	779 mo = self.manifest.tip()
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	780 mm = self.manifest.addgroup(mfg, lambda x: self.changelog.rev(x), tr)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	781
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	782 # do we need a resolve?
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	783 if self.changelog.ancestor(co, cn) != co:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	784 simple = False
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	785 resolverev = self.changelog.count()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	786
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	787 # process the files
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	788 self.ui.status("merging files\n")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	789 new = {}
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	790 while 1:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	791 f = getchunk(4)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	792 if not f: break
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	793 fg = getchunk()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	794
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	795 fl = self.file(f)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	796 o = fl.tip()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	797 n = fl.addgroup(fg, lambda x: self.changelog.rev(x), tr)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	798 if not simple:
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	799 nn = fl.resolvedag(o, n, tr, resolverev)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	800 if nn: new[f] = nn
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	801
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	802 # For simple merges, we don't need to resolve manifests or changesets
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	803 if simple:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	804 tr.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	805 return
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	806
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	807 # resolve the manifest to point to all the merged files
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	808 self.ui.status("resolving manifests\n")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	809 ma = self.manifest.ancestor(mm, mo)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	810 mmap = self.manifest.read(mm) # mine
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	811 omap = self.manifest.read(mo) # other
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	812 amap = self.manifest.read(ma) # ancestor
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	813 nmap = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	814
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	815 for f, mid in mmap.iteritems():
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	816 if f in omap:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	817 if mid != omap[f]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	818 nmap[f] = new.get(f, mid) # use merged version
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	819 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	820 nmap[f] = new.get(f, mid) # they're the same
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	821 del omap[f]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	822 elif f in amap:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	823 if mid != amap[f]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	824 pass # we should prompt here
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	825 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	826 pass # other deleted it
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	827 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	828 nmap[f] = new.get(f, mid) # we created it
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	829
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	830 del mmap
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	831
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	832 for f, oid in omap.iteritems():
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	833 if f in amap:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	834 if oid != amap[f]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	835 pass # this is the nasty case, we should prompt
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	836 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	837 pass # probably safe
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	838 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	839 nmap[f] = new.get(f, oid) # remote created it
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	840
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	841 del omap
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	842 del amap
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	843
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	844 node = self.manifest.add(nmap, tr, resolverev, mm, mo)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	845
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	846 # Now all files and manifests are merged, we add the changed files
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	847 # and manifest id to the changelog
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	848 self.ui.status("committing merge changeset\n")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	849 new = new.keys()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	850 new.sort()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	851 if co == cn: cn = -1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	852
78 85f1f87dc8ff Add "HG: merge resolve" to editor text for merge mpm@selenic.com parents: 67 diff changeset	853 edittext = "\nHG: merge resolve\n" + \
85f1f87dc8ff Add "HG: merge resolve" to editor text for merge mpm@selenic.com parents: 67 diff changeset	854 "".join(["HG: changed %s\n" % f for f in new])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	855 edittext = self.ui.edit(edittext)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	856 n = self.changelog.add(node, new, edittext, tr, co, cn)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	857
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	858 tr.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	859
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	860 class remoterepository:
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	861 def __init__(self, ui, path):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	862 self.url = path.replace("hg://", "http://", 1)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	863 self.ui = ui
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	864
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	865 def do_cmd(self, cmd, **args):
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	866 self.ui.debug("sending %s command\n" % cmd)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	867 q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	868 q.update(args)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	869 qs = urllib.urlencode(q)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	870 cu = "%s?%s" % (self.url, qs)
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	871 return urllib.urlopen(cu)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	872
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	873 def branches(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	874 n = " ".join(map(hex, nodes))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	875 d = self.do_cmd("branches", nodes=n).read()
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	876 br = [ map(bin, b.split(" ")) for b in d.splitlines() ]
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	877 return br
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	878
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	879 def between(self, pairs):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	880 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	881 d = self.do_cmd("between", pairs=n).read()
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	882 p = [ map(bin, l.split(" ")) for l in d.splitlines() ]
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	883 return p
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	884
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	885 def changegroup(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	886 n = " ".join(map(hex, nodes))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	887 zd = zlib.decompressobj()
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	888 f = self.do_cmd("changegroup", roots=n)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	889 while 1:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	890 d = f.read(4096)
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	891 if not d:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	892 yield zd.flush()
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	893 break
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	894 yield zd.decompress(d)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	895
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	896 def repository(ui, path=None, create=0):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	897 if path and path[:5] == "hg://":
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	898 return remoterepository(ui, path)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	899 else:
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	900 return localrepository(ui, path, create)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	901
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	902 class ui:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	903 def __init__(self, verbose=False, debug=False, quiet=False):
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	904 self.quiet = quiet and not verbose and not debug
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	905 self.verbose = verbose or debug
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	906 self.debugflag = debug
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	907 def write(self, *args):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	908 for a in args:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	909 sys.stdout.write(str(a))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	910 def prompt(self, msg, pat):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	911 while 1:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	912 sys.stdout.write(msg)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	913 r = sys.stdin.readline()[:-1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	914 if re.match(pat, r):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	915 return r
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	916 def status(self, *msg):
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	917 if not self.quiet: self.write(*msg)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	918 def warn(self, msg):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	919 self.write(*msg)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	920 def note(self, msg):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	921 if self.verbose: self.write(*msg)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	922 def debug(self, msg):
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	923 if self.debugflag: self.write(*msg)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	924 def edit(self, text):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	925 (fd, name) = tempfile.mkstemp("hg")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	926 f = os.fdopen(fd, "w")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	927 f.write(text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	928 f.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	929
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	930 editor = os.environ.get("EDITOR", "vi")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	931 r = os.system("%s %s" % (editor, name))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	932 if r:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	933 raise "Edit failed!"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	934
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	935 t = open(name).read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	936 t = re.sub("(?m)^HG:.*\n", "", t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	937
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	938 return t
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	939
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	940
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	941 class httprangereader:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	942 def __init__(self, url):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	943 self.url = url
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	944 self.pos = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	945 def seek(self, pos):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	946 self.pos = pos
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	947 def read(self, bytes=None):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	948 opener = urllib2.build_opener(byterange.HTTPRangeHandler())
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	949 urllib2.install_opener(opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	950 req = urllib2.Request(self.url)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	951 end = ''
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	952 if bytes: end = self.pos + bytes
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	953 req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	954 f = urllib2.urlopen(req)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	955 return f.read()

Mercurial > hg > pyhgsh

annotate mercurial/hg.py @ 85:58a1a0425c9b