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