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

annotate mercurial/hg.py @ 611:48c3eb2bf844

* clean up error handling when user requests to use a non file object # HG changeset patch # User shaleh@speakeasy.net # Node ID 1ae21732349f5b6dba2941609a044d9c365a6fb2 # Parent 94744f6fe0e7c19b10fab7eb24249f3eeaa5489a * clean up error handling when user requests to use a non file object - use os.path.exists() to verify the item exists - use os.path.isfile() to check whether the item is a file or not diff -r 94744f6fe0e7 -r 1ae21732349f mercurial/hg.py

author	shaleh@speakeasy.net
date	Mon, 04 Jul 2005 11:20:20 -0800
parents	2acf1f5df2e6
children	d45d1c90032e

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
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	8 import sys, struct, os
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 418 diff changeset	9 import util
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	10 from revlog import *
3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	11 from demandload import *
3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	12 demandload(globals(), "re lock urllib urllib2 transaction time socket")
434 08f00b6494f4 Replace difflib with bdiff for annotate mpm@selenic.com parents: 429 diff changeset	13 demandload(globals(), "tempfile httprangereader bdiff")
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):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	22 t = self.revision(node)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	23 if t[:2] != '\1\n':
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	24 return t
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	25 s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	26 return t[s+2:]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	27
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	28 def readmeta(self, node):
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	29 t = self.revision(node)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	30 if t[:2] != '\1\n':
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	31 return t
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	32 s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	33 mt = t[2:s]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	34 for l in mt.splitlines():
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	35 k, v = l.split(": ", 1)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	36 m[k] = v
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	37 return m
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	38
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	39 def add(self, text, meta, transaction, link, p1=None, p2=None):
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	40 if meta or text[:2] == '\1\n':
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	41 mt = ""
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	42 if meta:
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	43 mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	44 text = "\1\n" + "".join(mt) + "\1\n" + text
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	45 return self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	46
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	47 def annotate(self, node):
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	48
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	49 def decorate(text, rev):
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	50 return ([rev] * len(text.splitlines()), text)
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	51
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	52 def pair(parent, child):
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	53 for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]):
471 4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	54 child[0][b1:b2] = parent[0][a1:a2]
4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	55 return child
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	56
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	57 # find all ancestors
216 201115f2859b hg annotate: actually annotate the given version mpm@selenic.com parents: 210 diff changeset	58 needed = {node:1}
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	59 visit = [node]
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	60 while visit:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	61 n = visit.pop(0)
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	62 for p in self.parents(n):
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	63 if p not in needed:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	64 needed[p] = 1
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	65 visit.append(p)
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	66 else:
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	67 # count how many times we'll use this
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	68 needed[p] += 1
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	69
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	70 # sort by revision which is a topological order
471 4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	71 visit = [ (self.rev(n), n) for n in needed.keys() ]
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	72 visit.sort()
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	73 hist = {}
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	74
471 4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	75 for r,n in visit:
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	76 curr = decorate(self.read(n), self.linkrev(n))
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	77 for p in self.parents(n):
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	78 if p != nullid:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	79 curr = pair(hist[p], curr)
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	80 # trim the history of unneeded revs
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	81 needed[p] -= 1
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	82 if not needed[p]:
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	83 del hist[p]
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	84 hist[n] = curr
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	85
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	86 return zip(hist[n][0], hist[n][1].splitlines(1))
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	87
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	88 class manifest(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	89 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	90 self.mapcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	91 self.listcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	92 self.addlist = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	93 revlog.__init__(self, opener, "00manifest.i", "00manifest.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	94
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 def read(self, node):
313 e75ea4662d81 Minor caching improvement for manifest mpm@selenic.com parents: 312 diff changeset	96 if node == nullid: return {} # don't upset local cache
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 if self.mapcache and self.mapcache[0] == node:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	98 return self.mapcache[1]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 text = self.revision(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	100 map = {}
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	101 flag = {}
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	102 self.listcache = (text, text.splitlines(1))
daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	103 for l in self.listcache[1]:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	104 (f, n) = l.split('\0')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 map[f] = bin(n[:40])
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	106 flag[f] = (n[40:-1] == "x")
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	107 self.mapcache = (node, map, flag)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	108 return map
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	110 def readflags(self, node):
313 e75ea4662d81 Minor caching improvement for manifest mpm@selenic.com parents: 312 diff changeset	111 if node == nullid: return {} # don't upset local cache
358 9f4077d7ef6f [PATCH] manifest.readflags performance buglet mpm@selenic.com parents: 350 diff changeset	112 if not self.mapcache or self.mapcache[0] != node:
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	113 self.read(node)
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	114 return self.mapcache[2]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	115
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	116 def diff(self, a, b):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	117 # 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	118 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	119 d = mdiff.diff(self.listcache[1], self.addlist, 1)
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	120 if mdiff.patch(a, d) != b:
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	121 sys.stderr.write("* sortdiff failed, falling back *\n")
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	122 return mdiff.textdiff(a, b)
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	123 return d
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	124 else:
44 e825a68d7227 Fix occassional diff bug with manifests mpm@selenic.com parents: 40 diff changeset	125 return mdiff.textdiff(a, b)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	126
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	127 def add(self, map, flags, transaction, link, p1=None, p2=None):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	128 files = map.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129 files.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	131 self.addlist = ["%s\000%s%s\n" %
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	132 (f, hex(map[f]), flags[f] and "x" or '')
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	133 for f in files]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	134 text = "".join(self.addlist)
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 n = self.addrevision(text, transaction, link, p1, p2)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	137 self.mapcache = (n, map, flags)
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	138 self.listcache = (text, self.addlist)
140 30ef77113872 Minor safety checks to manifest diff mpm@selenic.com parents: 118 diff changeset	139 self.addlist = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141 return n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	142
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143 class changelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	144 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	145 revlog.__init__(self, opener, "00changelog.i", "00changelog.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	146
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	147 def extract(self, text):
37 a8811676c85a Move hex/bin bits to revlog mpm@selenic.com parents: 33 diff changeset	148 if not text:
40 5f87633e1ea2 Date is an int as a string in changelog mpm@selenic.com parents: 37 diff changeset	149 return (nullid, "", "0", [], "")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	150 last = text.index("\n\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	151 desc = text[last + 2:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	152 l = text[:last].splitlines()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	153 manifest = bin(l[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	154 user = l[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	155 date = l[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 files = l[3:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 return (manifest, user, date, files, desc)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	158
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159 def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 return self.extract(self.revision(node))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	161
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	162 def add(self, manifest, list, desc, transaction, p1=None, p2=None,
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	163 user=None, date=None):
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	164 date = date or "%d %d" % (time.time(), time.timezone)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	165 list.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	166 l = [hex(manifest), user, date] + list + ["", desc]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	167 text = "\n".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	168 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	169
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	170 class dirstate:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	171 def __init__(self, opener, ui, root):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	172 self.opener = opener
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	173 self.root = root
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	174 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	175 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	176 self.map = None
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	177 self.pl = None
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	178 self.copies = {}
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	179
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	180 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	181 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	182 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	183
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	184 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	185 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	186 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	187 except TypeError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	188 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	189 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	190
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	191 def __contains__(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	192 if not self.map: self.read()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	193 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	194
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	195 def parents(self):
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	196 if not self.pl:
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	197 self.read()
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	198 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	199
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	200 def setparents(self, p1, p2 = nullid):
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	201 self.dirty = 1
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	202 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	203
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	204 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	205 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	206 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	207 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	208 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	209
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	210 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 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	212
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213 self.map = {}
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	214 self.pl = [nullid, nullid]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	215 try:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	216 st = self.opener("dirstate").read()
311 3b17056b72dc fix KeyErrors from reading empty dirstate mpm@selenic.com parents: 308 diff changeset	217 if not st: return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	218 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	219
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	220 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	221
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	222 pos = 40
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	223 while pos < len(st):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	224 e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	225 l = e[4]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	226 pos += 17
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	227 f = st[pos:pos + l]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	228 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	229 f, c = f.split('\0')
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	230 self.copies[f] = c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	231 self.map[f] = e[:4]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	232 pos += l
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	233
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	234 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	235 self.read()
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	236 self.dirty = 1
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	237 self.copies[dest] = source
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	238
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	239 def copied(self, file):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	240 return self.copies.get(file, None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	241
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	242 def update(self, files, state):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	243 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	244 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	245 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	246 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	247 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	248
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	249 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	250 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	251 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	252 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	253 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	254 self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	255 else:
253 2da0a56aa1fd Remove invalid state from dirstate mpm@selenic.com parents: 251 diff changeset	256 s = os.stat(os.path.join(self.root, f))
2da0a56aa1fd Remove invalid state from dirstate mpm@selenic.com parents: 251 diff changeset	257 self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	258
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	259 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	260 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	261 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	262 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	263 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	264 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	265 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	266 except KeyError:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	267 self.ui.warn("not in dirstate: %s!\n" % f)
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	268 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	270 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	271 self.map = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 self.dirty = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	273
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	274 def write(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	275 st = self.opener("dirstate", "w")
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	276 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	277 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	278 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	279 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	280 f = f + "\0" + c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	281 e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	282 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	283 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	284
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	285 def changes(self, files, ignore):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	286 self.read()
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	287 dc = self.map.copy()
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	288 lookup, changed, added, unknown = [], [], [], []
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	289
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	290 # compare all files by default
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	291 if not files: files = [self.root]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	292
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	293 # recursive generator of all files listed
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	294 def walk(files):
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 553 diff changeset	295 for f in util.unique(files):
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	296 f = os.path.join(self.root, f)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	297 if os.path.isdir(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	298 for dir, subdirs, fl in os.walk(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	299 d = dir[len(self.root) + 1:]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	300 if ".hg" in subdirs: subdirs.remove(".hg")
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	301 for fn in fl:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	302 fn = util.pconvert(os.path.join(d, fn))
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	303 yield fn
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	304 else:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	305 yield f[len(self.root) + 1:]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	306
556 f6c6fa15ff70 Move dirstate.uniq to util.unique mpm@selenic.com parents: 553 diff changeset	307 for fn in util.unique(walk(files)):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	308 try: s = os.stat(os.path.join(self.root, fn))
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	309 except: continue
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	310
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	311 if fn in dc:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	312 c = dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	313 del dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	314
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	315 if c[0] == 'm':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	316 changed.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	317 elif c[0] == 'a':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	318 added.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	319 elif c[0] == 'r':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	320 unknown.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	321 elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	322 changed.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	323 elif c[1] != s.st_mode or c[3] != s.st_mtime:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	324 lookup.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	325 else:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	326 if not ignore(fn): unknown.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	327
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	328 return (lookup, changed, added, dc.keys(), unknown)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	329
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	330 # used to avoid circular references so destructors work
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	331 def opener(base):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	332 p = base
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	333 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	334 if p[:7] == "http://":
6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	335 f = os.path.join(p, urllib.quote(path))
372 4b0f562c61f4 Move httprangereader into its own file mpm@selenic.com parents: 363 diff changeset	336 return httprangereader.httprangereader(f)
15 6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	337
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	338 f = os.path.join(p, path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	339
292 09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	340 mode += "b" # for that other OS
09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	341
09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	342 if mode[0] != "r":
110 c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	343 try:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	344 s = os.stat(f)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	345 except OSError:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	346 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	347 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	348 os.makedirs(d)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	349 else:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	350 if s.st_nlink > 1:
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	351 file(f + ".tmp", "wb").write(file(f, "rb").read())
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	352 util.rename(f+".tmp", f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	353
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	354 return file(f, mode)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	355
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	356 return o
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	357
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	358 class RepoError(Exception): pass
81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	359
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	360 class localrepository:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	361 def __init__(self, ui, path=None, create=0):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	362 self.remote = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	363 if path and path[:7] == "http://":
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	364 self.remote = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	365 self.path = path
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	366 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	367 if not path:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	368 p = os.getcwd()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	369 while not os.path.isdir(os.path.join(p, ".hg")):
420 dbe86d465e09 [PATCH] Repo locator fix for the other `OS' mpm@selenic.com parents: 419 diff changeset	370 oldp = p
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	371 p = os.path.dirname(p)
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	372 if p == oldp: raise RepoError("no repo found")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	373 path = p
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	374 self.path = os.path.join(path, ".hg")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	375
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	376 if not create and not os.path.isdir(self.path):
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	377 raise RepoError("repository %s not found" % self.path)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	378
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	379 self.root = path
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	380 self.ui = ui
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	382 if create:
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	383 os.mkdir(self.path)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	384 os.mkdir(self.join("data"))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	385
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	386 self.opener = opener(self.path)
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	387 self.wopener = opener(self.root)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	388 self.manifest = manifest(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	389 self.changelog = changelog(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	390 self.ignorelist = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	391 self.tagscache = None
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	392 self.nodetagscache = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	393
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	394 if not self.remote:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	395 self.dirstate = dirstate(self.opener, ui, self.root)
337 c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	396 try:
c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	397 self.ui.readconfig(self.opener("hgrc"))
c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	398 except IOError: pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	399
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	400 def ignore(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	401 if self.ignorelist is None:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	402 self.ignorelist = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	403 try:
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	404 l = file(self.wjoin(".hgignore"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	405 for pat in l:
9 b4d0c3786ad3 Ignore empty ignore patterns mpm@selenic.com parents: 4 diff changeset	406 if pat != "\n":
419 28511fc21073 [PATCH] file seperator handling for the other 'OS' mpm@selenic.com parents: 418 diff changeset	407 self.ignorelist.append(re.compile(util.pconvert(pat[:-1])))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	408 except IOError: pass
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	409 for pat in self.ignorelist:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	410 if pat.search(f): return True
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	411 return False
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	412
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	413 def hook(self, name, **args):
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	414 s = self.ui.config("hooks", name)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	415 if s:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	416 self.ui.note("running hook %s: %s\n" % (name, s))
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	417 old = {}
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	418 for k, v in args.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	419 k = k.upper()
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	420 old[k] = os.environ.get(k, None)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	421 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	422
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	423 r = os.system(s)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	424
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	425 for k, v in old.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	426 if v != None:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	427 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	428 else:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	429 del os.environ[k]
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	430
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	431 if r:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	432 self.ui.warn("abort: %s hook failed with status %d!\n" %
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	433 (name, r))
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	434 return False
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	435 return True
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	436
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	437 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	438 '''return a mapping of tag to node'''
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	439 if not self.tagscache:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	440 self.tagscache = {}
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	441 def addtag(self, k, n):
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	442 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	443 bin_n = bin(n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	444 except TypeError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	445 bin_n = ''
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	446 self.tagscache[k.strip()] = bin_n
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	447
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	448 try:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	449 # read each head of the tags file, ending with the tip
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	450 # and add each tag found to the map, with "newer" ones
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	451 # taking precedence
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	452 fl = self.file(".hgtags")
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	453 h = fl.heads()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	454 h.reverse()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	455 for r in h:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	456 for l in fl.revision(r).splitlines():
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	457 if l:
385 e9e1efd5291c Fixed problems with extra spaces around tags in .hgtags Thomas Arendsen Hein <thomas@intevation.de> parents: 383 diff changeset	458 n, k = l.split(" ", 1)
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	459 addtag(self, k, n)
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	460 except KeyError:
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	461 pass
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	462
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	463 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	464 f = self.opener("localtags")
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	465 for l in f:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	466 n, k = l.split(" ", 1)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	467 addtag(self, k, n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	468 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	469 pass
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	470
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	471 self.tagscache['tip'] = self.changelog.tip()
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	472
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	473 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	474
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	475 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	476 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	477 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	478 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	479 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	480 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	481 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	482 r = -2 # sort to the beginning of the list if unknown
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	483 l.append((r,t,n))
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	484 l.sort()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	485 return [(t,n) for r,t,n in l]
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	486
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	487 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	488 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	489 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	490 self.nodetagscache = {}
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	491 for t,n in self.tags().items():
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	492 self.nodetagscache.setdefault(n,[]).append(t)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	493 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	494
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	495 def lookup(self, key):
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	496 try:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	497 return self.tags()[key]
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	498 except KeyError:
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	499 return self.changelog.lookup(key)
a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	500
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	502 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	503
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	504 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	505 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	506
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	507 def file(self, f):
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	508 if f[0] == '/': f = f[1:]
144 ea9188538222 Fix transaction handling bug by reverting fileopener change mpm@selenic.com parents: 140 diff changeset	509 return filelog(self.opener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	510
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	511 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	512 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	513
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	514 def transaction(self):
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	515 # save dirstate for undo
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	516 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	517 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	518 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	519 ds = ""
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	520 self.opener("undo.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	521
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 579 diff changeset	522 return transaction.transaction(self.ui.warn,
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 579 diff changeset	523 self.opener, self.join("journal"),
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	524 self.join("undo"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	525
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	526 def recover(self):
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	527 lock = self.lock()
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	528 if os.path.exists(self.join("journal")):
501 7ea1c88792bf Better messages for rollback and undo mpm@selenic.com parents: 499 diff changeset	529 self.ui.status("rolling back interrupted transaction\n")
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	530 return transaction.rollback(self.opener, self.join("journal"))
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	531 else:
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	532 self.ui.warn("no interrupted transaction available\n")
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	533
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	534 def undo(self):
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	535 lock = self.lock()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	536 if os.path.exists(self.join("undo")):
501 7ea1c88792bf Better messages for rollback and undo mpm@selenic.com parents: 499 diff changeset	537 self.ui.status("rolling back last transaction\n")
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	538 transaction.rollback(self.opener, self.join("undo"))
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	539 self.dirstate = None
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	540 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	541 self.dirstate = dirstate(self.opener, self.ui, self.root)
163 f38c90953c2c Make undo and recover friendlier mpm@selenic.com parents: 162 diff changeset	542 else:
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	543 self.ui.warn("no undo information available\n")
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	544
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	545 def lock(self, wait = 1):
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	546 try:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	547 return lock.lock(self.join("lock"), 0)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	548 except lock.LockHeld, inst:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	549 if wait:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	550 self.ui.warn("waiting for lock held by %s\n" % inst.args[0])
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	551 return lock.lock(self.join("lock"), wait)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	552 raise inst
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	553
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	554 def rawcommit(self, files, text, user, date, p1=None, p2=None):
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	555 orig_parent = self.dirstate.parents()[0] or nullid
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 442 diff changeset	556 p1 = p1 or self.dirstate.parents()[0] or nullid
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 442 diff changeset	557 p2 = p2 or self.dirstate.parents()[1] or nullid
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	558 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	559 c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	560 m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	561 mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	562 m2 = self.manifest.read(c2[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	563
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	564 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	565 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	566 else:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	567 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	568
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	569 tr = self.transaction()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	570 mm = m1.copy()
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	571 mfm = mf1.copy()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	572 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	573 for f in files:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	574 try:
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	575 t = self.wfile(f).read()
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	576 tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	577 r = self.file(f)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	578 mfm[f] = tm
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	579 mm[f] = r.add(t, {}, tr, linkrev,
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	580 m1.get(f, nullid), m2.get(f, nullid))
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	581 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	582 self.dirstate.update([f], "n")
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	583 except IOError:
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	584 try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	585 del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	586 del mfm[f]
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	587 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	588 self.dirstate.forget([f])
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	589 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	590 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	591 pass
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	592
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	593 mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	594 user = user or self.ui.username()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	595 n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	596 tr.close()
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	597 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	598 self.dirstate.setparents(n, nullid)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	599
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 314 diff changeset	600 def commit(self, files = None, text = "", user = None, date = None):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	601 commit = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	602 remove = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	603 if files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	604 for f in files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	605 s = self.dirstate.state(f)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	606 if s in 'nmai':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	607 commit.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	608 elif s == 'r':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	609 remove.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	610 else:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	611 self.ui.warn("%s not tracked!\n" % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	612 else:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	613 (c, a, d, u) = self.changes(None, None)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	614 commit = c + a
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	615 remove = d
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	616
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	617 if not commit and not remove:
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	618 self.ui.status("nothing changed\n")
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	619 return
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	620
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	621 if not self.hook("precommit"):
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	622 return 1
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	623
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	624 p1, p2 = self.dirstate.parents()
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	625 c1 = self.changelog.read(p1)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	626 c2 = self.changelog.read(p2)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	627 m1 = self.manifest.read(c1[0])
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	628 mf1 = self.manifest.readflags(c1[0])
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	629 m2 = self.manifest.read(c2[0])
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	630 lock = self.lock()
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	631 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	632
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	633 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	634 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	635 linkrev = self.changelog.count()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	636 commit.sort()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	637 for f in commit:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	638 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	639 try:
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	640 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
418 0446f698d38e Minor tweak to binary mode patch mpm@selenic.com parents: 417 diff changeset	641 t = self.wfile(f).read()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	642 except IOError:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	643 self.warn("trouble committing %s!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	644 raise
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	645
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	646 meta = {}
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	647 cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	648 if cp:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	649 meta["copy"] = cp
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	650 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	651 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"]))
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	652
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	653 r = self.file(f)
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	654 fp1 = m1.get(f, nullid)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	655 fp2 = m2.get(f, nullid)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	656 new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	657
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	658 # update manifest
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	659 m1.update(new)
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	660 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	661 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	662 del m1[f]
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	663 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	664
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	665 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	666 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	667 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	668
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	669 if not text:
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	670 edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	671 edittext += "".join(["HG: changed %s\n" % f for f in new])
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	672 edittext += "".join(["HG: removed %s\n" % f for f in remove])
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	673 edittext = self.ui.edit(edittext)
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	674 if not edittext.rstrip():
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	675 return 1
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	676 text = edittext
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	677
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	678 user = user or self.ui.username()
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 314 diff changeset	679 n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	680
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	681 if not self.hook("commit", node=hex(n)):
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	682 return 1
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	683
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	684 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	685
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	686 self.dirstate.setparents(n)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	687 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	688 self.dirstate.forget(remove)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	689
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	690 def changes(self, node1, node2, files=None):
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	691 mf2, u = None, []
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	692
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	693 def fcmp(fn, mf):
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	694 t1 = self.wfile(fn).read()
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	695 t2 = self.file(fn).revision(mf[fn])
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	696 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	697
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	698 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	699 if not node2:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	700 l, c, a, d, u = self.dirstate.changes(files, self.ignore)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	701
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	702 # are we comparing working dir against its parent?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	703 if not node1:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	704 if l:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	705 # do a full compare of any files that might have changed
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	706 change = self.changelog.read(self.dirstate.parents()[0])
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	707 mf2 = self.manifest.read(change[0])
548 e2e963e255fd Fix braindamage in repo.changes mpm@selenic.com parents: 547 diff changeset	708 for f in l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	709 if fcmp(f, mf2):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	710 c.append(f)
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	711
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	712 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	713 l.sort()
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	714
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	715 return (c, a, d, u)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	716
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	717 # are we comparing working dir against non-tip?
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	718 # generate a pseudo-manifest for the working dir
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	719 if not node2:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	720 if not mf2:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	721 change = self.changelog.read(self.dirstate.parents()[0])
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	722 mf2 = self.manifest.read(change[0]).copy()
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	723 for f in a + c + l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	724 mf2[f] = ""
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	725 for f in d:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	726 if f in mf2: del mf2[f]
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	727 else:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	728 change = self.changelog.read(node2)
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	729 mf2 = self.manifest.read(change[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	730
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	731 # flush lists from dirstate before comparing manifests
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	732 c, a = [], []
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	733
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	734 change = self.changelog.read(node1)
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	735 mf1 = self.manifest.read(change[0]).copy()
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	736
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	737 for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	738 if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	739 if mf1[fn] != mf2[fn]:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	740 if mf2[fn] != "" or fcmp(fn, mf1):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	741 c.append(fn)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	742 del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	743 else:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	744 a.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	745
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	746 d = mf1.keys()
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	747
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	748 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	749 l.sort()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	750
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	751 return (c, a, d, u)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	752
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	753 def add(self, list):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	754 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	755 p = self.wjoin(f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	756 if not os.path.exists(p):
48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	757 self.ui.warn("%s does not exist!\n" % f)
48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	758 elif not os.path.isfile(p):
48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	759 self.ui.warn("%s not added: mercurial only supports files currently\n" % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	760 elif self.dirstate.state(f) == 'n':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	761 self.ui.warn("%s already tracked!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	762 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	763 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	764
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	765 def forget(self, list):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	766 for f in list:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	767 if self.dirstate.state(f) not in 'ai':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	768 self.ui.warn("%s not added!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	769 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	770 self.dirstate.forget([f])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	771
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	772 def remove(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	773 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	774 p = self.wjoin(f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	775 if os.path.exists(p):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	776 self.ui.warn("%s still exists!\n" % f)
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	777 elif self.dirstate.state(f) == 'a':
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	778 self.ui.warn("%s never committed!\n" % f)
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	779 self.dirstate.forget(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	780 elif f not in self.dirstate:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	781 self.ui.warn("%s not tracked!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	782 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	783 self.dirstate.update([f], "r")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	784
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	785 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	786 p = self.wjoin(dest)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	787 if not os.path.exists(dest):
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	788 self.ui.warn("%s does not exist!\n" % dest)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	789 elif not os.path.isfile(dest):
48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	790 self.ui.warn("copy failed: %s is not a file\n" % dest)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	791 else:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	792 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	793 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	794 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	795
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	796 def heads(self):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	797 return self.changelog.heads()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	798
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	799 def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	800 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	801 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	802 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	803 t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	804 while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	805 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	806 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	807 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	808 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	809 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	810 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	811
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	812 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	813 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	814
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	815 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	816 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	817 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	818
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	819 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	820 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	821 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	822 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	823 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	824 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	825 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	826
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	827 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	828
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	829 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	830
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	831 def newer(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	832 m = {}
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	833 nl = []
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	834 pm = {}
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	835 cl = self.changelog
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	836 t = l = cl.count()
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	837
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	838 # find the lowest numbered node
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	839 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	840 l = min(l, cl.rev(n))
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	841 m[n] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	842
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	843 for i in xrange(l, t):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	844 n = cl.node(i)
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	845 if n in m: # explicitly listed
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	846 pm[n] = 1
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	847 nl.append(n)
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	848 continue
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	849 for p in cl.parents(n):
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	850 if p in pm: # parent listed
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	851 pm[n] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	852 nl.append(n)
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	853 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	854
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	855 return nl
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	856
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	857 def findincoming(self, remote):
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	858 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	859 search = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	860 fetch = []
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	861 base = {}
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	862 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	863 seenbranch = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	864
190 3dd5ce2fddb6 merge: short-circuit search for merge into empty repo mpm@selenic.com parents: 187 diff changeset	865 # 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	866 if self.changelog.tip() == nullid:
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	867 self.ui.status("requesting all changes\n")
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	868 return [nullid]
190 3dd5ce2fddb6 merge: short-circuit search for merge into empty repo mpm@selenic.com parents: 187 diff changeset	869
3dd5ce2fddb6 merge: short-circuit search for merge into empty repo mpm@selenic.com parents: 187 diff changeset	870 # otherwise, assume we're closer to the tip than the root
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	871 # and start by examining the heads
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	872 self.ui.status("searching for changes\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	873 heads = remote.heads()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	874 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	875 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	876 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	877 unknown.append(h)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	878
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	879 if not unknown:
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	880 return None
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	881
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	882 rep = {}
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	883 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	884
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	885 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	886 # a 'branch' here is a linear segment of history, with four parts:
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	887 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	888 # (a branch always has two parents (or none) by definition)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	889 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	890 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	891 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	892 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	893 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	894 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	895 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	896
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	897 self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	898 if n[0] == nullid:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	899 break
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	900 if n in seenbranch:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	901 self.ui.debug("branch already found\n")
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	902 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	903 if n[1] and n[1] in m: # do we know the base?
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	904 self.ui.debug("found incomplete branch %s:%s\n"
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	905 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	906 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	907 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	908 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	909 if n[1] not in seen and n[1] not in fetch:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	910 if n[2] in m and n[3] in m:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	911 self.ui.debug("found new changeset %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	912 short(n[1]))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	913 fetch.append(n[1]) # earliest unknown
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	914 base[n[2]] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	915 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	916
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	917 for a in n[2:4]:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	918 if a not in rep:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	919 r.append(a)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	920 rep[a] = 1
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	921
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	922 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	923
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	924 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	925 reqcnt += 1
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	926 self.ui.debug("request %d: %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	927 (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	928 for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	929 for b in remote.branches(r[p:p+10]):
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	930 self.ui.debug("received %s:%s\n" %
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	931 (short(b[0]), short(b[1])))
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	932 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	933 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	934
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	935 # do binary search on the branches we found
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	936 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	937 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	938 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	939 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	940 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	941 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	942 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	943 for i in l:
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	944 self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	945 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	946 if f <= 2:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	947 self.ui.debug("found new branch changeset %s\n" %
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	948 short(p))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	949 fetch.append(p)
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	950 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	951 else:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	952 self.ui.debug("narrowed branch search to %s:%s\n"
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	953 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	954 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	955 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	956 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	957
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	958 # sanity check our fetch list
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	959 for f in fetch:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	960 if f in m:
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	961 raise RepoError("already have changeset " + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	962
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	963 if base.keys() == [nullid]:
514 874e577e332e change unrelated repository error to a warning mpm@selenic.com parents: 511 diff changeset	964 self.ui.warn("warning: pulling from an unrelated repository!\n")
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	965
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	966 self.ui.note("adding new changesets starting at " +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	967 " ".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	968
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	969 self.ui.debug("%d total queries\n" % reqcnt)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	970
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	971 return fetch
873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	972
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	973 def changegroup(self, basenodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	974 nodes = self.newer(basenodes)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	975
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	976 # construct the link map
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	977 linkmap = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	978 for n in nodes:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	979 linkmap[self.changelog.rev(n)] = n
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	980
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	981 # construct a list of all changed files
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	982 changed = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	983 for n in nodes:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	984 c = self.changelog.read(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	985 for f in c[3]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	986 changed[f] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	987 changed = changed.keys()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	988 changed.sort()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	989
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	990 # the changegroup is changesets + manifests + all file revs
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	991 revs = [ self.changelog.rev(n) for n in nodes ]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	992
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	993 for y in self.changelog.group(linkmap): yield y
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	994 for y in self.manifest.group(linkmap): yield y
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	995 for f in changed:
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	996 yield struct.pack(">l", len(f) + 4) + f
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	997 g = self.file(f).group(linkmap)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	998 for y in g:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	999 yield y
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1000
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1001 def addchangegroup(self, generator):
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1002
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1003 class genread:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1004 def __init__(self, generator):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1005 self.g = generator
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1006 self.buf = ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1007 def read(self, l):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1008 while l > len(self.buf):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1009 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1010 self.buf += self.g.next()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1011 except StopIteration:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1012 break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1013 d, self.buf = self.buf[:l], self.buf[l:]
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1014 return d
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1015
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1016 def getchunk():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1017 d = source.read(4)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1018 if not d: return ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1019 l = struct.unpack(">l", d)[0]
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1020 if l <= 4: return ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1021 return source.read(l - 4)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1022
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1023 def getgroup():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1024 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1025 c = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1026 if not c: break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1027 yield c
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1028
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1029 def csmap(x):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1030 self.ui.debug("add changeset %s\n" % short(x))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1031 return self.changelog.count()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1032
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1033 def revmap(x):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1034 return self.changelog.rev(x)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1035
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1036 if not generator: return
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1037 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1038
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1039 source = genread(generator)
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1040 lock = self.lock()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1041 tr = self.transaction()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1042
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1043 # pull off the changeset group
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1044 self.ui.status("adding changesets\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1045 co = self.changelog.tip()
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 223 diff changeset	1046 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1047 changesets = self.changelog.rev(cn) - self.changelog.rev(co)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1048
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1049 # pull off the manifest group
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1050 self.ui.status("adding manifests\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1051 mm = self.manifest.tip()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1052 mo = self.manifest.addgroup(getgroup(), revmap, tr)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1053
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1054 # process the files
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1055 self.ui.status("adding file revisions\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1056 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1057 f = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1058 if not f: break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1059 self.ui.debug("adding %s revisions\n" % f)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1060 fl = self.file(f)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1061 o = fl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1062 n = fl.addgroup(getgroup(), revmap, tr)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1063 revisions += fl.count() - o
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1064 files += 1
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1065
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1066 self.ui.status(("modified %d files, added %d changesets" +
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1067 " and %d new revisions\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1068 % (files, changesets, revisions))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1069
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1070 tr.close()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1071 return
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1072
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1073 def update(self, node, allow=False, force=False, choose=None,
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1074 moddirstate=True):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1075 pl = self.dirstate.parents()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1076 if not force and pl[1] != nullid:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1077 self.ui.warn("aborting: outstanding uncommitted merges\n")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1078 return
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1079
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1080 p1, p2 = pl[0], node
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1081 pa = self.changelog.ancestor(p1, p2)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1082 m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1083 m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1084 man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1085 m1 = self.manifest.read(m1n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1086 mf1 = self.manifest.readflags(m1n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1087 m2 = self.manifest.read(m2n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1088 mf2 = self.manifest.readflags(m2n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1089 ma = self.manifest.read(man)
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: 408 diff changeset	1090 mfa = self.manifest.readflags(man)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1091
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1092 (c, a, d, u) = self.changes(None, None)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1093
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1094 # is this a jump, or a merge? i.e. is there a linear path
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1095 # from p1 to p2?
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1096 linear_path = (pa == p1 or pa == p2)
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1097
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1098 # resolve the manifest to determine which files
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1099 # we care about merging
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1100 self.ui.note("resolving manifests\n")
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1101 self.ui.debug(" ancestor %s local %s remote %s\n" %
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1102 (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1103
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1104 merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1105 get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1106 remove = []
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1107 mark = {}
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1108
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1109 # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1110 mw = m1.copy()
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1111 mfw = mf1.copy()
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1112 umap = dict.fromkeys(u)
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1113
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1114 for f in a + c + u:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1115 mw[f] = ""
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1116 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1117
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1118 for f in d:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1119 if f in mw: del mw[f]
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1120
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1121 # If we're jumping between revisions (as opposed to merging),
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1122 # and if neither the working directory nor the target rev has
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1123 # the file, then we need to remove it from the dirstate, to
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1124 # prevent the dirstate from listing the file when it is no
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1125 # longer in the manifest.
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1126 if moddirstate and linear_path and f not in m2:
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1127 self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1128
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1129 # Compare manifests
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1130 for f, n in mw.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1131 if choose and not choose(f): continue
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1132 if f in m2:
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1133 s = 0
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1134
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1135 # is the wfile new since m1, and match m2?
428 183c87d4e1a0 Fix typo in merging new files mpm@selenic.com parents: 421 diff changeset	1136 if f not in m1:
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1137 t1 = self.wfile(f).read()
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1138 t2 = self.file(f).revision(m2[f])
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1139 if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1140 mark[f] = 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1141 n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1142 del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1143
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1144 # are files different?
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1145 if n != m2[f]:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1146 a = ma.get(f, nullid)
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1147 # are both different from the ancestor?
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1148 if n != a and m2[f] != a:
273 4f8174389001 merge: Fix bug where we overwrote local when local was newer mpm@selenic.com parents: 263 diff changeset	1149 self.ui.debug(" %s versions differ, resolve\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1150 # merge executable bits
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1151 # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1152 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1153 mode = ((a^b) \| (a^c)) ^ a
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1154 merge[f] = (m1.get(f, nullid), m2[f], mode)
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1155 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1156 # are we clobbering?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1157 # is remote's version newer?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1158 # or are we going back in time?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1159 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
273 4f8174389001 merge: Fix bug where we overwrote local when local was newer mpm@selenic.com parents: 263 diff changeset	1160 self.ui.debug(" remote %s is newer, get\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1161 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1162 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1163 else:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1164 mark[f] = 1
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1165 elif f in umap:
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1166 # this unknown file is the same as the checkout
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1167 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1168
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1169 if not s and mfw[f] != mf2[f]:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1170 if force:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1171 self.ui.debug(" updating permissions for %s\n" % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1172 util.set_exec(self.wjoin(f), mf2[f])
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1173 else:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1174 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1175 mode = ((a^b) \| (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1176 if mode != b:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1177 self.ui.debug(" updating permissions for %s\n" % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1178 util.set_exec(self.wjoin(f), mode)
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1179 mark[f] = 1
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1180 del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1181 elif f in ma:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1182 if not force and n != ma[f]:
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1183 r = ""
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1184 if linear_path or allow:
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1185 r = self.ui.prompt(
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1186 (" local changed %s which remote deleted\n" % f) +
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1187 "(k)eep or (d)elete?", "[kd]", "k")
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1188 if r == "d":
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1189 remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1190 else:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1191 self.ui.debug("other deleted %s\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1192 remove.append(f) # other deleted it
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1193 else:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1194 if n == m1.get(f, nullid): # same as parent
383 4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1195 if p2 == pa: # going backwards?
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1196 self.ui.debug("remote deleted %s\n" % f)
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1197 remove.append(f)
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1198 else:
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1199 self.ui.debug("local created %s, keeping\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1200 else:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1201 self.ui.debug("working dir created %s, keeping\n" % f)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1202
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1203 for f, n in m2.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1204 if choose and not choose(f): continue
256 649ed23e4661 minor fixes for update() mpm@selenic.com parents: 254 diff changeset	1205 if f[0] == "/": continue
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1206 if not force and f in ma and n != ma[f]:
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1207 r = ""
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1208 if linear_path or allow:
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1209 r = self.ui.prompt(
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1210 ("remote changed %s which local deleted\n" % f) +
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1211 "(k)eep or (d)elete?", "[kd]", "k")
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1212 if r == "d": remove.append(f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1213 else:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1214 self.ui.debug("remote created %s\n" % f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1215 get[f] = n
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1216
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1217 del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1218
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1219 if force:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1220 for f in merge:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1221 get[f] = merge[f][1]
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1222 merge = {}
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1223
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1224 if linear_path:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1225 # we don't need to do any magic, just jump to the new rev
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1226 mode = 'n'
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1227 p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1228 else:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1229 if not allow:
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1230 self.ui.status("this update spans a branch" +
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1231 " affecting the following files:\n")
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1232 fl = merge.keys() + get.keys()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1233 fl.sort()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1234 for f in fl:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1235 cf = ""
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1236 if f in merge: cf = " (resolve)"
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1237 self.ui.status(" %s%s\n" % (f, cf))
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1238 self.ui.warn("aborting update spanning branches!\n")
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1239 self.ui.status("(use update -m to perform a branch merge)\n")
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1240 return 1
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1241 # we have to remember what files we needed to get/change
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1242 # because any file that's different from either one of its
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1243 # parents must be in the changeset
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1244 mode = 'm'
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1245 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1246 self.dirstate.update(mark.keys(), "m")
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1247
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1248 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1249 self.dirstate.setparents(p1, p2)
191 d7e859cf2f1b merge: add count of new manifests, files, and revisions mpm@selenic.com parents: 190 diff changeset	1250
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1251 # get the files we don't need to change
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1252 files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1253 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1254 for f in files:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1255 if f[0] == "/": continue
273 4f8174389001 merge: Fix bug where we overwrote local when local was newer mpm@selenic.com parents: 263 diff changeset	1256 self.ui.note("getting %s\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1257 t = self.file(f).read(get[f])
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1258 try:
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	1259 self.wfile(f, "w").write(t)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1260 except IOError:
297 0dbcf3c9ff20 Fixed usage of removed variable 'wp'. Thomas Arendsen Hein <thomas@intevation.de> parents: 292 diff changeset	1261 os.makedirs(os.path.dirname(self.wjoin(f)))
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	1262 self.wfile(f, "w").write(t)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1263 util.set_exec(self.wjoin(f), mf2[f])
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1264 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1265 self.dirstate.update([f], mode)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1266
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1267 # merge the tricky bits
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1268 files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1269 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1270 for f in files:
256 649ed23e4661 minor fixes for update() mpm@selenic.com parents: 254 diff changeset	1271 self.ui.status("merging %s\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1272 m, o, flag = merge[f]
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1273 self.merge3(f, m, o)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1274 util.set_exec(self.wjoin(f), flag)
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1275 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1276 self.dirstate.update([f], 'm')
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1277
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1278 for f in remove:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1279 self.ui.note("removing %s\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1280 os.unlink(f)
578 e33c85d2812a Remove empty directories on update mpm@selenic.com parents: 576 diff changeset	1281 # try removing directories that might now be empty
e33c85d2812a Remove empty directories on update mpm@selenic.com parents: 576 diff changeset	1282 try: os.removedirs(os.path.dirname(f))
e33c85d2812a Remove empty directories on update mpm@selenic.com parents: 576 diff changeset	1283 except: pass
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1284 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1285 if mode == 'n':
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1286 self.dirstate.forget(remove)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1287 else:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1288 self.dirstate.update(remove, 'r')
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1289
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1290 def merge3(self, fn, my, other):
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1291 """perform a 3-way merge in the working directory"""
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	1292
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1293 def temp(prefix, node):
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1294 pre = "%s~%s." % (os.path.basename(fn), prefix)
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1295 (fd, name) = tempfile.mkstemp("", pre)
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	1296 f = os.fdopen(fd, "wb")
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1297 f.write(fl.revision(node))
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1298 f.close()
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1299 return name
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1300
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1301 fl = self.file(fn)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1302 base = fl.ancestor(my, other)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1303 a = self.wjoin(fn)
346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1304 b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1305 c = temp("other", other)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1306
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1307 self.ui.note("resolving %s\n" % fn)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1308 self.ui.debug("file %s: other %s ancestor %s\n" %
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1309 (fn, short(other), short(base)))
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1310
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	1311 cmd = self.ui.config("ui", "merge") or \
d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	1312 os.environ.get("HGMERGE", "hgmerge")
240 737c66b68290 Replace tkmerge with hgmerge mpm@selenic.com parents: 232 diff changeset	1313 r = os.system("%s %s %s %s" % (cmd, a, b, c))
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1314 if r:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1315 self.ui.warn("merging %s failed!\n" % fn)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1316
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1317 os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1318 os.unlink(c)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1319
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1320 def verify(self):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1321 filelinkrevs = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1322 filenodes = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1323 changesets = revisions = files = 0
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1324 errors = 0
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1325
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1326 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1327 self.ui.status("checking changesets\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1328 for i in range(self.changelog.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1329 changesets += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1330 n = self.changelog.node(i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1331 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1332 self.ui.warn("duplicate changeset at revision %d\n" % i)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1333 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1334 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1335
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1336 for p in self.changelog.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1337 if p not in self.changelog.nodemap:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1338 self.ui.warn("changeset %s has unknown parent %s\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1339 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1340 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1341 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1342 changes = self.changelog.read(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1343 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1344 self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1345 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1346
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1347 for f in changes[3]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1348 filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1349
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1350 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1351 self.ui.status("checking manifests\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1352 for i in range(self.manifest.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1353 n = self.manifest.node(i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1354 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1355 self.ui.warn("duplicate manifest at revision %d\n" % i)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1356 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1357 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1358
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1359 for p in self.manifest.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1360 if p not in self.manifest.nodemap:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1361 self.ui.warn("manifest %s has unknown parent %s\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1362 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1363 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1364
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1365 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1366 delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1367 except KeyboardInterrupt:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 579 diff changeset	1368 self.ui.warn("aborted")
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1369 sys.exit(0)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1370 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1371 self.ui.warn("unpacking manifest %s: %s\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1372 % (short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1373 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1374
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1375 ff = [ l.split('\0') for l in delta.splitlines() ]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1376 for f, fn in ff:
284 d7c2efd0b541 verify: don't die from new permission bits mpm@selenic.com parents: 279 diff changeset	1377 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1378
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1379 self.ui.status("crosschecking files in changesets and manifests\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1380 for f in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1381 if f not in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1382 self.ui.warn("file %s in manifest but not in changesets\n" % f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1383 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1384
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1385 for f in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1386 if f not in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1387 self.ui.warn("file %s in changeset but not in manifest\n" % f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1388 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1389
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1390 self.ui.status("checking files\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1391 ff = filenodes.keys()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1392 ff.sort()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1393 for f in ff:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1394 if f == "/dev/null": continue
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1395 files += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1396 fl = self.file(f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1397 nodes = { nullid: 1 }
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1398 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1399 for i in range(fl.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1400 revisions += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1401 n = fl.node(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1402
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1403 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1404 self.ui.warn("%s: duplicate revision %d\n" % (f, i))
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1405 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1406
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1407 if n not in filenodes[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1408 self.ui.warn("%s: %d:%s not in manifests\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1409 % (f, i, short(n)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1410 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1411 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1412 del filenodes[f][n]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1413
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1414 flr = fl.linkrev(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1415 if flr not in filelinkrevs[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1416 self.ui.warn("%s:%s points to unexpected changeset %d\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1417 % (f, short(n), fl.linkrev(n)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1418 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1419 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1420 filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1421
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1422 # verify contents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1423 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1424 t = fl.read(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1425 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1426 self.ui.warn("unpacking file %s %s: %s\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1427 % (f, short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1428 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1429
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1430 # verify parents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1431 (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1432 if p1 not in nodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1433 self.ui.warn("file %s:%s unknown parent 1 %s" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1434 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1435 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1436 if p2 not in nodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1437 self.ui.warn("file %s:%s unknown parent 2 %s" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1438 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1439 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1440 nodes[n] = 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1441
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1442 # cross-check
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1443 for node in filenodes[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1444 self.ui.warn("node %s in manifests not in %s\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1445 % (hex(n), f))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1446 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1447
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1448 self.ui.status("%d files, %d changesets, %d total revisions\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1449 (files, changesets, revisions))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1450
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1451 if errors:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1452 self.ui.warn("%d integrity errors encountered!\n" % errors)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1453 return 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1454
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1455 class remoterepository:
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1456 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	1457 self.url = path
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1458 self.ui = ui
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1459 no_list = [ "localhost", "127.0.0.1" ]
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1460 host = ui.config("http_proxy", "host")
424 9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1461 if host is None:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1462 host = os.environ.get("http_proxy")
426 8c90ab5644c9 Allow hgrc's proxy host and $http_proxy env var to start with http:// Thomas Arendsen Hein <thomas@intevation.de> parents: 424 diff changeset	1463 if host and host.startswith('http://'):
8c90ab5644c9 Allow hgrc's proxy host and $http_proxy env var to start with http:// Thomas Arendsen Hein <thomas@intevation.de> parents: 424 diff changeset	1464 host = host[7:]
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1465 user = ui.config("http_proxy", "user")
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1466 passwd = ui.config("http_proxy", "passwd")
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1467 no = ui.config("http_proxy", "no")
424 9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1468 if no is None:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1469 no = os.environ.get("no_proxy")
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1470 if no:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1471 no_list = no_list + no.split(",")
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1472
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1473 no_proxy = 0
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1474 for h in no_list:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1475 if (path.startswith("http://" + h + "/") or
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1476 path.startswith("http://" + h + ":") or
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1477 path == "http://" + h):
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1478 no_proxy = 1
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1479
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1480 # Note: urllib2 takes proxy values from the environment and those will
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1481 # take precedence
424 9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1482 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1483 if os.environ.has_key(env):
9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	1484 del os.environ[env]
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1485
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1486 proxy_handler = urllib2.BaseHandler()
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1487 if host and not no_proxy:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1488 proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host})
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1489
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1490 authinfo = None
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1491 if user and passwd:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1492 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1493 passmgr.add_password(None, host, user, passwd)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1494 authinfo = urllib2.ProxyBasicAuthHandler(passmgr)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1495
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1496 opener = urllib2.build_opener(proxy_handler, authinfo)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1497 urllib2.install_opener(opener)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1498
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1499 def do_cmd(self, cmd, **args):
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1500 self.ui.debug("sending %s command\n" % cmd)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1501 q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1502 q.update(args)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1503 qs = urllib.urlencode(q)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1504 cu = "%s?%s" % (self.url, qs)
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1505 return urllib2.urlopen(cu)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1506
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1507 def heads(self):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1508 d = self.do_cmd("heads").read()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1509 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1510 return map(bin, d[:-1].split(" "))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1511 except:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1512 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1513 raise
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1514
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1515 def branches(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1516 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	1517 d = self.do_cmd("branches", nodes=n).read()
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1518 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1519 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1520 return br
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1521 except:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1522 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1523 raise
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1524
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1525 def between(self, pairs):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1526 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	1527 d = self.do_cmd("between", pairs=n).read()
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1528 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1529 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1530 return p
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1531 except:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1532 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	1533 raise
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1534
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1535 def changegroup(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1536 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	1537 zd = zlib.decompressobj()
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1538 f = self.do_cmd("changegroup", roots=n)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1539 bytes = 0
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1540 while 1:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1541 d = f.read(4096)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1542 bytes += len(d)
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1543 if not d:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1544 yield zd.flush()
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1545 break
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1546 yield zd.decompress(d)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1547 self.ui.note("%d bytes of data transfered\n" % bytes)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1548
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1549 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	1550 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	1551 return remoterepository(ui, path)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1552 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	1553 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	1554 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	1555 return localrepository(ui, path.replace("old-http://", "http://"))
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1556 else:
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1557 return localrepository(ui, path, create)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1558

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hg.py @ 611:48c3eb2bf844