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

annotate mercurial/hg.py @ 961:3e11d5038649

Add --ssh and --remotecmd to push This uses the new setconfig options passing mechanism

author	mpm@selenic.com
date	Fri, 19 Aug 2005 21:36:57 -0800
parents	ff484cc157d6
children	4a9a753e8232

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")
765 1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	13 demandload(globals(), "tempfile httprangereader bdiff urlparse")
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	14 demandload(globals(), "bisect errno select stat")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	15
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	16 class filelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	17 def __init__(self, opener, path):
144 ea9188538222 Fix transaction handling bug by reverting fileopener change mpm@selenic.com parents: 140 diff changeset	18 revlog.__init__(self, opener,
786 902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	19 os.path.join("data", self.encodedir(path + ".i")),
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	20 os.path.join("data", self.encodedir(path + ".d")))
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	21
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	22 # This avoids a collision between a file named foo and a dir named
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	23 # foo.i or foo.d
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	24 def encodedir(self, path):
856 fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	25 return (path
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	26 .replace(".hg/", ".hg.hg/")
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	27 .replace(".i/", ".i.hg/")
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	28 .replace(".d/", ".d.hg/"))
786 902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	29
902b12d55751 Fix the directory and revlog collision problem mpm@selenic.com parents: 785 diff changeset	30 def decodedir(self, path):
856 fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	31 return (path
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	32 .replace(".d.hg/", ".d/")
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	33 .replace(".i.hg/", ".i/")
fbe964ae7325 Fixed encoding of directories ending in .d or .i: Thomas Arendsen Hein <thomas@intevation.de> parents: 839 diff changeset	34 .replace(".hg.hg/", ".hg/"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	35
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	36 def read(self, node):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	37 t = self.revision(node)
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	38 if not t.startswith('\1\n'):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	39 return t
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	40 s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	41 return t[s+2:]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	42
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	43 def readmeta(self, node):
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	44 t = self.revision(node)
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	45 if not t.startswith('\1\n'):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	46 return t
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	47 s = t.find('\1\n', 2)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	48 mt = t[2:s]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	49 for l in mt.splitlines():
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	50 k, v = l.split(": ", 1)
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	51 m[k] = v
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	52 return m
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	53
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	54 def add(self, text, meta, transaction, link, p1=None, p2=None):
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	55 if meta or text.startswith('\1\n'):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	56 mt = ""
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	57 if meta:
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	58 mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ]
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	59 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	60 return self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	61
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	62 def annotate(self, node):
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	63
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	64 def decorate(text, rev):
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	65 return ([rev] * len(text.splitlines()), text)
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	66
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	67 def pair(parent, child):
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	68 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	69 child[0][b1:b2] = parent[0][a1:a2]
4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	70 return child
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	71
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	72 # find all ancestors
216 201115f2859b hg annotate: actually annotate the given version mpm@selenic.com parents: 210 diff changeset	73 needed = {node:1}
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	74 visit = [node]
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	75 while visit:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	76 n = visit.pop(0)
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 not in needed:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	79 needed[p] = 1
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	80 visit.append(p)
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	81 else:
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	82 # count how many times we'll use this
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	83 needed[p] += 1
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	84
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	85 # sort by revision which is a topological order
471 4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	86 visit = [ (self.rev(n), n) for n in needed.keys() ]
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	87 visit.sort()
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	88 hist = {}
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	89
471 4c7f687e4313 Minor annotate performance tweaks mpm@selenic.com parents: 454 diff changeset	90 for r,n in visit:
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	91 curr = decorate(self.read(n), self.linkrev(n))
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	92 for p in self.parents(n):
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	93 if p != nullid:
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	94 curr = pair(hist[p], curr)
200 8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	95 # trim the history of unneeded revs
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	96 needed[p] -= 1
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	97 if not needed[p]:
8450c18f2a45 annotate: memory efficiency mpm@selenic.com parents: 199 diff changeset	98 del hist[p]
199 2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	99 hist[n] = curr
2424676edd8c annotate: deal with merges mpm@selenic.com parents: 192 diff changeset	100
436 6aeb4fee51f6 Optimize annotate a bit mpm@selenic.com parents: 434 diff changeset	101 return zip(hist[n][0], hist[n][1].splitlines(1))
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	102
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103 class manifest(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	104 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 self.mapcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	106 self.listcache = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107 self.addlist = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	108 revlog.__init__(self, opener, "00manifest.i", "00manifest.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	110 def read(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
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	112 if self.mapcache and self.mapcache[0] == node:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	113 return self.mapcache[1]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	114 text = self.revision(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	115 map = {}
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	116 flag = {}
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	117 self.listcache = (text, text.splitlines(1))
daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	118 for l in self.listcache[1]:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	119 (f, n) = l.split('\0')
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	120 map[f] = bin(n[:40])
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	121 flag[f] = (n[40:-1] == "x")
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	122 self.mapcache = (node, map, flag)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	123 return map
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	124
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	125 def readflags(self, node):
313 e75ea4662d81 Minor caching improvement for manifest mpm@selenic.com parents: 312 diff changeset	126 if node == nullid: return {} # don't upset local cache
358 9f4077d7ef6f [PATCH] manifest.readflags performance buglet mpm@selenic.com parents: 350 diff changeset	127 if not self.mapcache or self.mapcache[0] != node:
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	128 self.read(node)
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	129 return self.mapcache[2]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	130
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	131 def diff(self, a, b):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	132 # 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	133 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	134 d = mdiff.diff(self.listcache[1], self.addlist, 1)
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	135 if mdiff.patch(a, d) != b:
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	136 sys.stderr.write("* sortdiff failed, falling back *\n")
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	137 return mdiff.textdiff(a, b)
3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 96 diff changeset	138 return d
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	139 else:
44 e825a68d7227 Fix occassional diff bug with manifests mpm@selenic.com parents: 40 diff changeset	140 return mdiff.textdiff(a, b)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	142 def add(self, map, flags, transaction, link, p1=None, p2=None,
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	143 changed=None):
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	144 # directly generate the mdiff delta from the data collected during
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	145 # the bisect loop below
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	146 def gendelta(delta):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	147 i = 0
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	148 result = []
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	149 while i < len(delta):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	150 start = delta[i][2]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	151 end = delta[i][3]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	152 l = delta[i][4]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	153 if l == None:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	154 l = ""
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	155 while i < len(delta) - 1 and start <= delta[i+1][2] \
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	156 and end >= delta[i+1][2]:
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	157 if delta[i+1][3] > end:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	158 end = delta[i+1][3]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	159 if delta[i+1][4]:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	160 l += delta[i+1][4]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	161 i += 1
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	162 result.append(struct.pack(">lll", start, end, len(l)) + l)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	163 i += 1
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	164 return result
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	165
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	166 # apply the changes collected during the bisect loop to our addlist
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	167 def addlistdelta(addlist, delta):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	168 # apply the deltas to the addlist. start from the bottom up
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	169 # so changes to the offsets don't mess things up.
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	170 i = len(delta)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	171 while i > 0:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	172 i -= 1
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	173 start = delta[i][0]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	174 end = delta[i][1]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	175 if delta[i][4]:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	176 addlist[start:end] = [delta[i][4]]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	177 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	178 del addlist[start:end]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	179 return addlist
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	180
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	181 # calculate the byte offset of the start of each line in the
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	182 # manifest
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	183 def calcoffsets(addlist):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	184 offsets = [0] * (len(addlist) + 1)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	185 offset = 0
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	186 i = 0
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	187 while i < len(addlist):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	188 offsets[i] = offset
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	189 offset += len(addlist[i])
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	190 i += 1
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	191 offsets[i] = offset
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	192 return offsets
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	193
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	194 # if we're using the listcache, make sure it is valid and
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	195 # parented by the same node we're diffing against
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	196 if not changed or not self.listcache or not p1 or \
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	197 self.mapcache[0] != p1:
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	198 files = map.keys()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	199 files.sort()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	200
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	201 self.addlist = ["%s\000%s%s\n" %
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	202 (f, hex(map[f]), flags[f] and "x" or '')
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	203 for f in files]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	204 cachedelta = None
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	205 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	206 addlist = self.listcache[1]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	207
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	208 # find the starting offset for each line in the add list
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	209 offsets = calcoffsets(addlist)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	210
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	211 # combine the changed lists into one list for sorting
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	212 work = [[x, 0] for x in changed[0]]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	213 work[len(work):] = [[x, 1] for x in changed[1]]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	214 work.sort()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	215
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	216 delta = []
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	217 bs = 0
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	218
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	219 for w in work:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	220 f = w[0]
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	221 # bs will either be the index of the item or the insert point
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	222 bs = bisect.bisect(addlist, f, bs)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	223 if bs < len(addlist):
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	224 fn = addlist[bs][:addlist[bs].index('\0')]
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	225 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	226 fn = None
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	227 if w[1] == 0:
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	228 l = "%s\000%s%s\n" % (f, hex(map[f]),
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	229 flags[f] and "x" or '')
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	230 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	231 l = None
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	232 start = bs
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	233 if fn != f:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	234 # item not found, insert a new one
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	235 end = bs
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	236 if w[1] == 1:
713 7c385bd5f993 Added missing newline after two error messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	237 sys.stderr.write("failed to remove %s from manifest\n"
7c385bd5f993 Added missing newline after two error messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	238 % f)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	239 sys.exit(1)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	240 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	241 # item is found, replace/delete the existing line
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	242 end = bs + 1
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	243 delta.append([start, end, offsets[start], offsets[end], l])
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	244
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	245 self.addlist = addlistdelta(addlist, delta)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	246 if self.mapcache[0] == self.tip():
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	247 cachedelta = "".join(gendelta(delta))
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	248 else:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	249 cachedelta = None
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	250
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	251 text = "".join(self.addlist)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	252 if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text:
713 7c385bd5f993 Added missing newline after two error messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	253 sys.stderr.write("manifest delta failure\n")
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	254 sys.exit(1)
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	255 n = self.addrevision(text, transaction, link, p1, p2, cachedelta)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	256 self.mapcache = (n, map, flags)
25 daa724b27300 Fix corruption from manifest.listcache optimization mpm@selenic.com parents: 20 diff changeset	257 self.listcache = (text, self.addlist)
140 30ef77113872 Minor safety checks to manifest diff mpm@selenic.com parents: 118 diff changeset	258 self.addlist = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	259
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	260 return n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	261
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	262 class changelog(revlog):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	263 def __init__(self, opener):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	264 revlog.__init__(self, opener, "00changelog.i", "00changelog.d")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	265
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	266 def extract(self, text):
37 a8811676c85a Move hex/bin bits to revlog mpm@selenic.com parents: 33 diff changeset	267 if not text:
40 5f87633e1ea2 Date is an int as a string in changelog mpm@selenic.com parents: 37 diff changeset	268 return (nullid, "", "0", [], "")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269 last = text.index("\n\n")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	270 desc = text[last + 2:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	271 l = text[:last].splitlines()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 manifest = bin(l[0])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	273 user = l[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	274 date = l[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	275 files = l[3:]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	276 return (manifest, user, date, files, desc)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	277
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	278 def read(self, node):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	279 return self.extract(self.revision(node))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	280
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	281 def add(self, manifest, list, desc, transaction, p1=None, p2=None,
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	282 user=None, date=None):
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	283 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	284 list.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	285 l = [hex(manifest), user, date] + list + ["", desc]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	286 text = "\n".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	287 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	288
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	289 class dirstate:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	290 def __init__(self, opener, ui, root):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	291 self.opener = opener
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	292 self.root = root
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	293 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	294 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	295 self.map = None
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	296 self.pl = None
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	297 self.copies = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	298 self.ignorefunc = None
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	299
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	300 def wjoin(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	301 return os.path.join(self.root, f)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	302
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	303 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	304 cwd = os.getcwd()
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	305 if cwd == self.root: return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	306 return cwd[len(self.root) + 1:]
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	307
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	308 def ignore(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	309 if not self.ignorefunc:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	310 bigpat = []
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	311 try:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	312 l = file(self.wjoin(".hgignore"))
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	313 for pat in l:
911 d46af8e6b858 Fix .hgignore parsing if last line has no EOL, ignore trailing white space. Thomas Arendsen Hein <thomas@intevation.de> parents: 903 diff changeset	314 p = pat.rstrip()
d46af8e6b858 Fix .hgignore parsing if last line has no EOL, ignore trailing white space. Thomas Arendsen Hein <thomas@intevation.de> parents: 903 diff changeset	315 if p:
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	316 try:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	317 re.compile(p)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	318 except:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	319 self.ui.warn("ignoring invalid ignore"
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	320 + " regular expression '%s'\n" % p)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	321 else:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	322 bigpat.append(p)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	323 except IOError: pass
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	324
735 3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	325 if bigpat:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	326 s = "(?:%s)" % (")\|(?:".join(bigpat))
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	327 r = re.compile(s)
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	328 self.ignorefunc = r.search
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	329 else:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	330 self.ignorefunc = util.never
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	331
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	332 return self.ignorefunc(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	333
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	334 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	335 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	336 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	337
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	338 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	339 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	340 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	341 except TypeError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	342 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	343 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	344
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	345 def __contains__(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	346 if not self.map: self.read()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	347 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	348
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	349 def parents(self):
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	350 if not self.pl:
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	351 self.read()
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	352 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	353
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	354 def markdirty(self):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	355 if not self.dirty:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	356 self.dirty = 1
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	357
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	358 def setparents(self, p1, p2 = nullid):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	359 self.markdirty()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	360 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	361
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	362 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	363 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	364 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	365 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	366 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	367
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	368 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	369 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	370
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	371 self.map = {}
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	372 self.pl = [nullid, nullid]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	373 try:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	374 st = self.opener("dirstate").read()
311 3b17056b72dc fix KeyErrors from reading empty dirstate mpm@selenic.com parents: 308 diff changeset	375 if not st: return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	376 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	377
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	378 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	379
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	380 pos = 40
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381 while pos < len(st):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	382 e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	383 l = e[4]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	384 pos += 17
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	385 f = st[pos:pos + l]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	386 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	387 f, c = f.split('\0')
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	388 self.copies[f] = c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	389 self.map[f] = e[:4]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	390 pos += l
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	391
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	392 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	393 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	394 self.markdirty()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	395 self.copies[dest] = source
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	396
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	397 def copied(self, file):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	398 return self.copies.get(file, None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	399
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	400 def update(self, files, state, **kw):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	401 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	402 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	403 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	404 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	405 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	406
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	407 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	408 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	409 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	410 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	411 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	412 self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	413 else:
253 2da0a56aa1fd Remove invalid state from dirstate mpm@selenic.com parents: 251 diff changeset	414 s = os.stat(os.path.join(self.root, f))
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	415 st_size = kw.get('st_size', s.st_size)
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	416 st_mtime = kw.get('st_mtime', s.st_mtime)
865 2d2fee33ec68 Cleanup after previous changes: Thomas Arendsen Hein <thomas@intevation.de> parents: 863 diff changeset	417 self.map[f] = (state, s.st_mode, st_size, st_mtime)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	418
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	419 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	420 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	421 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	422 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	423 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	424 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	425 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	426 except KeyError:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	427 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	428 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	429
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	430 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	431 self.map = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	432 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	433
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	434 def write(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	435 st = self.opener("dirstate", "w")
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	436 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	437 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	438 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	439 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	440 f = f + "\0" + c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	441 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	442 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	443 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	444
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	445 def filterfiles(self, files):
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	446 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	447 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	448
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	449 for x in files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	450 if x is '.':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	451 return self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	452 if x not in self.map:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	453 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	454 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	455 ret[x] = self.map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	456
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	457 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	458 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	459
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	460 b = self.map.keys()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	461 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	462 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	463
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	464 for x in unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	465 bs = bisect.bisect(b, x)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	466 if bs != 0 and b[bs-1] == x:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	467 ret[x] = self.map[x]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	468 continue
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	469 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	470 s = b[bs]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	471 if len(s) > len(x) and s.startswith(x) and s[len(x)] == '/':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	472 ret[s] = self.map[s]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	473 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	474 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	475 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	476 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	477
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	478 def walk(self, files = None, match = util.always, dc=None):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	479 self.read()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	480
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	481 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	482 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	483 files = [self.root]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	484 if not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	485 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	486 elif not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	487 dc = self.filterfiles(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	488
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	489 known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	490 def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	491 if fn in known: return True
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	492 known[fn] = 1
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	493 def traverse():
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	494 for ff in util.unique(files):
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	495 f = os.path.join(self.root, ff)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	496 try:
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	497 st = os.stat(f)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	498 except OSError, inst:
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	499 if ff not in dc: self.ui.warn('%s: %s\n' % (
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	500 util.pathto(self.getcwd(), ff),
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	501 inst.strerror))
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	502 continue
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	503 if stat.S_ISDIR(st.st_mode):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	504 for dir, subdirs, fl in os.walk(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	505 d = dir[len(self.root) + 1:]
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	506 nd = util.normpath(d)
892 f481c9b6786e Fix bug involving "hg debugwalk -Ipattern" from repository root. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	507 if nd == '.': nd = ''
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	508 if seen(nd):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	509 subdirs[:] = []
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	510 continue
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	511 for sd in subdirs:
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	512 ds = os.path.join(nd, sd +'/')
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	513 if self.ignore(ds) or not match(ds):
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	514 subdirs.remove(sd)
822 b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	515 subdirs.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	516 fl.sort()
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	517 for fn in fl:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	518 fn = util.pconvert(os.path.join(d, fn))
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	519 yield 'f', fn
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	520 elif stat.S_ISREG(st.st_mode):
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	521 yield 'f', ff
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	522 else:
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	523 kind = 'unknown'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	524 if stat.S_ISCHR(st.st_mode): kind = 'character device'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	525 elif stat.S_ISBLK(st.st_mode): kind = 'block device'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	526 elif stat.S_ISFIFO(st.st_mode): kind = 'fifo'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	527 elif stat.S_ISLNK(st.st_mode): kind = 'symbolic link'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	528 elif stat.S_ISSOCK(st.st_mode): kind = 'socket'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	529 self.ui.warn('%s: unsupported file type (type is %s)\n' % (
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	530 util.pathto(self.getcwd(), ff),
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	531 kind))
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	532
822 b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	533 ks = dc.keys()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	534 ks.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	535 for k in ks:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	536 yield 'm', k
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	537
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	538 # yield only files that match: all in dirstate, others only if
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	539 # not in .hgignore
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	540
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	541 for src, fn in util.unique(traverse()):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	542 fn = util.normpath(fn)
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	543 if seen(fn): continue
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	544 if fn not in dc and self.ignore(fn):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	545 continue
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	546 if match(fn):
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	547 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	548
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	549 def changes(self, files=None, match=util.always):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	550 self.read()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	551 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	552 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	553 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	554 dc = self.filterfiles(files)
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	555 lookup, modified, added, unknown = [], [], [], []
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	556 removed, deleted = [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	557
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	558 for src, fn in self.walk(files, match, dc=dc):
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	559 try:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	560 s = os.stat(os.path.join(self.root, fn))
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	561 except OSError:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	562 continue
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	563 if not stat.S_ISREG(s.st_mode):
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	564 continue
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	565 c = dc.get(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	566 if c:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	567 del dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	568 if c[0] == 'm':
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	569 modified.append(fn)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	570 elif c[0] == 'a':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	571 added.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	572 elif c[0] == 'r':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	573 unknown.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	574 elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100:
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	575 modified.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	576 elif c[3] != s.st_mtime:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	577 lookup.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	578 else:
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	579 unknown.append(fn)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	580
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	581 for fn, c in [(fn, c) for fn, c in dc.items() if match(fn)]:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	582 if c[0] == 'r':
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	583 removed.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	584 else:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	585 deleted.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	586 return (lookup, modified, added, removed + deleted, unknown)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	587
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	588 # used to avoid circular references so destructors work
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	589 def opener(base):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	590 p = base
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	591 def o(path, mode="r"):
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	592 if p.startswith("http://"):
15 6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	593 f = os.path.join(p, urllib.quote(path))
372 4b0f562c61f4 Move httprangereader into its own file mpm@selenic.com parents: 363 diff changeset	594 return httprangereader.httprangereader(f)
15 6daf7757e92b Fix network pull of repo files with "%" in their base64 encoding. mpm@selenic.com parents: 10 diff changeset	595
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	596 f = os.path.join(p, path)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	597
292 09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	598 mode += "b" # for that other OS
09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	599
09364bcebdf0 Make most file opening binary mpm@selenic.com parents: 291 diff changeset	600 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	601 try:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	602 s = os.stat(f)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	603 except OSError:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	604 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	605 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	606 os.makedirs(d)
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	607 else:
c37c7f784ee3 Move hg from storing files in data with base64 encoding to full mpm@selenic.com parents: 109 diff changeset	608 if s.st_nlink > 1:
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	609 file(f + ".tmp", "wb").write(file(f, "rb").read())
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	610 util.rename(f+".tmp", f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	611
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	612 return file(f, mode)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	613
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	614 return o
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	615
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	616 class RepoError(Exception): pass
81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	617
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	618 class localrepository:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	619 def __init__(self, ui, path=None, create=0):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	620 self.remote = 0
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	621 if path and path.startswith("http://"):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	622 self.remote = 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	623 self.path = path
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	624 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	625 if not path:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	626 p = os.getcwd()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	627 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	628 oldp = p
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	629 p = os.path.dirname(p)
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	630 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	631 path = p
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	632 self.path = os.path.join(path, ".hg")
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	633
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	634 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	635 raise RepoError("repository %s not found" % self.path)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	636
933 9c43d68ad59f Fixed --repository option when handling relative path tksoh@users.sf.net parents: 926 diff changeset	637 self.root = os.path.abspath(path)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	638 self.ui = ui
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	639
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	640 if create:
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	641 os.mkdir(self.path)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	642 os.mkdir(self.join("data"))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	643
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	644 self.opener = opener(self.path)
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	645 self.wopener = opener(self.root)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	646 self.manifest = manifest(self.opener)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	647 self.changelog = changelog(self.opener)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	648 self.tagscache = None
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	649 self.nodetagscache = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	650
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	651 if not self.remote:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	652 self.dirstate = dirstate(self.opener, ui, self.root)
337 c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	653 try:
c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	654 self.ui.readconfig(self.opener("hgrc"))
c3d873ef4b31 Add support for .hg/hgrc file mpm@selenic.com parents: 330 diff changeset	655 except IOError: pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	656
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	657 def hook(self, name, **args):
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	658 s = self.ui.config("hooks", name)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	659 if s:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	660 self.ui.note("running hook %s: %s\n" % (name, s))
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	661 old = {}
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	662 for k, v in args.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	663 k = k.upper()
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	664 old[k] = os.environ.get(k, None)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	665 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	666
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	667 r = os.system(s)
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	668
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	669 for k, v in old.items():
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	670 if v != None:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	671 os.environ[k] = v
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	672 else:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	673 del os.environ[k]
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	674
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	675 if r:
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	676 self.ui.warn("abort: %s hook failed with status %d!\n" %
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	677 (name, r))
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	678 return False
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	679 return True
2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	680
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	681 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	682 '''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	683 if not self.tagscache:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	684 self.tagscache = {}
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	685 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	686 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	687 bin_n = bin(n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	688 except TypeError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	689 bin_n = ''
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	690 self.tagscache[k.strip()] = bin_n
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	691
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	692 try:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	693 # 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	694 # 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	695 # taking precedence
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	696 fl = self.file(".hgtags")
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	697 h = fl.heads()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	698 h.reverse()
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	699 for r in h:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	700 for l in fl.revision(r).splitlines():
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	701 if l:
385 e9e1efd5291c Fixed problems with extra spaces around tags in .hgtags Thomas Arendsen Hein <thomas@intevation.de> parents: 383 diff changeset	702 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	703 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	704 except KeyError:
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	705 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	706
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	707 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	708 f = self.opener("localtags")
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	709 for l in f:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	710 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	711 addtag(self, k, n)
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	712 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	713 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	714
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	715 self.tagscache['tip'] = self.changelog.tip()
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	716
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	717 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	718
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	719 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	720 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	721 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	722 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	723 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	724 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	725 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	726 r = -2 # sort to the beginning of the list if unknown
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	727 l.append((r,t,n))
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	728 l.sort()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	729 return [(t,n) for r,t,n in l]
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	730
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	731 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	732 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	733 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	734 self.nodetagscache = {}
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	735 for t,n in self.tags().items():
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	736 self.nodetagscache.setdefault(n,[]).append(t)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	737 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	738
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	739 def lookup(self, key):
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	740 try:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	741 return self.tags()[key]
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	742 except KeyError:
658 f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	743 try:
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	744 return self.changelog.lookup(key)
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	745 except:
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	746 raise RepoError("unknown revision '%s'" % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	747
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	748 def dev(self):
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	749 if self.remote: return -1
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	750 return os.stat(self.path).st_dev
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	751
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	752 def local(self):
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	753 return not self.remote
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	754
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	755 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	756 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	757
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	758 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	759 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	760
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	761 def file(self, f):
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	762 if f[0] == '/': f = f[1:]
144 ea9188538222 Fix transaction handling bug by reverting fileopener change mpm@selenic.com parents: 140 diff changeset	763 return filelog(self.opener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	764
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	765 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	766 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	767
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	768 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	769 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	770
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	771 def transaction(self):
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	772 # save dirstate for undo
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	773 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	774 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	775 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	776 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	777 self.opener("journal.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	778
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	779 def after():
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	780 util.rename(self.join("journal"), self.join("undo"))
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	781 util.rename(self.join("journal.dirstate"),
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	782 self.join("undo.dirstate"))
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	783
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	784 return transaction.transaction(self.ui.warn, self.opener,
46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	785 self.join("journal"), after)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	786
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	787 def recover(self):
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	788 lock = self.lock()
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	789 if os.path.exists(self.join("journal")):
501 7ea1c88792bf Better messages for rollback and undo mpm@selenic.com parents: 499 diff changeset	790 self.ui.status("rolling back interrupted transaction\n")
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	791 return transaction.rollback(self.opener, self.join("journal"))
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	792 else:
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	793 self.ui.warn("no interrupted transaction available\n")
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	794
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	795 def undo(self):
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	796 lock = self.lock()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	797 if os.path.exists(self.join("undo")):
501 7ea1c88792bf Better messages for rollback and undo mpm@selenic.com parents: 499 diff changeset	798 self.ui.status("rolling back last transaction\n")
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	799 transaction.rollback(self.opener, self.join("undo"))
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	800 self.dirstate = None
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	801 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
251 3fd8fc14b12f backup dirstate for undo mpm@selenic.com parents: 249 diff changeset	802 self.dirstate = dirstate(self.opener, self.ui, self.root)
163 f38c90953c2c Make undo and recover friendlier mpm@selenic.com parents: 162 diff changeset	803 else:
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	804 self.ui.warn("no undo information available\n")
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	805
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	806 def lock(self, wait = 1):
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	807 try:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	808 return lock.lock(self.join("lock"), 0)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	809 except lock.LockHeld, inst:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	810 if wait:
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	811 self.ui.warn("waiting for lock held by %s\n" % inst.args[0])
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	812 return lock.lock(self.join("lock"), wait)
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	813 raise inst
0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	814
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	815 def rawcommit(self, files, text, user, date, p1=None, p2=None):
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	816 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	817 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	818 p2 = p2 or self.dirstate.parents()[1] or nullid
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	819 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	820 c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	821 m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	822 mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	823 m2 = self.manifest.read(c2[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	824
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	825 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	826 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	827 else:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	828 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	829
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	830 tr = self.transaction()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	831 mm = m1.copy()
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	832 mfm = mf1.copy()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	833 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	834 for f in files:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	835 try:
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	836 t = self.wfile(f).read()
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	837 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	838 r = self.file(f)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	839 mfm[f] = tm
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	840 mm[f] = r.add(t, {}, tr, linkrev,
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	841 m1.get(f, nullid), m2.get(f, nullid))
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	842 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	843 self.dirstate.update([f], "n")
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	844 except IOError:
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	845 try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	846 del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	847 del mfm[f]
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	848 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	849 self.dirstate.forget([f])
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	850 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	851 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	852 pass
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	853
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	854 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	855 user = user or self.ui.username()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	856 n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	857 tr.close()
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	858 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	859 self.dirstate.setparents(n, nullid)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	860
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 786 diff changeset	861 def commit(self, files = None, text = "", user = None, date = None,
900 ba8cf1f2210c Add force option to repo.commit, allowing commits where no files change mason@suse.com parents: 898 diff changeset	862 match = util.always, force=False):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	863 commit = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	864 remove = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	865 if files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	866 for f in files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	867 s = self.dirstate.state(f)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	868 if s in 'nmai':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	869 commit.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	870 elif s == 'r':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	871 remove.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	872 else:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	873 self.ui.warn("%s not tracked!\n" % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	874 else:
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 786 diff changeset	875 (c, a, d, u) = self.changes(match = match)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	876 commit = c + a
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	877 remove = d
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	878
900 ba8cf1f2210c Add force option to repo.commit, allowing commits where no files change mason@suse.com parents: 898 diff changeset	879 if not commit and not remove and not force:
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	880 self.ui.status("nothing changed\n")
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	881 return None
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	882
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	883 if not self.hook("precommit"):
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	884 return None
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	885
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	886 p1, p2 = self.dirstate.parents()
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	887 c1 = self.changelog.read(p1)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	888 c2 = self.changelog.read(p2)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	889 m1 = self.manifest.read(c1[0])
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	890 mf1 = self.manifest.readflags(c1[0])
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	891 m2 = self.manifest.read(c2[0])
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	892 lock = self.lock()
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	893 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	894
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	895 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	896 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	897 linkrev = self.changelog.count()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	898 commit.sort()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	899 for f in commit:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	900 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	901 try:
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	902 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	903 t = self.wfile(f).read()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	904 except IOError:
667 31a9aa890016 A number of minor fixes to problems that pychecker found. mark.williamson@cl.cam.ac.uk parents: 660 diff changeset	905 self.ui.warn("trouble committing %s!\n" % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	906 raise
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	907
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	908 meta = {}
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	909 cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	910 if cp:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	911 meta["copy"] = cp
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	912 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	913 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"]))
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	914
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	915 r = self.file(f)
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	916 fp1 = m1.get(f, nullid)
1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	917 fp2 = m2.get(f, nullid)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	918 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	919
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	920 # update manifest
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	921 m1.update(new)
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	922 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	923 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	924 del m1[f]
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	925 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0],
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	926 (new, remove))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	927
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	928 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	929 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	930 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	931
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	932 if not text:
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	933 edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	934 edittext += "".join(["HG: changed %s\n" % f for f in new])
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	935 edittext += "".join(["HG: removed %s\n" % f for f in remove])
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	936 edittext = self.ui.edit(edittext)
97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	937 if not edittext.rstrip():
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	938 return None
288 97c87ac6d7a4 commit: edit text fixups mpm@selenic.com parents: 287 diff changeset	939 text = edittext
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	940
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	941 user = user or self.ui.username()
317 b18ce742566a hg commit: user and date options mpm@selenic.com parents: 314 diff changeset	942 n = self.changelog.add(mn, new, text, tr, p1, p2, user, date)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	943 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	944
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	945 self.dirstate.setparents(n)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	946 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	947 self.dirstate.forget(remove)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	948
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	949 if not self.hook("commit", node=hex(n)):
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	950 return None
120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	951 return n
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	952
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	953 def walk(self, node = None, files = [], match = util.always):
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	954 if node:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	955 for fn in self.manifest.read(self.changelog.read(node)[0]):
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	956 if match(fn): yield 'm', fn
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	957 else:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	958 for src, fn in self.dirstate.walk(files, match):
809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	959 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	960
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	961 def changes(self, node1 = None, node2 = None, files = [],
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	962 match = util.always):
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	963 mf2, u = None, []
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	964
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	965 def fcmp(fn, mf):
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	966 t1 = self.wfile(fn).read()
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	967 t2 = self.file(fn).revision(mf[fn])
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	968 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	969
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	970 def mfmatches(node):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	971 mf = dict(self.manifest.read(node))
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	972 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	973 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	974 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	975 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	976
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	977 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	978 if not node2:
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	979 l, c, a, d, u = self.dirstate.changes(files, match)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	980
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	981 # are we comparing working dir against its parent?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	982 if not node1:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	983 if l:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	984 # do a full compare of any files that might have changed
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	985 change = self.changelog.read(self.dirstate.parents()[0])
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	986 mf2 = mfmatches(change[0])
548 e2e963e255fd Fix braindamage in repo.changes mpm@selenic.com parents: 547 diff changeset	987 for f in l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	988 if fcmp(f, mf2):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	989 c.append(f)
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	990
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	991 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	992 l.sort()
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	993
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	994 return (c, a, d, u)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	995
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	996 # are we comparing working dir against non-tip?
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	997 # generate a pseudo-manifest for the working dir
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	998 if not node2:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	999 if not mf2:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1000 change = self.changelog.read(self.dirstate.parents()[0])
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1001 mf2 = mfmatches(change[0])
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1002 for f in a + c + l:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1003 mf2[f] = ""
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1004 for f in d:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1005 if f in mf2: del mf2[f]
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1006 else:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1007 change = self.changelog.read(node2)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1008 mf2 = mfmatches(change[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1009
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	1010 # flush lists from dirstate before comparing manifests
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	1011 c, a = [], []
b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	1012
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1013 change = self.changelog.read(node1)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1014 mf1 = mfmatches(change[0])
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1015
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1016 for fn in mf2:
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1017 if mf1.has_key(fn):
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1018 if mf1[fn] != mf2[fn]:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1019 if mf2[fn] != "" or fcmp(fn, mf1):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1020 c.append(fn)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1021 del mf1[fn]
6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1022 else:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1023 a.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1024
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1025 d = mf1.keys()
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1026
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1027 for l in c, a, d, u:
cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	1028 l.sort()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1029
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1030 return (c, a, d, u)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	1031
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1032 def add(self, list):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1033 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1034 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	1035 if not os.path.exists(p):
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	1036 self.ui.warn("%s does not exist!\n" % f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	1037 elif not os.path.isfile(p):
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	1038 self.ui.warn("%s not added: only files supported currently\n" % f)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1039 elif self.dirstate.state(f) in 'an':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1040 self.ui.warn("%s already tracked!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1041 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1042 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1043
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1044 def forget(self, list):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1045 for f in list:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1046 if self.dirstate.state(f) not in 'ai':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1047 self.ui.warn("%s not added!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1048 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1049 self.dirstate.forget([f])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1050
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1051 def remove(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1052 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1053 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	1054 if os.path.exists(p):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1055 self.ui.warn("%s still exists!\n" % f)
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	1056 elif self.dirstate.state(f) == 'a':
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	1057 self.ui.warn("%s never committed!\n" % f)
657 22bc6fb9aefc dirstate.forget() takes a list Matt Mackall <mpm@selenic.com> parents: 656 diff changeset	1058 self.dirstate.forget([f])
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1059 elif f not in self.dirstate:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1060 self.ui.warn("%s not tracked!\n" % f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1061 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1062 self.dirstate.update([f], "r")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1063
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1064 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1065 p = self.wjoin(dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	1066 if not os.path.exists(p):
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1067 self.ui.warn("%s does not exist!\n" % dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	1068 elif not os.path.isfile(p):
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	1069 self.ui.warn("copy failed: %s is not a file\n" % dest)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1070 else:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1071 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1072 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1073 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1074
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1075 def heads(self):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1076 return self.changelog.heads()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1077
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1078 # branchlookup returns a dict giving a list of branches for
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1079 # each head. A branch is defined as the tag of a node or
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1080 # the branch of the node's parents. If a node has multiple
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1081 # branch tags, tags are eliminated if they are visible from other
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1082 # branch tags.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1083 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1084 # So, for this graph: a->b->c->d->e
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1085 # \ /
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1086 # aa -----/
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	1087 # a has tag 2.6.12
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1088 # d has tag 2.6.13
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1089 # e would have branch tags for 2.6.12 and 2.6.13. Because the node
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1090 # for 2.6.12 can be reached from the node 2.6.13, that is eliminated
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1091 # from the list.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1092 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1093 # It is possible that more than one head will have the same branch tag.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1094 # callers need to check the result for multiple heads under the same
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1095 # branch tag if that is a problem for them (ie checkout of a specific
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1096 # branch).
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1097 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1098 # passing in a specific branch will limit the depth of the search
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1099 # through the parents. It won't limit the branches returned in the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1100 # result though.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1101 def branchlookup(self, heads=None, branch=None):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1102 if not heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1103 heads = self.heads()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1104 headt = [ h for h in heads ]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1105 chlog = self.changelog
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1106 branches = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1107 merges = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1108 seenmerge = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1109
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1110 # traverse the tree once for each head, recording in the branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1111 # dict which tags are visible from this head. The branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1112 # dict also records which tags are visible from each tag
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1113 # while we traverse.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1114 while headt or merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1115 if merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1116 n, found = merges.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1117 visit = [n]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1118 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1119 h = headt.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1120 visit = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1121 found = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1122 seen = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1123 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1124 n = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1125 if n in seen:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1126 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1127 pp = chlog.parents(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1128 tags = self.nodetags(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1129 if tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1130 for x in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1131 if x == 'tip':
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1132 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1133 for f in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1134 branches.setdefault(f, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1135 branches.setdefault(n, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1136 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1137 if n not in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1138 found.append(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1139 if branch in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1140 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1141 seen[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1142 if pp[1] != nullid and n not in seenmerge:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1143 merges.append((pp[1], [x for x in found]))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1144 seenmerge[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1145 if pp[0] != nullid:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1146 visit.append(pp[0])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1147 # traverse the branches dict, eliminating branch tags from each
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1148 # head that are visible from another branch tag for that head.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1149 out = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1150 viscache = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1151 for h in heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1152 def visible(node):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1153 if node in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1154 return viscache[node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1155 ret = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1156 visit = [node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1157 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1158 x = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1159 if x in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1160 ret.update(viscache[x])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1161 elif x not in ret:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1162 ret[x] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1163 if x in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1164 visit[len(visit):] = branches[x].keys()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1165 viscache[node] = ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1166 return ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1167 if h not in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1168 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1169 # O(n^2), but somewhat limited. This only searches the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1170 # tags visible from a specific head, not all the tags in the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1171 # whole repo.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1172 for b in branches[h]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1173 vis = False
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1174 for bb in branches[h].keys():
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1175 if b != bb:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1176 if b in visible(bb):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1177 vis = True
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1178 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1179 if not vis:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1180 l = out.setdefault(h, [])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1181 l[len(l):] = self.nodetags(b)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1182 return out
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1183
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1184 def branches(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1185 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	1186 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1187 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1188 t = n
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1189 while n:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1190 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1191 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	1192 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	1193 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1194 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1195 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1196
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1197 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1198 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1199
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1200 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1201 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1202 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1203
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1204 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1205 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1206 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1207 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1208 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1209 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1210 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1211
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1212 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1213
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1214 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1215
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1216 def newer(self, nodes):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1217 m = {}
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1218 nl = []
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1219 pm = {}
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1220 cl = self.changelog
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1221 t = l = cl.count()
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1222
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1223 # find the lowest numbered node
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1224 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1225 l = min(l, cl.rev(n))
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1226 m[n] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1227
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1228 for i in xrange(l, t):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1229 n = cl.node(i)
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1230 if n in m: # explicitly listed
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1231 pm[n] = 1
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1232 nl.append(n)
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1233 continue
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1234 for p in cl.parents(n):
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1235 if p in pm: # parent listed
7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1236 pm[n] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1237 nl.append(n)
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1238 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1239
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1240 return nl
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1241
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1242 def findincoming(self, remote, base=None, heads=None):
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1243 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1244 search = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1245 fetch = []
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1246 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1247 seenbranch = {}
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1248 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1249 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1250
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1251 # 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	1252 # and start by examining the heads
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1253 self.ui.status("searching for changes\n")
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1254
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1255 if not heads:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1256 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1257
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1258 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1259 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1260 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1261 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1262 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1263 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1264
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1265 if not unknown:
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1266 return None
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1267
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1268 rep = {}
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1269 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1270
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1271 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1272 # 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	1273 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1274 # (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	1275 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1276 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1277 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1278 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1279 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1280 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1281 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1282
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1283 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	1284 if n[0] == nullid:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1285 break
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1286 if n in seenbranch:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1287 self.ui.debug("branch already found\n")
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1288 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1289 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	1290 self.ui.debug("found incomplete branch %s:%s\n"
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1291 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1292 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1293 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1294 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1295 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	1296 if n[2] in m and n[3] in m:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1297 self.ui.debug("found new changeset %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1298 short(n[1]))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1299 fetch.append(n[1]) # earliest unknown
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1300 base[n[2]] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1301 continue
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1302
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1303 for a in n[2:4]:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1304 if a not in rep:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1305 r.append(a)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1306 rep[a] = 1
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1307
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1308 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1309
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1310 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1311 reqcnt += 1
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1312 self.ui.debug("request %d: %s\n" %
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1313 (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1314 for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1315 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	1316 self.ui.debug("received %s:%s\n" %
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1317 (short(b[0]), short(b[1])))
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1318 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	1319 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1320
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1321 # 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	1322 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1323 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1324 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1325 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1326 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1327 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1328 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1329 for i in l:
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1330 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	1331 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	1332 if f <= 2:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1333 self.ui.debug("found new branch changeset %s\n" %
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1334 short(p))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1335 fetch.append(p)
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1336 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1337 else:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1338 self.ui.debug("narrowed branch search to %s:%s\n"
9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1339 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1340 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1341 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1342 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1343
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1344 # 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	1345 for f in fetch:
d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1346 if f in m:
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	1347 raise RepoError("already have changeset " + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1348
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1349 if base.keys() == [nullid]:
514 874e577e332e change unrelated repository error to a warning mpm@selenic.com parents: 511 diff changeset	1350 self.ui.warn("warning: pulling from an unrelated repository!\n")
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	1351
94 7daef883134f Refactor merge code mpm@selenic.com parents: 90 diff changeset	1352 self.ui.note("adding new changesets starting at " +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1353 " ".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	1354
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1355 self.ui.debug("%d total queries\n" % reqcnt)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1356
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1357 return fetch
873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1358
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1359 def findoutgoing(self, remote, base=None, heads=None):
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1360 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1361 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1362 self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1363
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1364 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1365
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1366 # prune everything remote has from the tree
637 31e090c34d3b Fix up the broken bits in findoutgoing Matt Mackall <mpm@selenic.com> parents: 636 diff changeset	1367 del remain[nullid]
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1368 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1369 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1370 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1371 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1372 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1373 for p in self.changelog.parents(n):
637 31e090c34d3b Fix up the broken bits in findoutgoing Matt Mackall <mpm@selenic.com> parents: 636 diff changeset	1374 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1375
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1376 # find every node whose parents have been pruned
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1377 subset = []
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1378 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1379 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1380 if p1 not in remain and p2 not in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1381 subset.append(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1382
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1383 # this is the set of all roots we have to push
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1384 return subset
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1385
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1386 def pull(self, remote):
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1387 lock = self.lock()
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1388
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1389 # if we have an empty repo, fetch everything
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1390 if self.changelog.tip() == nullid:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1391 self.ui.status("requesting all changes\n")
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1392 fetch = [nullid]
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1393 else:
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1394 fetch = self.findincoming(remote)
ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1395
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1396 if not fetch:
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1397 self.ui.status("no changes found\n")
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1398 return 1
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1399
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1400 cg = remote.changegroup(fetch)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1401 return self.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1402
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1403 def push(self, remote, force=False):
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1404 lock = remote.lock()
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1405
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1406 base = {}
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1407 heads = remote.heads()
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1408 inc = self.findincoming(remote, base, heads)
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1409 if not force and inc:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1410 self.ui.warn("abort: unsynced remote changes!\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1411 self.ui.status("(did you forget to sync? use push -f to force)\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1412 return 1
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1413
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1414 update = self.findoutgoing(remote, base)
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1415 if not update:
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1416 self.ui.status("no changes found\n")
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1417 return 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1418 elif not force:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1419 if len(heads) < len(self.changelog.heads()):
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1420 self.ui.warn("abort: push creates new remote branches!\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1421 self.ui.status("(did you forget to merge?" +
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1422 " use push -f to force)\n")
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1423 return 1
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1424
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1425 cg = self.changegroup(update)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1426 return remote.addchangegroup(cg)
e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1427
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1428 def changegroup(self, basenodes):
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1429 class genread:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1430 def __init__(self, generator):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1431 self.g = generator
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1432 self.buf = ""
903 71be6dd282d1 Allow the changegroup generator to completely load the buffer. mason@suse.com parents: 901 diff changeset	1433 def fillbuf(self):
71be6dd282d1 Allow the changegroup generator to completely load the buffer. mason@suse.com parents: 901 diff changeset	1434 self.buf += "".join(self.g)
71be6dd282d1 Allow the changegroup generator to completely load the buffer. mason@suse.com parents: 901 diff changeset	1435
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1436 def read(self, l):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1437 while l > len(self.buf):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1438 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1439 self.buf += self.g.next()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1440 except StopIteration:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1441 break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1442 d, self.buf = self.buf[:l], self.buf[l:]
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1443 return d
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1444
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1445 def gengroup():
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1446 nodes = self.newer(basenodes)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1447
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1448 # construct the link map
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1449 linkmap = {}
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1450 for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1451 linkmap[self.changelog.rev(n)] = n
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1452
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1453 # construct a list of all changed files
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1454 changed = {}
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1455 for n in nodes:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1456 c = self.changelog.read(n)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1457 for f in c[3]:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1458 changed[f] = 1
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1459 changed = changed.keys()
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1460 changed.sort()
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1461
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1462 # the changegroup is changesets + manifests + all file revs
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1463 revs = [ self.changelog.rev(n) for n in nodes ]
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1464
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1465 for y in self.changelog.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1466 for y in self.manifest.group(linkmap): yield y
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1467 for f in changed:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1468 yield struct.pack(">l", len(f) + 4) + f
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1469 g = self.file(f).group(linkmap)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1470 for y in g:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1471 yield y
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1472
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1473 yield struct.pack(">l", 0)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1474
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1475 return genread(gengroup())
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1476
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1477 def addchangegroup(self, source):
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1478
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1479 def getchunk():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1480 d = source.read(4)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1481 if not d: return ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1482 l = struct.unpack(">l", d)[0]
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1483 if l <= 4: return ""
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1484 return source.read(l - 4)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1485
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1486 def getgroup():
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1487 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1488 c = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1489 if not c: break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1490 yield c
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1491
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1492 def csmap(x):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1493 self.ui.debug("add changeset %s\n" % short(x))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1494 return self.changelog.count()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1495
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1496 def revmap(x):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1497 return self.changelog.rev(x)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1498
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1499 if not source: return
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1500 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1501
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1502 tr = self.transaction()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1503
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1504 # pull off the changeset group
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1505 self.ui.status("adding changesets\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1506 co = self.changelog.tip()
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 223 diff changeset	1507 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1508 changesets = self.changelog.rev(cn) - self.changelog.rev(co)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1509
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1510 # pull off the manifest group
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1511 self.ui.status("adding manifests\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1512 mm = self.manifest.tip()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1513 mo = self.manifest.addgroup(getgroup(), revmap, tr)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1514
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1515 # process the files
772 f05deda58457 Make pull count jargon less confusing mpm@selenic.com parents: 768 diff changeset	1516 self.ui.status("adding file changes\n")
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1517 while 1:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1518 f = getchunk()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1519 if not f: break
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1520 self.ui.debug("adding %s revisions\n" % f)
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1521 fl = self.file(f)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1522 o = fl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1523 n = fl.addgroup(getgroup(), revmap, tr)
529 aace5b681fe9 Attempt to fix negative revision count from pull mpm@selenic.com parents: 522 diff changeset	1524 revisions += fl.count() - o
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1525 files += 1
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1526
772 f05deda58457 Make pull count jargon less confusing mpm@selenic.com parents: 768 diff changeset	1527 self.ui.status(("added %d changesets" +
f05deda58457 Make pull count jargon less confusing mpm@selenic.com parents: 768 diff changeset	1528 " with %d changes to %d files\n")
f05deda58457 Make pull count jargon less confusing mpm@selenic.com parents: 768 diff changeset	1529 % (changesets, revisions, files))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1530
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1531 tr.close()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1532
5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1533 if not self.hook("changegroup"):
5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1534 return 1
5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1535
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1536 return
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1537
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1538 def update(self, node, allow=False, force=False, choose=None,
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1539 moddirstate=True):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1540 pl = self.dirstate.parents()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1541 if not force and pl[1] != nullid:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1542 self.ui.warn("aborting: outstanding uncommitted merges\n")
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1543 return 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1544
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1545 p1, p2 = pl[0], node
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1546 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	1547 m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1548 m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1549 man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1550 m1 = self.manifest.read(m1n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1551 mf1 = self.manifest.readflags(m1n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1552 m2 = self.manifest.read(m2n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1553 mf2 = self.manifest.readflags(m2n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1554 ma = self.manifest.read(man)
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: 408 diff changeset	1555 mfa = self.manifest.readflags(man)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1556
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1557 (c, a, d, u) = self.changes()
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1558
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1559 # 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	1560 # from p1 to p2?
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1561 linear_path = (pa == p1 or pa == p2)
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1562
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1563 # 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	1564 # we care about merging
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1565 self.ui.note("resolving manifests\n")
650 2c934c7b79dc Fix bug in reverting deleted files Matt Mackall <mpm@selenic.com> parents: 649 diff changeset	1566 self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" %
2c934c7b79dc Fix bug in reverting deleted files Matt Mackall <mpm@selenic.com> parents: 649 diff changeset	1567 (force, allow, moddirstate, linear_path))
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1568 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	1569 (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1570
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1571 merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1572 get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1573 remove = []
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1574 mark = {}
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1575
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1576 # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1577 mw = m1.copy()
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1578 mfw = mf1.copy()
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1579 umap = dict.fromkeys(u)
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1580
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1581 for f in a + c + u:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1582 mw[f] = ""
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1583 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	1584
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1585 for f in d:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1586 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	1587
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1588 # 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	1589 # 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	1590 # 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	1591 # 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	1592 # longer in the manifest.
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1593 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	1594 self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1595
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1596 # Compare manifests
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1597 for f, n in mw.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1598 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	1599 if f in m2:
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1600 s = 0
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1601
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1602 # is the wfile new since m1, and match m2?
428 183c87d4e1a0 Fix typo in merging new files mpm@selenic.com parents: 421 diff changeset	1603 if f not in m1:
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1604 t1 = self.wfile(f).read()
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1605 t2 = self.file(f).revision(m2[f])
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1606 if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1607 mark[f] = 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1608 n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1609 del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1610
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1611 # are files different?
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1612 if n != m2[f]:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1613 a = ma.get(f, nullid)
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1614 # are both different from the ancestor?
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1615 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	1616 self.ui.debug(" %s versions differ, resolve\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1617 # merge executable bits
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1618 # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1619 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1620 mode = ((a^b) \| (a^c)) ^ a
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1621 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	1622 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1623 # are we clobbering?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1624 # is remote's version newer?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1625 # or are we going back in time?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1626 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	1627 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	1628 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1629 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1630 else:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1631 mark[f] = 1
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1632 elif f in umap:
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1633 # this unknown file is the same as the checkout
da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1634 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1635
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1636 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	1637 if force:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1638 self.ui.debug(" updating permissions for %s\n" % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1639 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	1640 else:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1641 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	1642 mode = ((a^b) \| (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1643 if mode != b:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1644 self.ui.debug(" updating permissions for %s\n" % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1645 util.set_exec(self.wjoin(f), mode)
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1646 mark[f] = 1
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1647 del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1648 elif f in ma:
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1649 if n != ma[f]:
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1650 r = "d"
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1651 if not force and (linear_path or allow):
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	1652 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	1653 (" 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	1654 "(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	1655 if r == "d":
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1656 remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1657 else:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1658 self.ui.debug("other deleted %s\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1659 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	1660 else:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1661 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	1662 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	1663 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	1664 remove.append(f)
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1665 else:
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past mpm@selenic.com parents: 377 diff changeset	1666 self.ui.debug("local created %s, keeping\n" % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1667 else:
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1668 self.ui.debug("working dir created %s, keeping\n" % f)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1669
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1670 for f, n in m2.iteritems():
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1671 if choose and not choose(f): continue
256 649ed23e4661 minor fixes for update() mpm@selenic.com parents: 254 diff changeset	1672 if f[0] == "/": continue
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1673 if f in ma and n != ma[f]:
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1674 r = "k"
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1675 if not force and (linear_path or allow):
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	1676 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	1677 ("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	1678 "(k)eep or (d)elete?", "[kd]", "k")
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1679 if r == "k": get[f] = n
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1680 elif f not in ma:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1681 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	1682 get[f] = n
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1683 else:
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1684 if force or p2 == pa: # going backwards?
4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1685 self.ui.debug("local deleted %s, recreating\n" % f)
650 2c934c7b79dc Fix bug in reverting deleted files Matt Mackall <mpm@selenic.com> parents: 649 diff changeset	1686 get[f] = n
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1687 else:
4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1688 self.ui.debug("local deleted %s\n" % f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1689
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1690 del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1691
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1692 if force:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1693 for f in merge:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1694 get[f] = merge[f][1]
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1695 merge = {}
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1696
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1697 if linear_path or force:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1698 # 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	1699 mode = 'n'
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1700 p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1701 else:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1702 if not allow:
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1703 self.ui.status("this update spans a branch" +
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1704 " affecting the following files:\n")
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1705 fl = merge.keys() + get.keys()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1706 fl.sort()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1707 for f in fl:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1708 cf = ""
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1709 if f in merge: cf = " (resolve)"
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1710 self.ui.status(" %s%s\n" % (f, cf))
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1711 self.ui.warn("aborting update spanning branches!\n")
788 64d2a558c943 add note about -C to update message mpm@selenic.com parents: 786 diff changeset	1712 self.ui.status("(use update -m to merge across branches" +
64d2a558c943 add note about -C to update message mpm@selenic.com parents: 786 diff changeset	1713 " or -C to lose changes)\n")
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1714 return 1
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1715 # 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	1716 # 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	1717 # parents must be in the changeset
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1718 mode = 'm'
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1719 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1720 self.dirstate.update(mark.keys(), "m")
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1721
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1722 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1723 self.dirstate.setparents(p1, p2)
191 d7e859cf2f1b merge: add count of new manifests, files, and revisions mpm@selenic.com parents: 190 diff changeset	1724
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1725 # 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	1726 files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1727 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1728 for f in files:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1729 if f[0] == "/": continue
273 4f8174389001 merge: Fix bug where we overwrote local when local was newer mpm@selenic.com parents: 263 diff changeset	1730 self.ui.note("getting %s\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1731 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	1732 try:
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	1733 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	1734 except IOError:
297 0dbcf3c9ff20 Fixed usage of removed variable 'wp'. Thomas Arendsen Hein <thomas@intevation.de> parents: 292 diff changeset	1735 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	1736 self.wfile(f, "w").write(t)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1737 util.set_exec(self.wjoin(f), mf2[f])
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1738 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1739 self.dirstate.update([f], mode)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1740
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1741 # merge the tricky bits
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1742 files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1743 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1744 for f in files:
256 649ed23e4661 minor fixes for update() mpm@selenic.com parents: 254 diff changeset	1745 self.ui.status("merging %s\n" % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1746 m, o, flag = merge[f]
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1747 self.merge3(f, m, o)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1748 util.set_exec(self.wjoin(f), flag)
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1749 if moddirstate:
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1750 if mode == 'm':
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1751 # only update dirstate on branch merge, otherwise we
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1752 # could mark files with changes as unchanged
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1753 self.dirstate.update([f], mode)
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1754 elif p2 == nullid:
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1755 # update dirstate from parent1's manifest
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1756 m1n = self.changelog.read(p1)[0]
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1757 m1 = self.manifest.read(m1n)
865 2d2fee33ec68 Cleanup after previous changes: Thomas Arendsen Hein <thomas@intevation.de> parents: 863 diff changeset	1758 f_len = len(self.file(f).read(m1[f]))
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1759 self.dirstate.update([f], mode, st_size=f_len, st_mtime=0)
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1760 else:
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1761 self.ui.warn("Second parent without branch merge!?\n"
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1762 "Dirstate for file %s may be wrong.\n" % f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1763
681 32b6bbf1c37b Sort files for removal Matt Mackall <mpm@selenic.com> parents: 680 diff changeset	1764 remove.sort()
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1765 for f in remove:
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1766 self.ui.note("removing %s\n" % f)
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1767 try:
934 ff484cc157d6 Fix path handling for deleting files on merge mpm@selenic.com parents: 933 diff changeset	1768 os.unlink(self.wjoin(f))
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1769 except OSError, inst:
f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1770 self.ui.warn("update failed to remove %s: %s!\n" % (f, inst))
578 e33c85d2812a Remove empty directories on update mpm@selenic.com parents: 576 diff changeset	1771 # try removing directories that might now be empty
934 ff484cc157d6 Fix path handling for deleting files on merge mpm@selenic.com parents: 933 diff changeset	1772 try: os.removedirs(os.path.dirname(self.wjoin(f)))
578 e33c85d2812a Remove empty directories on update mpm@selenic.com parents: 576 diff changeset	1773 except: pass
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1774 if moddirstate:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1775 if mode == 'n':
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1776 self.dirstate.forget(remove)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1777 else:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1778 self.dirstate.update(remove, 'r')
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1779
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1780 def merge3(self, fn, my, other):
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1781 """perform a 3-way merge in the working directory"""
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	1782
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1783 def temp(prefix, node):
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1784 pre = "%s~%s." % (os.path.basename(fn), prefix)
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1785 (fd, name) = tempfile.mkstemp("", pre)
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	1786 f = os.fdopen(fd, "wb")
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1787 f.write(fl.revision(node))
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1788 f.close()
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1789 return name
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1790
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1791 fl = self.file(fn)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1792 base = fl.ancestor(my, other)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1793 a = self.wjoin(fn)
346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1794 b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1795 c = temp("other", other)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1796
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1797 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	1798 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	1799 (fn, short(other), short(base)))
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1800
703 fb6f85ecc863 merge program setting from hgrc wasn't used. Thomas Arendsen Hein <thomas@intevation.de> parents: 691 diff changeset	1801 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
fb6f85ecc863 merge program setting from hgrc wasn't used. Thomas Arendsen Hein <thomas@intevation.de> parents: 691 diff changeset	1802 or "hgmerge")
240 737c66b68290 Replace tkmerge with hgmerge mpm@selenic.com parents: 232 diff changeset	1803 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	1804 if r:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1805 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	1806
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1807 os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1808 os.unlink(c)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1809
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1810 def verify(self):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1811 filelinkrevs = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1812 filenodes = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1813 changesets = revisions = files = 0
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1814 errors = 0
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1815
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1816 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1817 self.ui.status("checking changesets\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1818 for i in range(self.changelog.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1819 changesets += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1820 n = self.changelog.node(i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1821 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1822 self.ui.warn("duplicate changeset at revision %d\n" % i)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1823 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1824 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1825
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1826 for p in self.changelog.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1827 if p not in self.changelog.nodemap:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1828 self.ui.warn("changeset %s has unknown parent %s\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1829 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1830 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1831 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1832 changes = self.changelog.read(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1833 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1834 self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1835 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1836
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1837 for f in changes[3]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1838 filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1839
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1840 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1841 self.ui.status("checking manifests\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1842 for i in range(self.manifest.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1843 n = self.manifest.node(i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1844 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1845 self.ui.warn("duplicate manifest at revision %d\n" % i)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1846 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1847 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1848
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1849 for p in self.manifest.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1850 if p not in self.manifest.nodemap:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1851 self.ui.warn("manifest %s has unknown parent %s\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1852 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1853 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1854
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1855 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1856 delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1857 except KeyboardInterrupt:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 579 diff changeset	1858 self.ui.warn("aborted")
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1859 sys.exit(0)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1860 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1861 self.ui.warn("unpacking manifest %s: %s\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1862 % (short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1863 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1864
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1865 ff = [ l.split('\0') for l in delta.splitlines() ]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1866 for f, fn in ff:
284 d7c2efd0b541 verify: don't die from new permission bits mpm@selenic.com parents: 279 diff changeset	1867 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1868
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1869 self.ui.status("crosschecking files in changesets and manifests\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1870 for f in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1871 if f not in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1872 self.ui.warn("file %s in manifest but not in changesets\n" % f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1873 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1874
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1875 for f in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1876 if f not in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1877 self.ui.warn("file %s in changeset but not in manifest\n" % f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1878 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1879
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1880 self.ui.status("checking files\n")
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1881 ff = filenodes.keys()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1882 ff.sort()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1883 for f in ff:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1884 if f == "/dev/null": continue
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1885 files += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1886 fl = self.file(f)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1887 nodes = { nullid: 1 }
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1888 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1889 for i in range(fl.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1890 revisions += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1891 n = fl.node(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1892
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1893 if n in seen:
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1894 self.ui.warn("%s: duplicate revision %d\n" % (f, i))
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1895 errors += 1
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1896
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1897 if n not in filenodes[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1898 self.ui.warn("%s: %d:%s not in manifests\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1899 % (f, i, short(n)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1900 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1901 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1902 del filenodes[f][n]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1903
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1904 flr = fl.linkrev(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1905 if flr not in filelinkrevs[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1906 self.ui.warn("%s:%s points to unexpected changeset %d\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1907 % (f, short(n), fl.linkrev(n)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1908 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1909 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1910 filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1911
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1912 # verify contents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1913 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1914 t = fl.read(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1915 except Exception, inst:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1916 self.ui.warn("unpacking file %s %s: %s\n"
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1917 % (f, short(n), inst))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1918 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1919
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1920 # verify parents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1921 (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1922 if p1 not in nodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1923 self.ui.warn("file %s:%s unknown parent 1 %s" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1924 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1925 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1926 if p2 not in nodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1927 self.ui.warn("file %s:%s unknown parent 2 %s" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1928 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1929 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1930 nodes[n] = 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1931
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1932 # cross-check
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1933 for node in filenodes[f]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1934 self.ui.warn("node %s in manifests not in %s\n"
721 fed842bb84b2 Fix verify error reporting bug mpm@selenic.com parents: 713 diff changeset	1935 % (hex(node), f))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1936 errors += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1937
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1938 self.ui.status("%d files, %d changesets, %d total revisions\n" %
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1939 (files, changesets, revisions))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1940
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1941 if errors:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1942 self.ui.warn("%d integrity errors encountered!\n" % errors)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1943 return 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1944
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	1945 class remoterepository:
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	1946 def local(self):
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	1947 return False
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	1948
b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	1949 class httprepository(remoterepository):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1950 def __init__(self, ui, path):
765 1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	1951 # fix missing / after hostname
1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	1952 s = urlparse.urlsplit(path)
1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	1953 partial = s[2]
1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	1954 if not partial: partial = "/"
1e31d97c3d70 Hack to fix missing '/' problem in URLs mpm@selenic.com parents: 764 diff changeset	1955 self.url = urlparse.urlunsplit((s[0], s[1], partial, '', ''))
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1956 self.ui = ui
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1957 no_list = [ "localhost", "127.0.0.1" ]
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1958 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	1959 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	1960 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	1961 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	1962 host = host[7:]
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1963 user = ui.config("http_proxy", "user")
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1964 passwd = ui.config("http_proxy", "passwd")
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1965 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	1966 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	1967 no = os.environ.get("no_proxy")
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1968 if no:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1969 no_list = no_list + no.split(",")
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1970
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1971 no_proxy = 0
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1972 for h in no_list:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1973 if (path.startswith("http://" + h + "/") or
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1974 path.startswith("http://" + h + ":") or
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1975 path == "http://" + h):
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1976 no_proxy = 1
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1977
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1978 # Note: urllib2 takes proxy values from the environment and those will
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1979 # 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	1980 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
859 6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	1981 try:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	1982 if os.environ.has_key(env):
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	1983 del os.environ[env]
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	1984 except OSError:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	1985 pass
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1986
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1987 proxy_handler = urllib2.BaseHandler()
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1988 if host and not no_proxy:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1989 proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host})
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1990
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1991 authinfo = None
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1992 if user and passwd:
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1993 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1994 passmgr.add_password(None, host, user, passwd)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1995 authinfo = urllib2.ProxyBasicAuthHandler(passmgr)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1996
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1997 opener = urllib2.build_opener(proxy_handler, authinfo)
73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	1998 urllib2.install_opener(opener)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	1999
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2000 def dev(self):
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2001 return -1
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2002
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2003 def do_cmd(self, cmd, **args):
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	2004 self.ui.debug("sending %s command\n" % cmd)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2005 q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2006 q.update(args)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2007 qs = urllib.urlencode(q)
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2008 cu = "%s?%s" % (self.url, qs)
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2009 resp = urllib2.urlopen(cu)
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2010 proto = resp.headers['content-type']
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2011
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2012 # accept old "text/plain" and "application/hg-changegroup" for now
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2013 if not proto.startswith('application/mercurial') and \
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2014 not proto.startswith('text/plain') and \
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2015 not proto.startswith('application/hg-changegroup'):
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2016 raise RepoError("'%s' does not appear to be an hg repository"
c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2017 % self.url)
c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2018
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2019 if proto.startswith('application/mercurial'):
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2020 version = proto[22:]
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2021 if float(version) > 0.1:
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2022 raise RepoError("'%s' uses newer protocol %s" %
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2023 (self.url, version))
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	2024
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2025 return resp
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2026
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2027 def heads(self):
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2028 d = self.do_cmd("heads").read()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2029 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2030 return map(bin, d[:-1].split(" "))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2031 except:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2032 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2033 raise
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2034
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2035 def branches(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2036 n = " ".join(map(hex, nodes))
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2037 d = self.do_cmd("branches", nodes=n).read()
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2038 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2039 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2040 return br
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2041 except:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2042 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2043 raise
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2044
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2045 def between(self, pairs):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2046 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2047 d = self.do_cmd("between", pairs=n).read()
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2048 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2049 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	2050 return p
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2051 except:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2052 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n")
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	2053 raise
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2054
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2055 def changegroup(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2056 n = " ".join(map(hex, nodes))
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2057 f = self.do_cmd("changegroup", roots=n)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	2058 bytes = 0
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2059
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2060 class zread:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2061 def __init__(self, f):
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2062 self.zd = zlib.decompressobj()
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2063 self.f = f
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2064 self.buf = ""
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2065 def read(self, l):
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2066 while l > len(self.buf):
751 0b245edec124 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) Muli Ben-Yehuda <mulix@mulix.org> parents: 741 diff changeset	2067 r = self.f.read(4096)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2068 if r:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2069 self.buf += self.zd.decompress(r)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2070 else:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2071 self.buf += self.zd.flush()
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2072 break
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2073 d, self.buf = self.buf[:l], self.buf[l:]
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2074 return d
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2075
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	2076 return zread(f)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2077
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2078 class remotelock:
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2079 def __init__(self, repo):
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2080 self.repo = repo
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2081 def release(self):
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2082 self.repo.unlock()
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2083 self.repo = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2084 def __del__(self):
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2085 if self.repo:
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2086 self.release()
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2087
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	2088 class sshrepository(remoterepository):
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2089 def __init__(self, ui, path):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2090 self.url = path
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2091 self.ui = ui
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2092
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2093 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))', path)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2094 if not m:
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2095 raise RepoError("couldn't parse destination %s" % path)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2096
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2097 self.user = m.group(2)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2098 self.host = m.group(3)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2099 self.port = m.group(5)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2100 self.path = m.group(7)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2101
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2102 args = self.user and ("%s@%s" % (self.user, self.host)) or self.host
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2103 args = self.port and ("%s -p %s") % (args, self.port) or args
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2104 path = self.path or ""
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2105
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2106 if not path:
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2107 raise RepoError("no remote repository path specified")
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2108
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	2109 sshcmd = self.ui.config("ui", "ssh", "ssh")
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	2110 remotecmd = self.ui.config("ui", "remotecmd", "hg")
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	2111 cmd = "%s %s '%s -R %s serve --stdio'"
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 934 diff changeset	2112 cmd = cmd % (sshcmd, args, remotecmd, path)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2113
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2114 self.pipeo, self.pipei, self.pipee = os.popen3(cmd)
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2115
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2116 def readerr(self):
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2117 while 1:
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2118 r,w,x = select.select([self.pipee], [], [], 0)
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2119 if not r: break
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2120 l = self.pipee.readline()
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2121 if not l: break
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2122 self.ui.status("remote: ", l)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2123
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2124 def __del__(self):
817 cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2125 try:
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2126 self.pipeo.close()
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2127 self.pipei.close()
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2128 for l in self.pipee:
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2129 self.ui.status("remote: ", l)
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2130 self.pipee.close()
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2131 except:
cf1d9a01dd92 Make ssh URL parsing more robust mpm@selenic.com parents: 816 diff changeset	2132 pass
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2133
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2134 def dev(self):
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2135 return -1
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	2136
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2137 def do_cmd(self, cmd, **args):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2138 self.ui.debug("sending %s command\n" % cmd)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2139 self.pipeo.write("%s\n" % cmd)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2140 for k, v in args.items():
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2141 self.pipeo.write("%s %d\n" % (k, len(v)))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2142 self.pipeo.write(v)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2143 self.pipeo.flush()
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2144
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2145 return self.pipei
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2146
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2147 def call(self, cmd, **args):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2148 r = self.do_cmd(cmd, **args)
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2149 l = r.readline()
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2150 self.readerr()
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2151 try:
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2152 l = int(l)
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2153 except:
342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2154 raise RepoError("unexpected response '%s'" % l)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2155 return r.read(l)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2156
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2157 def lock(self):
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2158 self.call("lock")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2159 return remotelock(self)
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2160
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2161 def unlock(self):
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2162 self.call("unlock")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 637 diff changeset	2163
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2164 def heads(self):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2165 d = self.call("heads")
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2166 try:
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2167 return map(bin, d[:-1].split(" "))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2168 except:
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2169 raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2170
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2171 def branches(self, nodes):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2172 n = " ".join(map(hex, nodes))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2173 d = self.call("branches", nodes=n)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2174 try:
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2175 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2176 return br
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2177 except:
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2178 raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2179
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2180 def between(self, pairs):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2181 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2182 d = self.call("between", pairs=n)
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2183 try:
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2184 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2185 return p
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2186 except:
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2187 raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2188
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2189 def changegroup(self, nodes):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2190 n = " ".join(map(hex, nodes))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2191 f = self.do_cmd("changegroup", roots=n)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2192 return self.pipei
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2193
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2194 def addchangegroup(self, cg):
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2195 d = self.call("addchangegroup")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2196 if d:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2197 raise RepoError("push refused: %s", d)
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2198
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2199 while 1:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2200 d = cg.read(4096)
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2201 if not d: break
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2202 self.pipeo.write(d)
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2203 self.readerr()
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2204
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2205 self.pipeo.flush()
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2206
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2207 self.readerr()
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2208 l = int(self.pipei.readline())
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	2209 return self.pipei.read(l) != ""
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2210
923 c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	2211 class httpsrepository(httprepository):
c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	2212 pass
c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	2213
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2214 def repository(ui, path=None, create=0):
623 314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2215 if path:
314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2216 if path.startswith("http://"):
314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2217 return httprepository(ui, path)
923 c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	2218 if path.startswith("https://"):
c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	2219 return httpsrepository(ui, path)
623 314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2220 if path.startswith("hg://"):
314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2221 return httprepository(ui, path.replace("hg://", "http://"))
314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2222 if path.startswith("old-http://"):
314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2223 return localrepository(ui, path.replace("old-http://", "http://"))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2224 if path.startswith("ssh://"):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	2225 return sshrepository(ui, path)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	2226
623 314867960a4a Change remote repository to httprepository Matt Mackall <mpm@selenic.com> parents: 622 diff changeset	2227 return localrepository(ui, path, create)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hg.py @ 961:3e11d5038649