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