mercurial-scm/hg-stable: mercurial/hg.py annotate

annotate mercurial/hg.py @ 78:85f1f87dc8ff

Add "HG: merge resolve" to editor text for merge

author	mpm@selenic.com
date	Tue, 17 May 2005 01:07:57 -0800
parents	a182f2561c8e
children	837d473d54d5

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

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hg.py @ 78:85f1f87dc8ff