author | Eric Hopper <hopper@omnifarious.org> |
Sun, 04 Sep 2005 14:11:51 -0700 | |
changeset 1199 | 78ceaf83f28f |
parent 1133 | 899b619a7eb2 |
child 1233 | 5381b0d88e9e |
permissions | -rw-r--r-- |
1089 | 1 |
# localrepo.py - read/write repository class for mercurial |
0
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 |
|
1097 | 8 |
import struct, os, util |
1100 | 9 |
import filelog, manifest, changelog, dirstate, repo |
1089 | 10 |
from node import * |
262 | 11 |
from demandload import * |
1100 | 12 |
demandload(globals(), "re lock transaction tempfile stat mdiff") |
499 | 13 |
|
60 | 14 |
class localrepository: |
1102 | 15 |
def __init__(self, ui, path=None, create=0): |
1101 | 16 |
if not path: |
17 |
p = os.getcwd() |
|
18 |
while not os.path.isdir(os.path.join(p, ".hg")): |
|
19 |
oldp = p |
|
20 |
p = os.path.dirname(p) |
|
21 |
if p == oldp: raise repo.RepoError("no repo found") |
|
22 |
path = p |
|
23 |
self.path = os.path.join(path, ".hg") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
24 |
|
1101 | 25 |
if not create and not os.path.isdir(self.path): |
26 |
raise repo.RepoError("repository %s not found" % self.path) |
|
405 | 27 |
|
933
9c43d68ad59f
Fixed --repository option when handling relative path
tksoh@users.sf.net
parents:
926
diff
changeset
|
28 |
self.root = os.path.abspath(path) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
29 |
self.ui = ui |
1102 | 30 |
self.opener = util.opener(self.path) |
31 |
self.wopener = util.opener(self.root) |
|
1100 | 32 |
self.manifest = manifest.manifest(self.opener) |
33 |
self.changelog = changelog.changelog(self.opener) |
|
343 | 34 |
self.tagscache = None |
35 |
self.nodetagscache = None |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
36 |
|
1133
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
37 |
if create: |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
38 |
os.mkdir(self.path) |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
39 |
os.mkdir(self.join("data")) |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
40 |
f = self.opener("hgrc", "w") |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
41 |
f.write("[web]\n") |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
42 |
f.write("contact = %s\n" % ui.shortuser(ui.username())) |
899b619a7eb2
Create [web] section with short username as contact on hg init and hg clone.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
43 |
|
1101 | 44 |
self.dirstate = dirstate.dirstate(self.opener, ui, self.root) |
45 |
try: |
|
46 |
self.ui.readconfig(self.opener("hgrc")) |
|
47 |
except IOError: pass |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
48 |
|
487 | 49 |
def hook(self, name, **args): |
50 |
s = self.ui.config("hooks", name) |
|
51 |
if s: |
|
52 |
self.ui.note("running hook %s: %s\n" % (name, s)) |
|
53 |
old = {} |
|
54 |
for k, v in args.items(): |
|
55 |
k = k.upper() |
|
56 |
old[k] = os.environ.get(k, None) |
|
57 |
os.environ[k] = v |
|
58 |
||
59 |
r = os.system(s) |
|
60 |
||
61 |
for k, v in old.items(): |
|
62 |
if v != None: |
|
63 |
os.environ[k] = v |
|
64 |
else: |
|
65 |
del os.environ[k] |
|
66 |
||
67 |
if r: |
|
68 |
self.ui.warn("abort: %s hook failed with status %d!\n" % |
|
69 |
(name, r)) |
|
70 |
return False |
|
71 |
return True |
|
72 |
||
343 | 73 |
def tags(self): |
74 |
'''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
|
75 |
if not self.tagscache: |
343 | 76 |
self.tagscache = {} |
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
77 |
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
|
78 |
try: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
79 |
bin_n = bin(n) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
80 |
except TypeError: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
81 |
bin_n = '' |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
82 |
self.tagscache[k.strip()] = bin_n |
659 | 83 |
|
67 | 84 |
try: |
254 | 85 |
# read each head of the tags file, ending with the tip |
86 |
# and add each tag found to the map, with "newer" ones |
|
87 |
# taking precedence |
|
67 | 88 |
fl = self.file(".hgtags") |
254 | 89 |
h = fl.heads() |
90 |
h.reverse() |
|
91 |
for r in h: |
|
994
88c15682d9b0
Fix callers to file.revision to use file.read
mpm@selenic.com
parents:
993
diff
changeset
|
92 |
for l in fl.read(r).splitlines(): |
254 | 93 |
if l: |
385
e9e1efd5291c
Fixed problems with extra spaces around tags in .hgtags
Thomas Arendsen Hein <thomas@intevation.de>
parents:
383
diff
changeset
|
94 |
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
|
95 |
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
|
96 |
except KeyError: |
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
97 |
pass |
659 | 98 |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
99 |
try: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
100 |
f = self.opener("localtags") |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
101 |
for l in f: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
102 |
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
|
103 |
addtag(self, k, n) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
104 |
except IOError: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
105 |
pass |
659 | 106 |
|
343 | 107 |
self.tagscache['tip'] = self.changelog.tip() |
659 | 108 |
|
343 | 109 |
return self.tagscache |
110 |
||
111 |
def tagslist(self): |
|
112 |
'''return a list of tags ordered by revision''' |
|
113 |
l = [] |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
114 |
for t, n in self.tags().items(): |
343 | 115 |
try: |
116 |
r = self.changelog.rev(n) |
|
117 |
except: |
|
118 |
r = -2 # sort to the beginning of the list if unknown |
|
119 |
l.append((r,t,n)) |
|
120 |
l.sort() |
|
121 |
return [(t,n) for r,t,n in l] |
|
122 |
||
123 |
def nodetags(self, node): |
|
124 |
'''return the tags associated with a node''' |
|
125 |
if not self.nodetagscache: |
|
126 |
self.nodetagscache = {} |
|
127 |
for t,n in self.tags().items(): |
|
128 |
self.nodetagscache.setdefault(n,[]).append(t) |
|
129 |
return self.nodetagscache.get(node, []) |
|
130 |
||
131 |
def lookup(self, key): |
|
67 | 132 |
try: |
343 | 133 |
return self.tags()[key] |
67 | 134 |
except KeyError: |
658
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
135 |
try: |
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
136 |
return self.changelog.lookup(key) |
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
137 |
except: |
1100 | 138 |
raise repo.RepoError("unknown revision '%s'" % key) |
67 | 139 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
140 |
def dev(self): |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
141 |
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
|
142 |
|
926 | 143 |
def local(self): |
1101 | 144 |
return True |
926 | 145 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
146 |
def join(self, f): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
147 |
return os.path.join(self.path, f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
148 |
|
244 | 149 |
def wjoin(self, f): |
150 |
return os.path.join(self.root, f) |
|
151 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
152 |
def file(self, f): |
192 | 153 |
if f[0] == '/': f = f[1:] |
1100 | 154 |
return filelog.filelog(self.opener, f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
155 |
|
627 | 156 |
def getcwd(self): |
870
a82eae840447
Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents:
839
diff
changeset
|
157 |
return self.dirstate.getcwd() |
627 | 158 |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
159 |
def wfile(self, f, mode='r'): |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
160 |
return self.wopener(f, mode) |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
161 |
|
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
162 |
def wread(self, filename): |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
163 |
return self.wopener(filename, 'r').read() |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
164 |
|
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
165 |
def wwrite(self, filename, data, fd=None): |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
166 |
if fd: |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
167 |
return fd.write(data) |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
168 |
return self.wopener(filename, 'w').write(data) |
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
169 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
170 |
def transaction(self): |
251 | 171 |
# save dirstate for undo |
263 | 172 |
try: |
173 |
ds = self.opener("dirstate").read() |
|
174 |
except IOError: |
|
175 |
ds = "" |
|
785 | 176 |
self.opener("journal.dirstate", "w").write(ds) |
515 | 177 |
|
785 | 178 |
def after(): |
179 |
util.rename(self.join("journal"), self.join("undo")) |
|
180 |
util.rename(self.join("journal.dirstate"), |
|
181 |
self.join("undo.dirstate")) |
|
182 |
||
183 |
return transaction.transaction(self.ui.warn, self.opener, |
|
184 |
self.join("journal"), after) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
185 |
|
210 | 186 |
def recover(self): |
225 | 187 |
lock = self.lock() |
557 | 188 |
if os.path.exists(self.join("journal")): |
501 | 189 |
self.ui.status("rolling back interrupted transaction\n") |
557 | 190 |
return transaction.rollback(self.opener, self.join("journal")) |
210 | 191 |
else: |
192 |
self.ui.warn("no interrupted transaction available\n") |
|
193 |
||
194 |
def undo(self): |
|
225 | 195 |
lock = self.lock() |
210 | 196 |
if os.path.exists(self.join("undo")): |
501 | 197 |
self.ui.status("rolling back last transaction\n") |
262 | 198 |
transaction.rollback(self.opener, self.join("undo")) |
251 | 199 |
self.dirstate = None |
421 | 200 |
util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
1100 | 201 |
self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root) |
163 | 202 |
else: |
210 | 203 |
self.ui.warn("no undo information available\n") |
162 | 204 |
|
1062 | 205 |
def lock(self, wait=1): |
161 | 206 |
try: |
207 |
return lock.lock(self.join("lock"), 0) |
|
208 |
except lock.LockHeld, inst: |
|
209 |
if wait: |
|
210 |
self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
|
211 |
return lock.lock(self.join("lock"), wait) |
|
212 |
raise inst |
|
213 |
||
203 | 214 |
def rawcommit(self, files, text, user, date, p1=None, p2=None): |
442 | 215 |
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
|
216 |
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
|
217 |
p2 = p2 or self.dirstate.parents()[1] or nullid |
302 | 218 |
c1 = self.changelog.read(p1) |
219 |
c2 = self.changelog.read(p2) |
|
220 |
m1 = self.manifest.read(c1[0]) |
|
221 |
mf1 = self.manifest.readflags(c1[0]) |
|
222 |
m2 = self.manifest.read(c2[0]) |
|
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
223 |
changed = [] |
302 | 224 |
|
442 | 225 |
if orig_parent == p1: |
226 |
update_dirstate = 1 |
|
227 |
else: |
|
228 |
update_dirstate = 0 |
|
229 |
||
203 | 230 |
tr = self.transaction() |
302 | 231 |
mm = m1.copy() |
232 |
mfm = mf1.copy() |
|
203 | 233 |
linkrev = self.changelog.count() |
234 |
for f in files: |
|
235 |
try: |
|
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
236 |
t = self.wread(f) |
441 | 237 |
tm = util.is_exec(self.wjoin(f), mfm.get(f, False)) |
302 | 238 |
r = self.file(f) |
239 |
mfm[f] = tm |
|
990 | 240 |
|
241 |
fp1 = m1.get(f, nullid) |
|
242 |
fp2 = m2.get(f, nullid) |
|
243 |
||
244 |
# is the same revision on two branches of a merge? |
|
245 |
if fp2 == fp1: |
|
246 |
fp2 = nullid |
|
247 |
||
248 |
if fp2 != nullid: |
|
249 |
# is one parent an ancestor of the other? |
|
250 |
fpa = r.ancestor(fp1, fp2) |
|
251 |
if fpa == fp1: |
|
252 |
fp1, fp2 = fp2, nullid |
|
253 |
elif fpa == fp2: |
|
254 |
fp2 = nullid |
|
255 |
||
256 |
# is the file unmodified from the parent? |
|
257 |
if t == r.read(fp1): |
|
258 |
# record the proper existing parent in manifest |
|
259 |
# no need to add a revision |
|
260 |
mm[f] = fp1 |
|
261 |
continue |
|
262 |
||
263 |
mm[f] = r.add(t, {}, tr, linkrev, fp1, fp2) |
|
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
264 |
changed.append(f) |
442 | 265 |
if update_dirstate: |
266 |
self.dirstate.update([f], "n") |
|
203 | 267 |
except IOError: |
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
268 |
try: |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
269 |
del mm[f] |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
270 |
del mfm[f] |
442 | 271 |
if update_dirstate: |
272 |
self.dirstate.forget([f]) |
|
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
273 |
except: |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
274 |
# deleted from p2? |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
275 |
pass |
203 | 276 |
|
302 | 277 |
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
|
278 |
user = user or self.ui.username() |
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
279 |
n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date) |
203 | 280 |
tr.close() |
442 | 281 |
if update_dirstate: |
282 |
self.dirstate.setparents(n, nullid) |
|
203 | 283 |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
786
diff
changeset
|
284 |
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
|
285 |
match = util.always, force=False): |
220 | 286 |
commit = [] |
287 |
remove = [] |
|
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
288 |
changed = [] |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
289 |
|
220 | 290 |
if files: |
291 |
for f in files: |
|
292 |
s = self.dirstate.state(f) |
|
244 | 293 |
if s in 'nmai': |
220 | 294 |
commit.append(f) |
295 |
elif s == 'r': |
|
296 |
remove.append(f) |
|
297 |
else: |
|
244 | 298 |
self.ui.warn("%s not tracked!\n" % f) |
220 | 299 |
else: |
1062 | 300 |
(c, a, d, u) = self.changes(match=match) |
220 | 301 |
commit = c + a |
302 |
remove = d |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
303 |
|
990 | 304 |
p1, p2 = self.dirstate.parents() |
305 |
c1 = self.changelog.read(p1) |
|
306 |
c2 = self.changelog.read(p2) |
|
307 |
m1 = self.manifest.read(c1[0]) |
|
308 |
mf1 = self.manifest.readflags(c1[0]) |
|
309 |
m2 = self.manifest.read(c2[0]) |
|
310 |
||
311 |
if not commit and not remove and not force and p2 == nullid: |
|
151 | 312 |
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
|
313 |
return None |
151 | 314 |
|
487 | 315 |
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
|
316 |
return None |
487 | 317 |
|
225 | 318 |
lock = self.lock() |
151 | 319 |
tr = self.transaction() |
320 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
321 |
# check in files |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
322 |
new = {} |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
323 |
linkrev = self.changelog.count() |
220 | 324 |
commit.sort() |
325 |
for f in commit: |
|
83 | 326 |
self.ui.note(f + "\n") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
327 |
try: |
441 | 328 |
mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False)) |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
329 |
t = self.wread(f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
330 |
except IOError: |
667
31a9aa890016
A number of minor fixes to problems that pychecker found.
mark.williamson@cl.cam.ac.uk
parents:
660
diff
changeset
|
331 |
self.ui.warn("trouble committing %s!\n" % f) |
220 | 332 |
raise |
333 |
||
1117 | 334 |
r = self.file(f) |
335 |
||
363 | 336 |
meta = {} |
337 |
cp = self.dirstate.copied(f) |
|
338 |
if cp: |
|
339 |
meta["copy"] = cp |
|
340 |
meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid))) |
|
575 | 341 |
self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"])) |
1117 | 342 |
fp1, fp2 = nullid, nullid |
343 |
else: |
|
344 |
fp1 = m1.get(f, nullid) |
|
345 |
fp2 = m2.get(f, nullid) |
|
990 | 346 |
|
347 |
# is the same revision on two branches of a merge? |
|
348 |
if fp2 == fp1: |
|
349 |
fp2 = nullid |
|
350 |
||
351 |
if fp2 != nullid: |
|
352 |
# is one parent an ancestor of the other? |
|
353 |
fpa = r.ancestor(fp1, fp2) |
|
354 |
if fpa == fp1: |
|
355 |
fp1, fp2 = fp2, nullid |
|
356 |
elif fpa == fp2: |
|
357 |
fp2 = nullid |
|
358 |
||
359 |
# is the file unmodified from the parent? |
|
360 |
if not meta and t == r.read(fp1): |
|
361 |
# record the proper existing parent in manifest |
|
362 |
# no need to add a revision |
|
363 |
new[f] = fp1 |
|
364 |
continue |
|
365 |
||
363 | 366 |
new[f] = r.add(t, meta, tr, linkrev, fp1, fp2) |
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
367 |
# remember what we've added so that we can later calculate |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
368 |
# the files to pull from a set of changesets |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
369 |
changed.append(f) |
0
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 |
# update manifest |
229 | 372 |
m1.update(new) |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
373 |
for f in remove: |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
374 |
if f in m1: |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
375 |
del m1[f] |
741 | 376 |
mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0], |
377 |
(new, remove)) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
378 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
379 |
# add changeset |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
380 |
new = new.keys() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
381 |
new.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
382 |
|
288 | 383 |
if not text: |
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
384 |
edittext = "" |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
385 |
if p2 != nullid: |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
386 |
edittext += "HG: branch merge\n" |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
387 |
edittext += "\n" + "HG: manifest hash %s\n" % hex(mn) |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
388 |
edittext += "".join(["HG: changed %s\n" % f for f in changed]) |
288 | 389 |
edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
390 |
if not changed and not remove: |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
391 |
edittext += "HG: no files changed\n" |
288 | 392 |
edittext = self.ui.edit(edittext) |
393 |
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
|
394 |
return None |
288 | 395 |
text = edittext |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
396 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
397 |
user = user or self.ui.username() |
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
398 |
n = self.changelog.add(mn, changed, text, tr, p1, p2, user, date) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
399 |
tr.close() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
400 |
|
229 | 401 |
self.dirstate.setparents(n) |
220 | 402 |
self.dirstate.update(new, "n") |
403 |
self.dirstate.forget(remove) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
404 |
|
660
2c83350784c3
Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents:
659
diff
changeset
|
405 |
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
|
406 |
return None |
120cba94d5aa
Change repo.comit to return None on error or the new revision number on
mason@suse.com
parents:
900
diff
changeset
|
407 |
return n |
660
2c83350784c3
Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents:
659
diff
changeset
|
408 |
|
1062 | 409 |
def walk(self, node=None, files=[], match=util.always): |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
723
diff
changeset
|
410 |
if node: |
726
809a870a0e73
Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
411 |
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
|
412 |
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
|
413 |
else: |
726
809a870a0e73
Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
414 |
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
|
415 |
yield src, fn |
723 | 416 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
723
diff
changeset
|
417 |
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
|
418 |
match = util.always): |
566 | 419 |
mf2, u = None, [] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
420 |
|
536 | 421 |
def fcmp(fn, mf): |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
422 |
t1 = self.wread(fn) |
994
88c15682d9b0
Fix callers to file.revision to use file.read
mpm@selenic.com
parents:
993
diff
changeset
|
423 |
t2 = self.file(fn).read(mf.get(fn, nullid)) |
29 | 424 |
return cmp(t1, t2) |
425 |
||
723 | 426 |
def mfmatches(node): |
427 |
mf = dict(self.manifest.read(node)) |
|
428 |
for fn in mf.keys(): |
|
429 |
if not match(fn): |
|
430 |
del mf[fn] |
|
431 |
return mf |
|
741 | 432 |
|
536 | 433 |
# are we comparing the working directory? |
561 | 434 |
if not node2: |
723 | 435 |
l, c, a, d, u = self.dirstate.changes(files, match) |
536 | 436 |
|
437 |
# are we comparing working dir against its parent? |
|
561 | 438 |
if not node1: |
536 | 439 |
if l: |
440 |
# do a full compare of any files that might have changed |
|
441 |
change = self.changelog.read(self.dirstate.parents()[0]) |
|
723 | 442 |
mf2 = mfmatches(change[0]) |
548 | 443 |
for f in l: |
561 | 444 |
if fcmp(f, mf2): |
536 | 445 |
c.append(f) |
561 | 446 |
|
447 |
for l in c, a, d, u: |
|
448 |
l.sort() |
|
449 |
||
536 | 450 |
return (c, a, d, u) |
515 | 451 |
|
536 | 452 |
# are we comparing working dir against non-tip? |
453 |
# generate a pseudo-manifest for the working dir |
|
561 | 454 |
if not node2: |
455 |
if not mf2: |
|
536 | 456 |
change = self.changelog.read(self.dirstate.parents()[0]) |
723 | 457 |
mf2 = mfmatches(change[0]) |
536 | 458 |
for f in a + c + l: |
561 | 459 |
mf2[f] = "" |
536 | 460 |
for f in d: |
561 | 461 |
if f in mf2: del mf2[f] |
536 | 462 |
else: |
561 | 463 |
change = self.changelog.read(node2) |
723 | 464 |
mf2 = mfmatches(change[0]) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
465 |
|
566 | 466 |
# flush lists from dirstate before comparing manifests |
467 |
c, a = [], [] |
|
468 |
||
561 | 469 |
change = self.changelog.read(node1) |
723 | 470 |
mf1 = mfmatches(change[0]) |
32 | 471 |
|
472 |
for fn in mf2: |
|
473 |
if mf1.has_key(fn): |
|
474 |
if mf1[fn] != mf2[fn]: |
|
561 | 475 |
if mf2[fn] != "" or fcmp(fn, mf1): |
536 | 476 |
c.append(fn) |
32 | 477 |
del mf1[fn] |
478 |
else: |
|
536 | 479 |
a.append(fn) |
515 | 480 |
|
536 | 481 |
d = mf1.keys() |
561 | 482 |
|
483 |
for l in c, a, d, u: |
|
484 |
l.sort() |
|
515 | 485 |
|
536 | 486 |
return (c, a, d, u) |
32 | 487 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
488 |
def add(self, list): |
220 | 489 |
for f in list: |
244 | 490 |
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
|
491 |
if not os.path.exists(p): |
659 | 492 |
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
|
493 |
elif not os.path.isfile(p): |
741 | 494 |
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
|
495 |
elif self.dirstate.state(f) in 'an': |
220 | 496 |
self.ui.warn("%s already tracked!\n" % f) |
497 |
else: |
|
498 |
self.dirstate.update([f], "a") |
|
499 |
||
500 |
def forget(self, list): |
|
501 |
for f in list: |
|
502 |
if self.dirstate.state(f) not in 'ai': |
|
503 |
self.ui.warn("%s not added!\n" % f) |
|
504 |
else: |
|
505 |
self.dirstate.forget([f]) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
506 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
507 |
def remove(self, list): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
508 |
for f in list: |
244 | 509 |
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
|
510 |
if os.path.exists(p): |
220 | 511 |
self.ui.warn("%s still exists!\n" % f) |
402 | 512 |
elif self.dirstate.state(f) == 'a': |
513 |
self.ui.warn("%s never committed!\n" % f) |
|
657
22bc6fb9aefc
dirstate.forget() takes a list
Matt Mackall <mpm@selenic.com>
parents:
656
diff
changeset
|
514 |
self.dirstate.forget([f]) |
220 | 515 |
elif f not in self.dirstate: |
516 |
self.ui.warn("%s not tracked!\n" % f) |
|
517 |
else: |
|
518 |
self.dirstate.update([f], "r") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
519 |
|
363 | 520 |
def copy(self, source, dest): |
521 |
p = self.wjoin(dest) |
|
781 | 522 |
if not os.path.exists(p): |
363 | 523 |
self.ui.warn("%s does not exist!\n" % dest) |
781 | 524 |
elif not os.path.isfile(p): |
659 | 525 |
self.ui.warn("copy failed: %s is not a file\n" % dest) |
363 | 526 |
else: |
527 |
if self.dirstate.state(dest) == '?': |
|
528 |
self.dirstate.update([dest], "a") |
|
529 |
self.dirstate.copy(source, dest) |
|
530 |
||
222 | 531 |
def heads(self): |
532 |
return self.changelog.heads() |
|
533 |
||
898 | 534 |
# branchlookup returns a dict giving a list of branches for |
535 |
# each head. A branch is defined as the tag of a node or |
|
536 |
# the branch of the node's parents. If a node has multiple |
|
537 |
# branch tags, tags are eliminated if they are visible from other |
|
538 |
# branch tags. |
|
539 |
# |
|
540 |
# So, for this graph: a->b->c->d->e |
|
541 |
# \ / |
|
542 |
# aa -----/ |
|
919 | 543 |
# a has tag 2.6.12 |
898 | 544 |
# d has tag 2.6.13 |
545 |
# e would have branch tags for 2.6.12 and 2.6.13. Because the node |
|
546 |
# for 2.6.12 can be reached from the node 2.6.13, that is eliminated |
|
547 |
# from the list. |
|
548 |
# |
|
549 |
# It is possible that more than one head will have the same branch tag. |
|
550 |
# callers need to check the result for multiple heads under the same |
|
551 |
# branch tag if that is a problem for them (ie checkout of a specific |
|
552 |
# branch). |
|
553 |
# |
|
554 |
# passing in a specific branch will limit the depth of the search |
|
555 |
# through the parents. It won't limit the branches returned in the |
|
556 |
# result though. |
|
557 |
def branchlookup(self, heads=None, branch=None): |
|
558 |
if not heads: |
|
559 |
heads = self.heads() |
|
560 |
headt = [ h for h in heads ] |
|
561 |
chlog = self.changelog |
|
562 |
branches = {} |
|
563 |
merges = [] |
|
564 |
seenmerge = {} |
|
565 |
||
566 |
# traverse the tree once for each head, recording in the branches |
|
567 |
# dict which tags are visible from this head. The branches |
|
568 |
# dict also records which tags are visible from each tag |
|
569 |
# while we traverse. |
|
570 |
while headt or merges: |
|
571 |
if merges: |
|
572 |
n, found = merges.pop() |
|
573 |
visit = [n] |
|
574 |
else: |
|
575 |
h = headt.pop() |
|
576 |
visit = [h] |
|
577 |
found = [h] |
|
578 |
seen = {} |
|
579 |
while visit: |
|
580 |
n = visit.pop() |
|
581 |
if n in seen: |
|
582 |
continue |
|
583 |
pp = chlog.parents(n) |
|
584 |
tags = self.nodetags(n) |
|
585 |
if tags: |
|
586 |
for x in tags: |
|
587 |
if x == 'tip': |
|
588 |
continue |
|
589 |
for f in found: |
|
590 |
branches.setdefault(f, {})[n] = 1 |
|
591 |
branches.setdefault(n, {})[n] = 1 |
|
592 |
break |
|
593 |
if n not in found: |
|
594 |
found.append(n) |
|
595 |
if branch in tags: |
|
596 |
continue |
|
597 |
seen[n] = 1 |
|
598 |
if pp[1] != nullid and n not in seenmerge: |
|
599 |
merges.append((pp[1], [x for x in found])) |
|
600 |
seenmerge[n] = 1 |
|
601 |
if pp[0] != nullid: |
|
602 |
visit.append(pp[0]) |
|
603 |
# traverse the branches dict, eliminating branch tags from each |
|
604 |
# head that are visible from another branch tag for that head. |
|
605 |
out = {} |
|
606 |
viscache = {} |
|
607 |
for h in heads: |
|
608 |
def visible(node): |
|
609 |
if node in viscache: |
|
610 |
return viscache[node] |
|
611 |
ret = {} |
|
612 |
visit = [node] |
|
613 |
while visit: |
|
614 |
x = visit.pop() |
|
615 |
if x in viscache: |
|
616 |
ret.update(viscache[x]) |
|
617 |
elif x not in ret: |
|
618 |
ret[x] = 1 |
|
619 |
if x in branches: |
|
620 |
visit[len(visit):] = branches[x].keys() |
|
621 |
viscache[node] = ret |
|
622 |
return ret |
|
623 |
if h not in branches: |
|
624 |
continue |
|
625 |
# O(n^2), but somewhat limited. This only searches the |
|
626 |
# tags visible from a specific head, not all the tags in the |
|
627 |
# whole repo. |
|
628 |
for b in branches[h]: |
|
629 |
vis = False |
|
630 |
for bb in branches[h].keys(): |
|
631 |
if b != bb: |
|
632 |
if b in visible(bb): |
|
633 |
vis = True |
|
634 |
break |
|
635 |
if not vis: |
|
636 |
l = out.setdefault(h, []) |
|
637 |
l[len(l):] = self.nodetags(b) |
|
638 |
return out |
|
639 |
||
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
640 |
def branches(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
641 |
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
|
642 |
b = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
643 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
644 |
t = n |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
645 |
while n: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
646 |
p = self.changelog.parents(n) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
647 |
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
|
648 |
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
|
649 |
break |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
650 |
n = p[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
651 |
return b |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
652 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
653 |
def between(self, pairs): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
654 |
r = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
655 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
656 |
for top, bottom in pairs: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
657 |
n, l, i = top, [], 0 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
658 |
f = 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
659 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
660 |
while n != bottom: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
661 |
p = self.changelog.parents(n)[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
662 |
if i == f: |
575 | 663 |
l.append(n) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
664 |
f = f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
665 |
n = p |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
666 |
i += 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
667 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
668 |
r.append(l) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
669 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
670 |
return r |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
671 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
672 |
def newer(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
673 |
m = {} |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
674 |
nl = [] |
94 | 675 |
pm = {} |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
676 |
cl = self.changelog |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
677 |
t = l = cl.count() |
94 | 678 |
|
679 |
# find the lowest numbered node |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
680 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
681 |
l = min(l, cl.rev(n)) |
94 | 682 |
m[n] = 1 |
46 | 683 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
684 |
for i in xrange(l, t): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
685 |
n = cl.node(i) |
94 | 686 |
if n in m: # explicitly listed |
687 |
pm[n] = 1 |
|
688 |
nl.append(n) |
|
689 |
continue |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
690 |
for p in cl.parents(n): |
94 | 691 |
if p in pm: # parent listed |
692 |
pm[n] = 1 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
693 |
nl.append(n) |
94 | 694 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
695 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
696 |
return nl |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
697 |
|
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
698 |
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
|
699 |
m = self.changelog.nodemap |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
700 |
search = [] |
1072 | 701 |
fetch = {} |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
702 |
seen = {} |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
703 |
seenbranch = {} |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
704 |
if base == None: |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
705 |
base = {} |
192 | 706 |
|
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
707 |
# 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
|
708 |
# and start by examining the heads |
222 | 709 |
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
|
710 |
|
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
711 |
if not heads: |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
712 |
heads = remote.heads() |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
713 |
|
222 | 714 |
unknown = [] |
715 |
for h in heads: |
|
716 |
if h not in m: |
|
717 |
unknown.append(h) |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
718 |
else: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
719 |
base[h] = 1 |
46 | 720 |
|
222 | 721 |
if not unknown: |
60 | 722 |
return None |
324 | 723 |
|
724 |
rep = {} |
|
725 |
reqcnt = 0 |
|
515 | 726 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
727 |
# search through remote branches |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
728 |
# 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
|
729 |
# head, root, first parent, second parent |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
730 |
# (a branch always has two parents (or none) by definition) |
222 | 731 |
unknown = remote.branches(unknown) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
732 |
while unknown: |
324 | 733 |
r = [] |
734 |
while unknown: |
|
735 |
n = unknown.pop(0) |
|
736 |
if n[0] in seen: |
|
737 |
continue |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
738 |
|
324 | 739 |
self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) |
740 |
if n[0] == nullid: |
|
741 |
break |
|
328 | 742 |
if n in seenbranch: |
324 | 743 |
self.ui.debug("branch already found\n") |
744 |
continue |
|
745 |
if n[1] and n[1] in m: # do we know the base? |
|
746 |
self.ui.debug("found incomplete branch %s:%s\n" |
|
747 |
% (short(n[0]), short(n[1]))) |
|
748 |
search.append(n) # schedule branch range for scanning |
|
328 | 749 |
seenbranch[n] = 1 |
324 | 750 |
else: |
751 |
if n[1] not in seen and n[1] not in fetch: |
|
752 |
if n[2] in m and n[3] in m: |
|
753 |
self.ui.debug("found new changeset %s\n" % |
|
754 |
short(n[1])) |
|
1072 | 755 |
fetch[n[1]] = 1 # earliest unknown |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
756 |
base[n[2]] = 1 # latest known |
324 | 757 |
continue |
758 |
||
759 |
for a in n[2:4]: |
|
760 |
if a not in rep: |
|
761 |
r.append(a) |
|
762 |
rep[a] = 1 |
|
763 |
||
328 | 764 |
seen[n[0]] = 1 |
765 |
||
324 | 766 |
if r: |
767 |
reqcnt += 1 |
|
768 |
self.ui.debug("request %d: %s\n" % |
|
769 |
(reqcnt, " ".join(map(short, r)))) |
|
770 |
for p in range(0, len(r), 10): |
|
771 |
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
|
772 |
self.ui.debug("received %s:%s\n" % |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
773 |
(short(b[0]), short(b[1]))) |
1072 | 774 |
if b[0] in m: |
775 |
self.ui.debug("found base node %s\n" % short(b[0])) |
|
776 |
base[b[0]] = 1 |
|
777 |
elif b[0] not in seen: |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
778 |
unknown.append(b) |
515 | 779 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
780 |
# 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
|
781 |
while search: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
782 |
n = search.pop(0) |
324 | 783 |
reqcnt += 1 |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
784 |
l = remote.between([(n[0], n[1])])[0] |
328 | 785 |
l.append(n[1]) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
786 |
p = n[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
787 |
f = 1 |
328 | 788 |
for i in l: |
789 |
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
|
790 |
if i in m: |
85 | 791 |
if f <= 2: |
83 | 792 |
self.ui.debug("found new branch changeset %s\n" % |
793 |
short(p)) |
|
1072 | 794 |
fetch[p] = 1 |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
795 |
base[i] = 1 |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
796 |
else: |
83 | 797 |
self.ui.debug("narrowed branch search to %s:%s\n" |
798 |
% (short(p), short(i))) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
799 |
search.append((p, i)) |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
800 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
801 |
p, f = i, f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
802 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
803 |
# sanity check our fetch list |
1072 | 804 |
for f in fetch.keys(): |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
805 |
if f in m: |
1100 | 806 |
raise repo.RepoError("already have changeset " + short(f[:4])) |
83 | 807 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
808 |
if base.keys() == [nullid]: |
514
874e577e332e
change unrelated repository error to a warning
mpm@selenic.com
parents:
511
diff
changeset
|
809 |
self.ui.warn("warning: pulling from an unrelated repository!\n") |
511 | 810 |
|
1072 | 811 |
self.ui.note("found new changesets starting at " + |
83 | 812 |
" ".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
|
813 |
|
324 | 814 |
self.ui.debug("%d total queries\n" % reqcnt) |
815 |
||
1072 | 816 |
return fetch.keys() |
516 | 817 |
|
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
818 |
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
|
819 |
if base == None: |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
820 |
base = {} |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
821 |
self.findincoming(remote, base, heads) |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
822 |
|
1072 | 823 |
self.ui.debug("common changesets up to " |
824 |
+ " ".join(map(short, base.keys())) + "\n") |
|
825 |
||
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
826 |
remain = dict.fromkeys(self.changelog.nodemap) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
827 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
828 |
# 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
|
829 |
del remain[nullid] |
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
830 |
remove = base.keys() |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
831 |
while remove: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
832 |
n = remove.pop(0) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
833 |
if n in remain: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
834 |
del remain[n] |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
835 |
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
|
836 |
remove.append(p) |
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
837 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
838 |
# 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
|
839 |
subset = [] |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
840 |
for n in remain: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
841 |
p1, p2 = self.changelog.parents(n) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
842 |
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
|
843 |
subset.append(n) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
844 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
845 |
# 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
|
846 |
return subset |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
847 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
848 |
def pull(self, remote): |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
849 |
lock = self.lock() |
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
850 |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
851 |
# 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
|
852 |
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
|
853 |
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
|
854 |
fetch = [nullid] |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
855 |
else: |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
856 |
fetch = self.findincoming(remote) |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
857 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
858 |
if not fetch: |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
859 |
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
|
860 |
return 1 |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
861 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
862 |
cg = remote.changegroup(fetch) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
863 |
return self.addchangegroup(cg) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
864 |
|
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
865 |
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
|
866 |
lock = remote.lock() |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
867 |
|
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
868 |
base = {} |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
869 |
heads = remote.heads() |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
870 |
inc = self.findincoming(remote, base, heads) |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
871 |
if not force and inc: |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
872 |
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
|
873 |
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
|
874 |
return 1 |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
875 |
|
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
876 |
update = self.findoutgoing(remote, base) |
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
877 |
if not update: |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
878 |
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
|
879 |
return 1 |
816
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
880 |
elif not force: |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
881 |
if len(heads) < len(self.changelog.heads()): |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
882 |
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
|
883 |
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
|
884 |
" use push -f to force)\n") |
8674b7803714
Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
814
diff
changeset
|
885 |
return 1 |
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
886 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
887 |
cg = self.changegroup(update) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
888 |
return remote.addchangegroup(cg) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
889 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
890 |
def changegroup(self, basenodes): |
1199
78ceaf83f28f
Created a class in util called chunkbuffer that buffers reads from an
Eric Hopper <hopper@omnifarious.org>
parents:
1133
diff
changeset
|
891 |
genread = util.chunkbuffer |
515 | 892 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
893 |
def gengroup(): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
894 |
nodes = self.newer(basenodes) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
895 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
896 |
# construct the link map |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
897 |
linkmap = {} |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
898 |
for n in nodes: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
899 |
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
|
900 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
901 |
# 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
|
902 |
changed = {} |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
903 |
for n in nodes: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
904 |
c = self.changelog.read(n) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
905 |
for f in c[3]: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
906 |
changed[f] = 1 |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
907 |
changed = changed.keys() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
908 |
changed.sort() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
909 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
910 |
# 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
|
911 |
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
|
912 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
913 |
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
|
914 |
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
|
915 |
for f in changed: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
916 |
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
|
917 |
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
|
918 |
for y in g: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
919 |
yield y |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
920 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
921 |
yield struct.pack(">l", 0) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
922 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
923 |
return genread(gengroup()) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
924 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
925 |
def addchangegroup(self, source): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
926 |
|
222 | 927 |
def getchunk(): |
928 |
d = source.read(4) |
|
929 |
if not d: return "" |
|
930 |
l = struct.unpack(">l", d)[0] |
|
931 |
if l <= 4: return "" |
|
932 |
return source.read(l - 4) |
|
933 |
||
934 |
def getgroup(): |
|
935 |
while 1: |
|
936 |
c = getchunk() |
|
937 |
if not c: break |
|
938 |
yield c |
|
939 |
||
940 |
def csmap(x): |
|
941 |
self.ui.debug("add changeset %s\n" % short(x)) |
|
942 |
return self.changelog.count() |
|
943 |
||
944 |
def revmap(x): |
|
945 |
return self.changelog.rev(x) |
|
946 |
||
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
947 |
if not source: return |
222 | 948 |
changesets = files = revisions = 0 |
225 | 949 |
|
222 | 950 |
tr = self.transaction() |
951 |
||
1040
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
952 |
oldheads = len(self.changelog.heads()) |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
953 |
|
222 | 954 |
# pull off the changeset group |
955 |
self.ui.status("adding changesets\n") |
|
956 |
co = self.changelog.tip() |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
223
diff
changeset
|
957 |
cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique |
222 | 958 |
changesets = self.changelog.rev(cn) - self.changelog.rev(co) |
959 |
||
960 |
# pull off the manifest group |
|
961 |
self.ui.status("adding manifests\n") |
|
962 |
mm = self.manifest.tip() |
|
963 |
mo = self.manifest.addgroup(getgroup(), revmap, tr) |
|
964 |
||
965 |
# process the files |
|
772 | 966 |
self.ui.status("adding file changes\n") |
222 | 967 |
while 1: |
968 |
f = getchunk() |
|
969 |
if not f: break |
|
970 |
self.ui.debug("adding %s revisions\n" % f) |
|
971 |
fl = self.file(f) |
|
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
972 |
o = fl.count() |
222 | 973 |
n = fl.addgroup(getgroup(), revmap, tr) |
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
974 |
revisions += fl.count() - o |
222 | 975 |
files += 1 |
976 |
||
1040
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
977 |
newheads = len(self.changelog.heads()) |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
978 |
heads = "" |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
979 |
if oldheads and newheads > oldheads: |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
980 |
heads = " (+%d heads)" % (newheads - oldheads) |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
981 |
|
772 | 982 |
self.ui.status(("added %d changesets" + |
1040
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
983 |
" with %d changes to %d files%s\n") |
35e883d1ff9b
Show number of new heads when doing a pull
mpm@selenic.com
parents:
1019
diff
changeset
|
984 |
% (changesets, revisions, files, heads)) |
222 | 985 |
|
986 |
tr.close() |
|
780 | 987 |
|
988 |
if not self.hook("changegroup"): |
|
989 |
return 1 |
|
990 |
||
222 | 991 |
return |
992 |
||
588 | 993 |
def update(self, node, allow=False, force=False, choose=None, |
994 |
moddirstate=True): |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
995 |
pl = self.dirstate.parents() |
275 | 996 |
if not force and pl[1] != nullid: |
254 | 997 |
self.ui.warn("aborting: outstanding uncommitted merges\n") |
690 | 998 |
return 1 |
46 | 999 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1000 |
p1, p2 = pl[0], node |
305 | 1001 |
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
|
1002 |
m1n = self.changelog.read(p1)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1003 |
m2n = self.changelog.read(p2)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1004 |
man = self.manifest.ancestor(m1n, m2n) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1005 |
m1 = self.manifest.read(m1n) |
276 | 1006 |
mf1 = self.manifest.readflags(m1n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1007 |
m2 = self.manifest.read(m2n) |
276 | 1008 |
mf2 = self.manifest.readflags(m2n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1009 |
ma = self.manifest.read(man) |
412 | 1010 |
mfa = self.manifest.readflags(man) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1011 |
|
723 | 1012 |
(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
|
1013 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1014 |
# 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
|
1015 |
# from p1 to p2? |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1016 |
linear_path = (pa == p1 or pa == p2) |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1017 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1018 |
# 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
|
1019 |
# we care about merging |
254 | 1020 |
self.ui.note("resolving manifests\n") |
650
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1021 |
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
|
1022 |
(force, allow, moddirstate, linear_path)) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1023 |
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
|
1024 |
(short(man), short(m1n), short(m2n))) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1025 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1026 |
merge = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1027 |
get = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1028 |
remove = [] |
46 | 1029 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1030 |
# construct a working dir manifest |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1031 |
mw = m1.copy() |
276 | 1032 |
mfw = mf1.copy() |
576 | 1033 |
umap = dict.fromkeys(u) |
1034 |
||
254 | 1035 |
for f in a + c + u: |
1036 |
mw[f] = "" |
|
441 | 1037 |
mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) |
576 | 1038 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1039 |
for f in d: |
254 | 1040 |
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
|
1041 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1042 |
# 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
|
1043 |
# 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
|
1044 |
# 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
|
1045 |
# 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
|
1046 |
# longer in the manifest. |
588 | 1047 |
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
|
1048 |
self.dirstate.forget((f,)) |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1049 |
|
576 | 1050 |
# Compare manifests |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1051 |
for f, n in mw.iteritems(): |
588 | 1052 |
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
|
1053 |
if f in m2: |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1054 |
s = 0 |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1055 |
|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1056 |
# is the wfile new since m1, and match m2? |
428 | 1057 |
if f not in m1: |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
1058 |
t1 = self.wread(f) |
994
88c15682d9b0
Fix callers to file.revision to use file.read
mpm@selenic.com
parents:
993
diff
changeset
|
1059 |
t2 = self.file(f).read(m2[f]) |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1060 |
if cmp(t1, t2) == 0: |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1061 |
n = m2[f] |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1062 |
del t1, t2 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1063 |
|
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1064 |
# are files different? |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1065 |
if n != m2[f]: |
254 | 1066 |
a = ma.get(f, nullid) |
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1067 |
# are both different from the ancestor? |
254 | 1068 |
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
|
1069 |
self.ui.debug(" %s versions differ, resolve\n" % f) |
276 | 1070 |
# merge executable bits |
1071 |
# "if we changed or they changed, change in merge" |
|
1072 |
a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
|
1073 |
mode = ((a^b) | (a^c)) ^ a |
|
1074 |
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
|
1075 |
s = 1 |
305 | 1076 |
# are we clobbering? |
1077 |
# is remote's version newer? |
|
1078 |
# or are we going back in time? |
|
1079 |
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
|
1080 |
self.ui.debug(" remote %s is newer, get\n" % f) |
254 | 1081 |
get[f] = m2[f] |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1082 |
s = 1 |
576 | 1083 |
elif f in umap: |
1084 |
# this unknown file is the same as the checkout |
|
1085 |
get[f] = m2[f] |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1086 |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1087 |
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
|
1088 |
if force: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1089 |
self.ui.debug(" updating permissions for %s\n" % f) |
441 | 1090 |
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
|
1091 |
else: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1092 |
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
|
1093 |
mode = ((a^b) | (a^c)) ^ a |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1094 |
if mode != b: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1095 |
self.ui.debug(" updating permissions for %s\n" % f) |
441 | 1096 |
util.set_exec(self.wjoin(f), mode) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1097 |
del m2[f] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1098 |
elif f in ma: |
616 | 1099 |
if n != ma[f]: |
1100 |
r = "d" |
|
1101 |
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
|
1102 |
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
|
1103 |
(" 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
|
1104 |
"(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
|
1105 |
if r == "d": |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1106 |
remove.append(f) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1107 |
else: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1108 |
self.ui.debug("other deleted %s\n" % f) |
254 | 1109 |
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
|
1110 |
else: |
254 | 1111 |
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
|
1112 |
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
|
1113 |
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
|
1114 |
remove.append(f) |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1115 |
else: |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1116 |
self.ui.debug("local created %s, keeping\n" % f) |
254 | 1117 |
else: |
1118 |
self.ui.debug("working dir created %s, keeping\n" % f) |
|
46 | 1119 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1120 |
for f, n in m2.iteritems(): |
588 | 1121 |
if choose and not choose(f): continue |
256 | 1122 |
if f[0] == "/": continue |
616 | 1123 |
if f in ma and n != ma[f]: |
1124 |
r = "k" |
|
1125 |
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
|
1126 |
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
|
1127 |
("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
|
1128 |
"(k)eep or (d)elete?", "[kd]", "k") |
616 | 1129 |
if r == "k": get[f] = n |
1130 |
elif f not in ma: |
|
254 | 1131 |
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
|
1132 |
get[f] = n |
616 | 1133 |
else: |
680
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1134 |
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
|
1135 |
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
|
1136 |
get[f] = n |
680
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1137 |
else: |
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1138 |
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
|
1139 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1140 |
del mw, m1, m2, ma |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1141 |
|
275 | 1142 |
if force: |
1143 |
for f in merge: |
|
1144 |
get[f] = merge[f][1] |
|
1145 |
merge = {} |
|
1146 |
||
690 | 1147 |
if linear_path or force: |
254 | 1148 |
# we don't need to do any magic, just jump to the new rev |
993 | 1149 |
branch_merge = False |
254 | 1150 |
p1, p2 = p2, nullid |
1151 |
else: |
|
275 | 1152 |
if not allow: |
305 | 1153 |
self.ui.status("this update spans a branch" + |
1154 |
" affecting the following files:\n") |
|
1155 |
fl = merge.keys() + get.keys() |
|
1156 |
fl.sort() |
|
1157 |
for f in fl: |
|
1158 |
cf = "" |
|
1159 |
if f in merge: cf = " (resolve)" |
|
1160 |
self.ui.status(" %s%s\n" % (f, cf)) |
|
1161 |
self.ui.warn("aborting update spanning branches!\n") |
|
788 | 1162 |
self.ui.status("(use update -m to merge across branches" + |
1163 |
" or -C to lose changes)\n") |
|
275 | 1164 |
return 1 |
993 | 1165 |
branch_merge = True |
254 | 1166 |
|
588 | 1167 |
if moddirstate: |
1168 |
self.dirstate.setparents(p1, p2) |
|
191
d7e859cf2f1b
merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents:
190
diff
changeset
|
1169 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1170 |
# 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
|
1171 |
files = get.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1172 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1173 |
for f in files: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1174 |
if f[0] == "/": continue |
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
1175 |
self.ui.note("getting %s\n" % f) |
276 | 1176 |
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
|
1177 |
try: |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
1178 |
self.wwrite(f, t) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1179 |
except IOError: |
297
0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
292
diff
changeset
|
1180 |
os.makedirs(os.path.dirname(self.wjoin(f))) |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
1181 |
self.wwrite(f, t) |
441 | 1182 |
util.set_exec(self.wjoin(f), mf2[f]) |
588 | 1183 |
if moddirstate: |
993 | 1184 |
if branch_merge: |
1185 |
self.dirstate.update([f], 'n', st_mtime=-1) |
|
992
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
1186 |
else: |
f859e9cba1b9
Fix up some bugs introduced by recent merge changes
mpm@selenic.com
parents:
991
diff
changeset
|
1187 |
self.dirstate.update([f], 'n') |
46 | 1188 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1189 |
# merge the tricky bits |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1190 |
files = merge.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1191 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1192 |
for f in files: |
256 | 1193 |
self.ui.status("merging %s\n" % f) |
993 | 1194 |
my, other, flag = merge[f] |
1195 |
self.merge3(f, my, other) |
|
441 | 1196 |
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
|
1197 |
if moddirstate: |
993 | 1198 |
if branch_merge: |
1199 |
# We've done a branch merge, mark this file as merged |
|
1200 |
# so that we properly record the merger later |
|
1201 |
self.dirstate.update([f], 'm') |
|
862
d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
861
diff
changeset
|
1202 |
else: |
993 | 1203 |
# We've update-merged a locally modified file, so |
1204 |
# we set the dirstate to emulate a normal checkout |
|
1205 |
# of that file some time in the past. Thus our |
|
1206 |
# merge will appear as a normal local file |
|
1207 |
# modification. |
|
1208 |
f_len = len(self.file(f).read(other)) |
|
1209 |
self.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1210 |
|
681 | 1211 |
remove.sort() |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1212 |
for f in remove: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1213 |
self.ui.note("removing %s\n" % f) |
690 | 1214 |
try: |
934
ff484cc157d6
Fix path handling for deleting files on merge
mpm@selenic.com
parents:
933
diff
changeset
|
1215 |
os.unlink(self.wjoin(f)) |
690 | 1216 |
except OSError, inst: |
1217 |
self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) |
|
578 | 1218 |
# 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
|
1219 |
try: os.removedirs(os.path.dirname(self.wjoin(f))) |
578 | 1220 |
except: pass |
588 | 1221 |
if moddirstate: |
993 | 1222 |
if branch_merge: |
1223 |
self.dirstate.update(remove, 'r') |
|
1224 |
else: |
|
588 | 1225 |
self.dirstate.forget(remove) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1226 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1227 |
def merge3(self, fn, my, other): |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1228 |
"""perform a 3-way merge in the working directory""" |
249 | 1229 |
|
96 | 1230 |
def temp(prefix, node): |
1231 |
pre = "%s~%s." % (os.path.basename(fn), prefix) |
|
1232 |
(fd, name) = tempfile.mkstemp("", pre) |
|
417 | 1233 |
f = os.fdopen(fd, "wb") |
1019
a9cca981c423
Create helper functions for I/O to files in the working directory
mpm@selenic.com
parents:
1013
diff
changeset
|
1234 |
self.wwrite(fn, fl.read(node), f) |
96 | 1235 |
f.close() |
1236 |
return name |
|
1237 |
||
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1238 |
fl = self.file(fn) |
96 | 1239 |
base = fl.ancestor(my, other) |
244 | 1240 |
a = self.wjoin(fn) |
346 | 1241 |
b = temp("base", base) |
1242 |
c = temp("other", other) |
|
96 | 1243 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1244 |
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
|
1245 |
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
|
1246 |
(fn, short(other), short(base))) |
96 | 1247 |
|
703
fb6f85ecc863
merge program setting from hgrc wasn't used.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
691
diff
changeset
|
1248 |
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
|
1249 |
or "hgmerge") |
240 | 1250 |
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
|
1251 |
if r: |
275 | 1252 |
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
|
1253 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1254 |
os.unlink(b) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1255 |
os.unlink(c) |
96 | 1256 |
|
247 | 1257 |
def verify(self): |
1258 |
filelinkrevs = {} |
|
1259 |
filenodes = {} |
|
1260 |
changesets = revisions = files = 0 |
|
1261 |
errors = 0 |
|
1262 |
||
302 | 1263 |
seen = {} |
247 | 1264 |
self.ui.status("checking changesets\n") |
1265 |
for i in range(self.changelog.count()): |
|
1266 |
changesets += 1 |
|
1267 |
n = self.changelog.node(i) |
|
302 | 1268 |
if n in seen: |
1269 |
self.ui.warn("duplicate changeset at revision %d\n" % i) |
|
1270 |
errors += 1 |
|
1271 |
seen[n] = 1 |
|
515 | 1272 |
|
247 | 1273 |
for p in self.changelog.parents(n): |
1274 |
if p not in self.changelog.nodemap: |
|
1275 |
self.ui.warn("changeset %s has unknown parent %s\n" % |
|
1276 |
(short(n), short(p))) |
|
1277 |
errors += 1 |
|
1278 |
try: |
|
1279 |
changes = self.changelog.read(n) |
|
1280 |
except Exception, inst: |
|
1281 |
self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
|
1282 |
errors += 1 |
|
1283 |
||
1284 |
for f in changes[3]: |
|
1285 |
filelinkrevs.setdefault(f, []).append(i) |
|
1286 |
||
302 | 1287 |
seen = {} |
247 | 1288 |
self.ui.status("checking manifests\n") |
1289 |
for i in range(self.manifest.count()): |
|
1290 |
n = self.manifest.node(i) |
|
302 | 1291 |
if n in seen: |
1292 |
self.ui.warn("duplicate manifest at revision %d\n" % i) |
|
1293 |
errors += 1 |
|
1294 |
seen[n] = 1 |
|
515 | 1295 |
|
247 | 1296 |
for p in self.manifest.parents(n): |
1297 |
if p not in self.manifest.nodemap: |
|
1298 |
self.ui.warn("manifest %s has unknown parent %s\n" % |
|
1299 |
(short(n), short(p))) |
|
1300 |
errors += 1 |
|
1301 |
||
1302 |
try: |
|
1303 |
delta = mdiff.patchtext(self.manifest.delta(n)) |
|
1304 |
except KeyboardInterrupt: |
|
1097 | 1305 |
self.ui.warn("interrupted") |
1306 |
raise |
|
247 | 1307 |
except Exception, inst: |
1308 |
self.ui.warn("unpacking manifest %s: %s\n" |
|
1309 |
% (short(n), inst)) |
|
1310 |
errors += 1 |
|
1311 |
||
1312 |
ff = [ l.split('\0') for l in delta.splitlines() ] |
|
1313 |
for f, fn in ff: |
|
284 | 1314 |
filenodes.setdefault(f, {})[bin(fn[:40])] = 1 |
247 | 1315 |
|
1316 |
self.ui.status("crosschecking files in changesets and manifests\n") |
|
1317 |
for f in filenodes: |
|
1318 |
if f not in filelinkrevs: |
|
1319 |
self.ui.warn("file %s in manifest but not in changesets\n" % f) |
|
1320 |
errors += 1 |
|
1321 |
||
1322 |
for f in filelinkrevs: |
|
1323 |
if f not in filenodes: |
|
1324 |
self.ui.warn("file %s in changeset but not in manifest\n" % f) |
|
1325 |
errors += 1 |
|
1326 |
||
1327 |
self.ui.status("checking files\n") |
|
1328 |
ff = filenodes.keys() |
|
1329 |
ff.sort() |
|
1330 |
for f in ff: |
|
1331 |
if f == "/dev/null": continue |
|
1332 |
files += 1 |
|
1333 |
fl = self.file(f) |
|
1334 |
nodes = { nullid: 1 } |
|
302 | 1335 |
seen = {} |
247 | 1336 |
for i in range(fl.count()): |
1337 |
revisions += 1 |
|
1338 |
n = fl.node(i) |
|
1339 |
||
302 | 1340 |
if n in seen: |
1341 |
self.ui.warn("%s: duplicate revision %d\n" % (f, i)) |
|
1342 |
errors += 1 |
|
1343 |
||
247 | 1344 |
if n not in filenodes[f]: |
1345 |
self.ui.warn("%s: %d:%s not in manifests\n" |
|
1346 |
% (f, i, short(n))) |
|
1347 |
errors += 1 |
|
1348 |
else: |
|
1349 |
del filenodes[f][n] |
|
1350 |
||
1351 |
flr = fl.linkrev(n) |
|
1352 |
if flr not in filelinkrevs[f]: |
|
1353 |
self.ui.warn("%s:%s points to unexpected changeset %d\n" |
|
1354 |
% (f, short(n), fl.linkrev(n))) |
|
1355 |
errors += 1 |
|
1356 |
else: |
|
1357 |
filelinkrevs[f].remove(flr) |
|
1358 |
||
1359 |
# verify contents |
|
1360 |
try: |
|
1361 |
t = fl.read(n) |
|
1362 |
except Exception, inst: |
|
1363 |
self.ui.warn("unpacking file %s %s: %s\n" |
|
1364 |
% (f, short(n), inst)) |
|
1365 |
errors += 1 |
|
1366 |
||
1367 |
# verify parents |
|
1368 |
(p1, p2) = fl.parents(n) |
|
1369 |
if p1 not in nodes: |
|
1370 |
self.ui.warn("file %s:%s unknown parent 1 %s" % |
|
1371 |
(f, short(n), short(p1))) |
|
1372 |
errors += 1 |
|
1373 |
if p2 not in nodes: |
|
1374 |
self.ui.warn("file %s:%s unknown parent 2 %s" % |
|
1375 |
(f, short(n), short(p1))) |
|
1376 |
errors += 1 |
|
1377 |
nodes[n] = 1 |
|
1378 |
||
1379 |
# cross-check |
|
1380 |
for node in filenodes[f]: |
|
1381 |
self.ui.warn("node %s in manifests not in %s\n" |
|
721 | 1382 |
% (hex(node), f)) |
247 | 1383 |
errors += 1 |
1384 |
||
1385 |
self.ui.status("%d files, %d changesets, %d total revisions\n" % |
|
1386 |
(files, changesets, revisions)) |
|
1387 |
||
1388 |
if errors: |
|
1389 |
self.ui.warn("%d integrity errors encountered!\n" % errors) |
|
1390 |
return 1 |