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