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