hg/pyhgsh: mercurial/hg.py annotate

annotate mercurial/hg.py @ 192:5d8553352d2e

Changes to network protocol -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Changes to network protocol Stream changes at the delta level rather than at whole delta groups this breaks the protocol - we now send a zero byte delta to indicate the end of a group rather than sending the entire group length up front Fix filename length asymmetry while we're breaking things Fix hidden O(n^2) bug in calculating changegroup list.append(e) is O(n), list + [element] is not Decompress chunks on read in revlog.group() Improve status messages report bytes transferred report nothing to do Deal with /dev/null path brokenness Remove untriggered patch assertion manifest hash: 3eedcfe878561f9eb4adedb04f6be618fb8ae8d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmzlqywK+sNU5EO8RAn0KAJ4z4toWSSGjLoZO6FKWLx/3QbZufACglQgd S48bumc++DnuY1iPSNWKGAI= =lCjx -----END PGP SIGNATURE-----

author	mpm@selenic.com
date	Mon, 30 May 2005 08:03:54 -0800
parents	d7e859cf2f1b
children	2424676edd8c

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

Mercurial > hg > pyhgsh

annotate mercurial/hg.py @ 192:5d8553352d2e