hg.py
952 lines
| 29.3 KiB
| text/x-python
|
PythonLexer
/ mercurial / hg.py
|
r0 | # hg.py - repository classes for mercurial | ||
# | ||||
# Copyright 2005 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
|
r110 | import sys, struct, sha, socket, os, time, re, urllib2 | ||
|
r15 | import urllib | ||
|
r161 | from mercurial import byterange, lock | ||
|
r0 | from mercurial.transaction import * | ||
from mercurial.revlog import * | ||||
|
r79 | from difflib import SequenceMatcher | ||
|
r0 | |||
class filelog(revlog): | ||||
def __init__(self, opener, path): | ||||
|
r144 | revlog.__init__(self, opener, | ||
os.path.join("data", path + ".i"), | ||||
os.path.join("data", path + ".d")) | ||||
|
r0 | |||
def read(self, node): | ||||
return self.revision(node) | ||||
def add(self, text, transaction, link, p1=None, p2=None): | ||||
return self.addrevision(text, transaction, link, p1, p2) | ||||
|
r79 | def annotate(self, node): | ||
revs = [] | ||||
while node != nullid: | ||||
revs.append(node) | ||||
node = self.parents(node)[0] | ||||
revs.reverse() | ||||
prev = [] | ||||
annotate = [] | ||||
|
r109 | |||
|
r79 | for node in revs: | ||
curr = self.read(node).splitlines(1) | ||||
linkrev = self.linkrev(node) | ||||
sm = SequenceMatcher(None, prev, curr) | ||||
|
r109 | new = [] | ||
|
r79 | for o, m, n, s, t in sm.get_opcodes(): | ||
|
r109 | if o == 'equal': | ||
new += annotate[m:n] | ||||
else: | ||||
new += [(linkrev, l) for l in curr[s:t]] | ||||
annotate, prev = new, curr | ||||
|
r79 | return annotate | ||
|
r0 | class manifest(revlog): | ||
def __init__(self, opener): | ||||
self.mapcache = None | ||||
self.listcache = None | ||||
self.addlist = None | ||||
revlog.__init__(self, opener, "00manifest.i", "00manifest.d") | ||||
def read(self, node): | ||||
if self.mapcache and self.mapcache[0] == node: | ||||
|
r90 | return self.mapcache[1].copy() | ||
|
r0 | text = self.revision(node) | ||
map = {} | ||||
|
r25 | self.listcache = (text, text.splitlines(1)) | ||
for l in self.listcache[1]: | ||||
|
r0 | (f, n) = l.split('\0') | ||
map[f] = bin(n[:40]) | ||||
self.mapcache = (node, map) | ||||
return map | ||||
def diff(self, a, b): | ||||
# this is sneaky, as we're not actually using a and b | ||||
|
r140 | if self.listcache and self.addlist and self.listcache[0] == a: | ||
|
r98 | d = mdiff.diff(self.listcache[1], self.addlist, 1) | ||
if mdiff.patch(a, d) != b: | ||||
sys.stderr.write("*** sortdiff failed, falling back ***\n") | ||||
return mdiff.textdiff(a, b) | ||||
return d | ||||
|
r0 | else: | ||
|
r44 | return mdiff.textdiff(a, b) | ||
|
r0 | |||
def add(self, map, transaction, link, p1=None, p2=None): | ||||
files = map.keys() | ||||
files.sort() | ||||
self.addlist = ["%s\000%s\n" % (f, hex(map[f])) for f in files] | ||||
text = "".join(self.addlist) | ||||
n = self.addrevision(text, transaction, link, p1, p2) | ||||
self.mapcache = (n, map) | ||||
|
r25 | self.listcache = (text, self.addlist) | ||
|
r140 | self.addlist = None | ||
|
r0 | |||
return n | ||||
class changelog(revlog): | ||||
def __init__(self, opener): | ||||
revlog.__init__(self, opener, "00changelog.i", "00changelog.d") | ||||
def extract(self, text): | ||||
|
r37 | if not text: | ||
|
r40 | return (nullid, "", "0", [], "") | ||
|
r0 | last = text.index("\n\n") | ||
desc = text[last + 2:] | ||||
l = text[:last].splitlines() | ||||
manifest = bin(l[0]) | ||||
user = l[1] | ||||
date = l[2] | ||||
files = l[3:] | ||||
return (manifest, user, date, files, desc) | ||||
def read(self, node): | ||||
return self.extract(self.revision(node)) | ||||
def add(self, manifest, list, desc, transaction, p1=None, p2=None): | ||||
|
r55 | user = (os.environ.get("HGUSER") or | ||
os.environ.get("EMAIL") or | ||||
os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn()) | ||||
|
r0 | date = "%d %d" % (time.time(), time.timezone) | ||
list.sort() | ||||
l = [hex(manifest), user, date] + list + ["", desc] | ||||
text = "\n".join(l) | ||||
return self.addrevision(text, transaction, self.count(), p1, p2) | ||||
class dircache: | ||||
|
r20 | def __init__(self, opener, ui): | ||
|
r0 | self.opener = opener | ||
self.dirty = 0 | ||||
|
r20 | self.ui = ui | ||
|
r0 | self.map = None | ||
def __del__(self): | ||||
if self.dirty: self.write() | ||||
def __getitem__(self, key): | ||||
try: | ||||
return self.map[key] | ||||
except TypeError: | ||||
self.read() | ||||
return self[key] | ||||
def read(self): | ||||
if self.map is not None: return self.map | ||||
self.map = {} | ||||
try: | ||||
st = self.opener("dircache").read() | ||||
except: return | ||||
pos = 0 | ||||
while pos < len(st): | ||||
e = struct.unpack(">llll", st[pos:pos+16]) | ||||
l = e[3] | ||||
pos += 16 | ||||
f = st[pos:pos + l] | ||||
self.map[f] = e[:3] | ||||
pos += l | ||||
def update(self, files): | ||||
if not files: return | ||||
self.read() | ||||
self.dirty = 1 | ||||
for f in files: | ||||
try: | ||||
s = os.stat(f) | ||||
self.map[f] = (s.st_mode, s.st_size, s.st_mtime) | ||||
except IOError: | ||||
self.remove(f) | ||||
def taint(self, files): | ||||
if not files: return | ||||
self.read() | ||||
self.dirty = 1 | ||||
for f in files: | ||||
self.map[f] = (0, -1, 0) | ||||
def remove(self, files): | ||||
if not files: return | ||||
self.read() | ||||
self.dirty = 1 | ||||
for f in files: | ||||
|
r20 | try: | ||
del self.map[f] | ||||
except KeyError: | ||||
self.ui.warn("Not in dircache: %s\n" % f) | ||||
pass | ||||
|
r0 | |||
def clear(self): | ||||
self.map = {} | ||||
self.dirty = 1 | ||||
def write(self): | ||||
st = self.opener("dircache", "w") | ||||
for f, e in self.map.items(): | ||||
e = struct.pack(">llll", e[0], e[1], e[2], len(f)) | ||||
st.write(e + f) | ||||
self.dirty = 0 | ||||
def copy(self): | ||||
self.read() | ||||
return self.map.copy() | ||||
# used to avoid circular references so destructors work | ||||
def opener(base): | ||||
p = base | ||||
def o(path, mode="r"): | ||||
|
r15 | if p[:7] == "http://": | ||
f = os.path.join(p, urllib.quote(path)) | ||||
return httprangereader(f) | ||||
|
r0 | f = os.path.join(p, path) | ||
|
r110 | if mode != "r": | ||
try: | ||||
s = os.stat(f) | ||||
except OSError: | ||||
d = os.path.dirname(f) | ||||
if not os.path.isdir(d): | ||||
os.makedirs(d) | ||||
else: | ||||
if s.st_nlink > 1: | ||||
file(f + ".tmp", "w").write(file(f).read()) | ||||
os.rename(f+".tmp", f) | ||||
|
r0 | |||
return file(f, mode) | ||||
return o | ||||
|
r60 | class localrepository: | ||
|
r0 | def __init__(self, ui, path=None, create=0): | ||
self.remote = 0 | ||||
if path and path[:7] == "http://": | ||||
self.remote = 1 | ||||
self.path = path | ||||
else: | ||||
if not path: | ||||
p = os.getcwd() | ||||
while not os.path.isdir(os.path.join(p, ".hg")): | ||||
p = os.path.dirname(p) | ||||
if p == "/": raise "No repo found" | ||||
path = p | ||||
self.path = os.path.join(path, ".hg") | ||||
self.root = path | ||||
self.ui = ui | ||||
if create: | ||||
os.mkdir(self.path) | ||||
os.mkdir(self.join("data")) | ||||
self.opener = opener(self.path) | ||||
self.manifest = manifest(self.opener) | ||||
self.changelog = changelog(self.opener) | ||||
self.ignorelist = None | ||||
|
r67 | self.tags = None | ||
|
r0 | |||
if not self.remote: | ||||
|
r20 | self.dircache = dircache(self.opener, ui) | ||
|
r0 | try: | ||
|
r4 | self.current = bin(self.opener("current").read()) | ||
except IOError: | ||||
|
r0 | self.current = None | ||
def setcurrent(self, node): | ||||
self.current = node | ||||
self.opener("current", "w").write(hex(node)) | ||||
def ignore(self, f): | ||||
if self.ignorelist is None: | ||||
self.ignorelist = [] | ||||
try: | ||||
|
r67 | l = open(os.path.join(self.root, ".hgignore")) | ||
|
r0 | for pat in l: | ||
|
r9 | if pat != "\n": | ||
self.ignorelist.append(re.compile(pat[:-1])) | ||||
|
r0 | except IOError: pass | ||
for pat in self.ignorelist: | ||||
if pat.search(f): return True | ||||
return False | ||||
|
r67 | def lookup(self, key): | ||
if self.tags is None: | ||||
self.tags = {} | ||||
try: | ||||
fl = self.file(".hgtags") | ||||
for l in fl.revision(fl.tip()).splitlines(): | ||||
if l: | ||||
n, k = l.split(" ") | ||||
self.tags[k] = bin(n) | ||||
except KeyError: pass | ||||
try: | ||||
return self.tags[key] | ||||
except KeyError: | ||||
return self.changelog.lookup(key) | ||||
|
r0 | def join(self, f): | ||
return os.path.join(self.path, f) | ||||
def file(self, f): | ||||
|
r192 | if f[0] == '/': f = f[1:] | ||
|
r144 | return filelog(self.opener, f) | ||
|
r0 | |||
def transaction(self): | ||||
|
r95 | return transaction(self.opener, self.join("journal"), | ||
self.join("undo")) | ||||
|
r0 | |||
|
r162 | def recover(self, f = "journal"): | ||
self.lock() | ||||
if os.path.exists(self.join(f)): | ||||
|
r163 | self.ui.status("attempting to rollback %s information\n" % f) | ||
|
r162 | return rollback(self.opener, self.join(f)) | ||
|
r163 | else: | ||
self.ui.warn("no %s information available\n" % f) | ||||
|
r162 | |||
|
r161 | def lock(self, wait = 1): | ||
try: | ||||
return lock.lock(self.join("lock"), 0) | ||||
except lock.LockHeld, inst: | ||||
if wait: | ||||
self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) | ||||
return lock.lock(self.join("lock"), wait) | ||||
raise inst | ||||
|
r30 | def commit(self, parent, update = None, text = ""): | ||
|
r161 | self.lock() | ||
|
r0 | try: | ||
remove = [ l[:-1] for l in self.opener("to-remove") ] | ||||
os.unlink(self.join("to-remove")) | ||||
except IOError: | ||||
remove = [] | ||||
if update == None: | ||||
|
r29 | update = self.diffdir(self.root, parent)[0] | ||
|
r0 | |||
|
r151 | if not update: | ||
self.ui.status("nothing changed\n") | ||||
return | ||||
tr = self.transaction() | ||||
|
r0 | # check in files | ||
new = {} | ||||
linkrev = self.changelog.count() | ||||
|
r113 | update.sort() | ||
|
r0 | for f in update: | ||
|
r83 | self.ui.note(f + "\n") | ||
|
r0 | try: | ||
t = file(f).read() | ||||
except IOError: | ||||
remove.append(f) | ||||
continue | ||||
r = self.file(f) | ||||
new[f] = r.add(t, tr, linkrev) | ||||
# update manifest | ||||
mmap = self.manifest.read(self.manifest.tip()) | ||||
mmap.update(new) | ||||
for f in remove: | ||||
del mmap[f] | ||||
mnode = self.manifest.add(mmap, tr, linkrev) | ||||
# add changeset | ||||
new = new.keys() | ||||
new.sort() | ||||
|
r185 | edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mnode) | ||
edittext += "".join(["HG: changed %s\n" % f for f in new]) | ||||
|
r25 | edittext += "".join(["HG: removed %s\n" % f for f in remove]) | ||
|
r0 | edittext = self.ui.edit(edittext) | ||
n = self.changelog.add(mnode, new, edittext, tr) | ||||
tr.close() | ||||
self.setcurrent(n) | ||||
self.dircache.update(new) | ||||
self.dircache.remove(remove) | ||||
def checkout(self, node): | ||||
# checkout is really dumb at the moment | ||||
# it ought to basically merge | ||||
change = self.changelog.read(node) | ||||
|
r114 | l = self.manifest.read(change[0]).items() | ||
|
r0 | l.sort() | ||
|
r114 | |||
for f,n in l: | ||||
if f[0] == "/": continue | ||||
self.ui.note(f, "\n") | ||||
t = self.file(f).revision(n) | ||||
|
r0 | try: | ||
file(f, "w").write(t) | ||||
|
r114 | except IOError: | ||
os.makedirs(os.path.dirname(f)) | ||||
|
r0 | file(f, "w").write(t) | ||
self.setcurrent(node) | ||||
self.dircache.clear() | ||||
|
r114 | self.dircache.update([f for f,n in l]) | ||
|
r0 | |||
|
r29 | def diffdir(self, path, changeset): | ||
|
r0 | changed = [] | ||
|
r4 | mf = {} | ||
|
r0 | added = [] | ||
|
r29 | if changeset: | ||
change = self.changelog.read(changeset) | ||||
|
r4 | mf = self.manifest.read(change[0]) | ||
|
r0 | |||
|
r29 | if changeset == self.current: | ||
dc = self.dircache.copy() | ||||
else: | ||||
dc = dict.fromkeys(mf) | ||||
def fcmp(fn): | ||||
|
r64 | t1 = file(os.path.join(self.root, fn)).read() | ||
|
r29 | t2 = self.file(fn).revision(mf[fn]) | ||
return cmp(t1, t2) | ||||
|
r0 | for dir, subdirs, files in os.walk(self.root): | ||
d = dir[len(self.root)+1:] | ||||
if ".hg" in subdirs: subdirs.remove(".hg") | ||||
for f in files: | ||||
fn = os.path.join(d, f) | ||||
|
r64 | try: s = os.stat(os.path.join(self.root, fn)) | ||
|
r0 | except: continue | ||
if fn in dc: | ||||
c = dc[fn] | ||||
del dc[fn] | ||||
|
r29 | if not c: | ||
if fcmp(fn): | ||||
changed.append(fn) | ||||
|
r33 | elif c[1] != s.st_size: | ||
|
r0 | changed.append(fn) | ||
elif c[0] != s.st_mode or c[2] != s.st_mtime: | ||||
|
r29 | if fcmp(fn): | ||
|
r0 | changed.append(fn) | ||
else: | ||||
if self.ignore(fn): continue | ||||
added.append(fn) | ||||
deleted = dc.keys() | ||||
deleted.sort() | ||||
return (changed, added, deleted) | ||||
|
r32 | def diffrevs(self, node1, node2): | ||
|
r33 | changed, added = [], [] | ||
|
r32 | |||
change = self.changelog.read(node1) | ||||
mf1 = self.manifest.read(change[0]) | ||||
|
r33 | change = self.changelog.read(node2) | ||
|
r32 | mf2 = self.manifest.read(change[0]) | ||
for fn in mf2: | ||||
if mf1.has_key(fn): | ||||
if mf1[fn] != mf2[fn]: | ||||
changed.append(fn) | ||||
del mf1[fn] | ||||
else: | ||||
added.append(fn) | ||||
deleted = mf1.keys() | ||||
deleted.sort() | ||||
return (changed, added, deleted) | ||||
|
r0 | def add(self, list): | ||
self.dircache.taint(list) | ||||
def remove(self, list): | ||||
dl = self.opener("to-remove", "a") | ||||
for f in list: | ||||
dl.write(f + "\n") | ||||
|
r56 | def branches(self, nodes): | ||
if not nodes: nodes = [self.changelog.tip()] | ||||
b = [] | ||||
for n in nodes: | ||||
t = n | ||||
while n: | ||||
p = self.changelog.parents(n) | ||||
if p[1] != nullid or p[0] == nullid: | ||||
b.append((t, n, p[0], p[1])) | ||||
break | ||||
n = p[0] | ||||
return b | ||||
def between(self, pairs): | ||||
r = [] | ||||
for top, bottom in pairs: | ||||
n, l, i = top, [], 0 | ||||
f = 1 | ||||
while n != bottom: | ||||
p = self.changelog.parents(n)[0] | ||||
if i == f: | ||||
l.append(n) | ||||
f = f * 2 | ||||
n = p | ||||
i += 1 | ||||
r.append(l) | ||||
return r | ||||
def newer(self, nodes): | ||||
m = {} | ||||
nl = [] | ||||
|
r94 | pm = {} | ||
|
r56 | cl = self.changelog | ||
t = l = cl.count() | ||||
|
r94 | |||
# find the lowest numbered node | ||||
|
r56 | for n in nodes: | ||
l = min(l, cl.rev(n)) | ||||
|
r94 | m[n] = 1 | ||
|
r46 | |||
|
r56 | for i in xrange(l, t): | ||
n = cl.node(i) | ||||
|
r94 | if n in m: # explicitly listed | ||
pm[n] = 1 | ||||
nl.append(n) | ||||
continue | ||||
|
r56 | for p in cl.parents(n): | ||
|
r94 | if p in pm: # parent listed | ||
pm[n] = 1 | ||||
|
r56 | nl.append(n) | ||
|
r94 | break | ||
|
r56 | |||
return nl | ||||
def getchangegroup(self, remote): | ||||
|
r65 | m = self.changelog.nodemap | ||
|
r56 | search = [] | ||
fetch = [] | ||||
|
r148 | seen = {} | ||
seenbranch = {} | ||||
|
r192 | |||
self.ui.status("searching for changes\n") | ||||
|
r190 | tip = remote.branches([])[0] | ||
self.ui.debug("remote tip branch is %s:%s\n" % | ||||
(short(tip[0]), short(tip[1]))) | ||||
# if we have an empty repo, fetch everything | ||||
if self.changelog.tip() == nullid: | ||||
return remote.changegroup([nullid]) | ||||
# otherwise, assume we're closer to the tip than the root | ||||
unknown = [tip] | ||||
|
r46 | |||
|
r65 | if tip[0] in m: | ||
|
r192 | self.ui.status("nothing to do!\n") | ||
|
r60 | return None | ||
|
r56 | while unknown: | ||
n = unknown.pop(0) | ||||
|
r148 | seen[n[0]] = 1 | ||
self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) | ||||
|
r56 | if n == nullid: break | ||
|
r148 | if n in seenbranch: | ||
self.ui.debug("branch already found\n") | ||||
continue | ||||
|
r65 | if n[1] and n[1] in m: # do we know the base? | ||
|
r148 | self.ui.debug("found incomplete branch %s:%s\n" | ||
% (short(n[0]), short(n[1]))) | ||||
|
r56 | search.append(n) # schedule branch range for scanning | ||
|
r148 | seenbranch[n] = 1 | ||
|
r56 | else: | ||
|
r94 | if n[2] in m and n[3] in m: | ||
if n[1] not in fetch: | ||||
self.ui.debug("found new changeset %s\n" % | ||||
short(n[1])) | ||||
fetch.append(n[1]) # earliest unknown | ||||
continue | ||||
|
r148 | |||
r = [] | ||||
for a in n[2:4]: | ||||
if a not in seen: r.append(a) | ||||
if r: | ||||
self.ui.debug("requesting %s\n" % | ||||
" ".join(map(short, r))) | ||||
for b in remote.branches(r): | ||||
self.ui.debug("received %s:%s\n" % | ||||
(short(b[0]), short(b[1]))) | ||||
if b[0] not in m and b[0] not in seen: | ||||
unknown.append(b) | ||||
|
r56 | |||
while search: | ||||
n = search.pop(0) | ||||
l = remote.between([(n[0], n[1])])[0] | ||||
p = n[0] | ||||
f = 1 | ||||
for i in l + [n[1]]: | ||||
|
r65 | if i in m: | ||
|
r85 | if f <= 2: | ||
|
r83 | self.ui.debug("found new branch changeset %s\n" % | ||
short(p)) | ||||
|
r56 | fetch.append(p) | ||
else: | ||||
|
r83 | self.ui.debug("narrowed branch search to %s:%s\n" | ||
% (short(p), short(i))) | ||||
|
r56 | search.append((p, i)) | ||
|
r65 | break | ||
|
r56 | p, f = i, f * 2 | ||
|
r65 | for f in fetch: | ||
if f in m: | ||||
|
r83 | raise "already have", short(f[:4]) | ||
|
r94 | self.ui.note("adding new changesets starting at " + | ||
|
r83 | " ".join([short(f) for f in fetch]) + "\n") | ||
|
r65 | |||
|
r56 | return remote.changegroup(fetch) | ||
def changegroup(self, basenodes): | ||||
nodes = self.newer(basenodes) | ||||
|
r46 | # construct the link map | ||
linkmap = {} | ||||
for n in nodes: | ||||
linkmap[self.changelog.rev(n)] = n | ||||
# construct a list of all changed files | ||||
changed = {} | ||||
for n in nodes: | ||||
c = self.changelog.read(n) | ||||
for f in c[3]: | ||||
changed[f] = 1 | ||||
changed = changed.keys() | ||||
changed.sort() | ||||
# the changegroup is changesets + manifests + all file revs | ||||
revs = [ self.changelog.rev(n) for n in nodes ] | ||||
|
r192 | for y in self.changelog.group(linkmap): yield y | ||
for y in self.manifest.group(linkmap): yield y | ||||
|
r46 | for f in changed: | ||
|
r192 | yield struct.pack(">l", len(f) + 4) + f | ||
|
r46 | g = self.file(f).group(linkmap) | ||
|
r192 | for y in g: | ||
yield y | ||||
|
r46 | |||
|
r65 | def addchangegroup(self, generator): | ||
|
r191 | changesets = files = revisions = 0 | ||
|
r161 | self.lock() | ||
|
r65 | class genread: | ||
def __init__(self, generator): | ||||
self.g = generator | ||||
self.buf = "" | ||||
def read(self, l): | ||||
while l > len(self.buf): | ||||
try: | ||||
self.buf += self.g.next() | ||||
except StopIteration: | ||||
break | ||||
d, self.buf = self.buf[:l], self.buf[l:] | ||||
return d | ||||
if not generator: return | ||||
source = genread(generator) | ||||
|
r60 | |||
|
r192 | def getchunk(): | ||
|
r65 | d = source.read(4) | ||
if not d: return "" | ||||
l = struct.unpack(">l", d)[0] | ||||
|
r192 | if l <= 4: return "" | ||
return source.read(l - 4) | ||||
def getgroup(): | ||||
while 1: | ||||
c = getchunk() | ||||
if not c: break | ||||
yield c | ||||
|
r65 | |||
|
r46 | tr = self.transaction() | ||
simple = True | ||||
|
r146 | need = {} | ||
|
r46 | |||
|
r94 | self.ui.status("adding changesets\n") | ||
|
r46 | # pull off the changeset group | ||
|
r94 | def report(x): | ||
self.ui.debug("add changeset %s\n" % short(x)) | ||||
return self.changelog.count() | ||||
|
r192 | |||
|
r46 | co = self.changelog.tip() | ||
|
r192 | cn = self.changelog.addgroup(getgroup(), report, tr) | ||
|
r46 | |||
|
r192 | changesets = self.changelog.rev(cn) - self.changelog.rev(co) | ||
|
r191 | |||
|
r94 | self.ui.status("adding manifests\n") | ||
|
r46 | # pull off the manifest group | ||
|
r90 | mm = self.manifest.tip() | ||
|
r192 | mo = self.manifest.addgroup(getgroup(), | ||
lambda x: self.changelog.rev(x), tr) | ||||
|
r191 | |||
|
r46 | # do we need a resolve? | ||
if self.changelog.ancestor(co, cn) != co: | ||||
simple = False | ||||
resolverev = self.changelog.count() | ||||
|
r146 | # resolve the manifest to determine which files | ||
# we care about merging | ||||
self.ui.status("resolving manifests\n") | ||||
ma = self.manifest.ancestor(mm, mo) | ||||
omap = self.manifest.read(mo) # other | ||||
amap = self.manifest.read(ma) # ancestor | ||||
mmap = self.manifest.read(mm) # mine | ||||
nmap = {} | ||||
self.ui.debug(" ancestor %s local %s remote %s\n" % | ||||
(short(ma), short(mm), short(mo))) | ||||
for f, mid in mmap.iteritems(): | ||||
if f in omap: | ||||
if mid != omap[f]: | ||||
self.ui.debug(" %s versions differ, do resolve\n" % f) | ||||
need[f] = mid # use merged version or local version | ||||
else: | ||||
nmap[f] = mid # keep ours | ||||
del omap[f] | ||||
elif f in amap: | ||||
if mid != amap[f]: | ||||
r = self.ui.prompt( | ||||
(" local changed %s which remote deleted\n" % f) + | ||||
"(k)eep or (d)elete?", "[kd]", "k") | ||||
if r == "k": nmap[f] = mid | ||||
else: | ||||
self.ui.debug("other deleted %s\n" % f) | ||||
pass # other deleted it | ||||
else: | ||||
self.ui.debug("local created %s\n" %f) | ||||
nmap[f] = mid # we created it | ||||
del mmap | ||||
for f, oid in omap.iteritems(): | ||||
if f in amap: | ||||
if oid != amap[f]: | ||||
r = self.ui.prompt( | ||||
("remote changed %s which local deleted\n" % f) + | ||||
"(k)eep or (d)elete?", "[kd]", "k") | ||||
if r == "k": nmap[f] = oid | ||||
else: | ||||
pass # probably safe | ||||
else: | ||||
self.ui.debug("remote created %s, do resolve\n" % f) | ||||
need[f] = oid | ||||
del omap | ||||
del amap | ||||
new = need.keys() | ||||
new.sort() | ||||
|
r46 | # process the files | ||
|
r94 | self.ui.status("adding files\n") | ||
|
r65 | while 1: | ||
|
r192 | f = getchunk() | ||
|
r65 | if not f: break | ||
|
r94 | self.ui.debug("adding %s revisions\n" % f) | ||
|
r46 | fl = self.file(f) | ||
o = fl.tip() | ||||
|
r192 | n = fl.addgroup(getgroup(), lambda x: self.changelog.rev(x), tr) | ||
|
r191 | revisions += fl.rev(n) - fl.rev(o) | ||
files += 1 | ||||
|
r146 | if f in need: | ||
del need[f] | ||||
# manifest resolve determined we need to merge the tips | ||||
nmap[f] = self.merge3(fl, f, o, n, tr, resolverev) | ||||
if need: | ||||
# we need to do trivial merges on local files | ||||
for f in new: | ||||
if f not in need: continue | ||||
fl = self.file(f) | ||||
nmap[f] = self.merge3(fl, f, need[f], fl.tip(), tr, resolverev) | ||||
|
r191 | revisions += 1 | ||
|
r46 | |||
# For simple merges, we don't need to resolve manifests or changesets | ||||
if simple: | ||||
|
r90 | self.ui.debug("simple merge, skipping resolve\n") | ||
|
r192 | self.ui.status(("modified %d files, added %d changesets" + | ||
|
r191 | " and %d new revisions\n") | ||
|
r192 | % (files, changesets, revisions)) | ||
|
r46 | tr.close() | ||
return | ||||
node = self.manifest.add(nmap, tr, resolverev, mm, mo) | ||||
|
r191 | revisions += 1 | ||
|
r46 | |||
# Now all files and manifests are merged, we add the changed files | ||||
# and manifest id to the changelog | ||||
self.ui.status("committing merge changeset\n") | ||||
if co == cn: cn = -1 | ||||
|
r78 | edittext = "\nHG: merge resolve\n" + \ | ||
|
r187 | "HG: manifest hash %s\n" % hex(node) + \ | ||
|
r78 | "".join(["HG: changed %s\n" % f for f in new]) | ||
|
r46 | edittext = self.ui.edit(edittext) | ||
n = self.changelog.add(node, new, edittext, tr, co, cn) | ||||
|
r191 | revisions += 1 | ||
self.ui.status("added %d changesets, %d files, and %d new revisions\n" | ||||
% (changesets, files, revisions)) | ||||
|
r46 | |||
tr.close() | ||||
|
r96 | def merge3(self, fl, fn, my, other, transaction, link): | ||
"""perform a 3-way merge and append the result""" | ||||
def temp(prefix, node): | ||||
pre = "%s~%s." % (os.path.basename(fn), prefix) | ||||
(fd, name) = tempfile.mkstemp("", pre) | ||||
f = os.fdopen(fd, "w") | ||||
f.write(fl.revision(node)) | ||||
f.close() | ||||
return name | ||||
base = fl.ancestor(my, other) | ||||
self.ui.note("resolving %s\n" % fn) | ||||
self.ui.debug("local %s remote %s ancestor %s\n" % | ||||
(short(my), short(other), short(base))) | ||||
if my == base: | ||||
text = fl.revision(other) | ||||
else: | ||||
a = temp("local", my) | ||||
b = temp("remote", other) | ||||
c = temp("parent", base) | ||||
cmd = os.environ["HGMERGE"] | ||||
self.ui.debug("invoking merge with %s\n" % cmd) | ||||
|
r149 | r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn)) | ||
|
r96 | if r: | ||
raise "Merge failed!" | ||||
text = open(a).read() | ||||
os.unlink(a) | ||||
os.unlink(b) | ||||
os.unlink(c) | ||||
|
r171 | return fl.add(text, transaction, link, my, other) | ||
|
r96 | |||
|
r60 | class remoterepository: | ||
def __init__(self, ui, path): | ||||
|
r176 | self.url = path | ||
|
r60 | self.ui = ui | ||
def do_cmd(self, cmd, **args): | ||||
|
r83 | self.ui.debug("sending %s command\n" % cmd) | ||
|
r60 | q = {"cmd": cmd} | ||
q.update(args) | ||||
qs = urllib.urlencode(q) | ||||
cu = "%s?%s" % (self.url, qs) | ||||
|
r65 | return urllib.urlopen(cu) | ||
|
r60 | |||
def branches(self, nodes): | ||||
n = " ".join(map(hex, nodes)) | ||||
|
r65 | d = self.do_cmd("branches", nodes=n).read() | ||
|
r148 | br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] | ||
|
r60 | return br | ||
def between(self, pairs): | ||||
n = "\n".join(["-".join(map(hex, p)) for p in pairs]) | ||||
|
r65 | d = self.do_cmd("between", pairs=n).read() | ||
|
r187 | p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] | ||
|
r60 | return p | ||
def changegroup(self, nodes): | ||||
n = " ".join(map(hex, nodes)) | ||||
|
r65 | zd = zlib.decompressobj() | ||
f = self.do_cmd("changegroup", roots=n) | ||||
|
r192 | bytes = 0 | ||
|
r65 | while 1: | ||
d = f.read(4096) | ||||
|
r192 | bytes += len(d) | ||
|
r65 | if not d: | ||
yield zd.flush() | ||||
break | ||||
yield zd.decompress(d) | ||||
|
r192 | self.ui.note("%d bytes of data transfered\n" % bytes) | ||
|
r60 | |||
def repository(ui, path=None, create=0): | ||||
|
r176 | if path and path[:7] == "http://": | ||
return remoterepository(ui, path) | ||||
|
r60 | if path and path[:5] == "hg://": | ||
|
r176 | return remoterepository(ui, path.replace("hg://", "http://")) | ||
if path and path[:11] == "old-http://": | ||||
return localrepository(ui, path.replace("old-http://", "http://")) | ||||
|
r60 | else: | ||
return localrepository(ui, path, create) | ||||
|
r0 | class ui: | ||
|
r107 | def __init__(self, verbose=False, debug=False, quiet=False, | ||
interactive=True): | ||||
|
r83 | self.quiet = quiet and not verbose and not debug | ||
self.verbose = verbose or debug | ||||
self.debugflag = debug | ||||
|
r107 | self.interactive = interactive | ||
|
r0 | def write(self, *args): | ||
for a in args: | ||||
sys.stdout.write(str(a)) | ||||
|
r107 | def readline(self): | ||
return sys.stdin.readline()[:-1] | ||||
def prompt(self, msg, pat, default = "y"): | ||||
if not self.interactive: return default | ||||
|
r0 | while 1: | ||
|
r107 | self.write(msg, " ") | ||
r = self.readline() | ||||
|
r0 | if re.match(pat, r): | ||
return r | ||||
|
r107 | else: | ||
self.write("unrecognized response\n") | ||||
|
r0 | def status(self, *msg): | ||
|
r83 | if not self.quiet: self.write(*msg) | ||
|
r0 | def warn(self, msg): | ||
self.write(*msg) | ||||
|
r107 | def note(self, *msg): | ||
|
r0 | if self.verbose: self.write(*msg) | ||
|
r107 | def debug(self, *msg): | ||
|
r83 | if self.debugflag: self.write(*msg) | ||
|
r0 | def edit(self, text): | ||
(fd, name) = tempfile.mkstemp("hg") | ||||
f = os.fdopen(fd, "w") | ||||
f.write(text) | ||||
f.close() | ||||
|
r186 | editor = os.environ.get("HGEDITOR") or os.environ.get("EDITOR", "vi") | ||
|
r0 | r = os.system("%s %s" % (editor, name)) | ||
|
r186 | |||
|
r0 | if r: | ||
raise "Edit failed!" | ||||
t = open(name).read() | ||||
t = re.sub("(?m)^HG:.*\n", "", t) | ||||
return t | ||||
class httprangereader: | ||||
def __init__(self, url): | ||||
self.url = url | ||||
self.pos = 0 | ||||
def seek(self, pos): | ||||
self.pos = pos | ||||
def read(self, bytes=None): | ||||
opener = urllib2.build_opener(byterange.HTTPRangeHandler()) | ||||
urllib2.install_opener(opener) | ||||
req = urllib2.Request(self.url) | ||||
end = '' | ||||
if bytes: end = self.pos + bytes | ||||
req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) | ||||
f = urllib2.urlopen(req) | ||||
return f.read() | ||||