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