Show More
@@ -318,6 +318,7 b' class localrepository:' | |||
|
318 | 318 | os.mkdir(self.join("data")) |
|
319 | 319 | |
|
320 | 320 | self.opener = opener(self.path) |
|
321 | self.wopener = opener(self.root) | |
|
321 | 322 | self.manifest = manifest(self.opener) |
|
322 | 323 | self.changelog = changelog(self.opener) |
|
323 | 324 | self.ignorelist = None |
@@ -330,7 +331,7 b' class localrepository:' | |||
|
330 | 331 | if self.ignorelist is None: |
|
331 | 332 | self.ignorelist = [] |
|
332 | 333 | try: |
|
333 |
l = |
|
|
334 | l = self.wfile(".hgignore") | |
|
334 | 335 | for pat in l: |
|
335 | 336 | if pat != "\n": |
|
336 | 337 | self.ignorelist.append(re.compile(pat[:-1])) |
@@ -370,6 +371,9 b' class localrepository:' | |||
|
370 | 371 | if f[0] == '/': f = f[1:] |
|
371 | 372 | return filelog(self.opener, f) |
|
372 | 373 | |
|
374 | def wfile(self, f, mode='r'): | |
|
375 | return self.wopener(f, mode) | |
|
376 | ||
|
373 | 377 | def transaction(self): |
|
374 | 378 | # save dirstate for undo |
|
375 | 379 | try: |
@@ -526,7 +530,7 b' class localrepository:' | |||
|
526 | 530 | dc = self.dirstate.copy() |
|
527 | 531 | |
|
528 | 532 | def fcmp(fn): |
|
529 |
t1 = |
|
|
533 | t1 = self.wfile(fn).read() | |
|
530 | 534 | t2 = self.file(fn).revision(mf[fn]) |
|
531 | 535 | return cmp(t1, t2) |
|
532 | 536 | |
@@ -991,13 +995,12 b' class localrepository:' | |||
|
991 | 995 | if f[0] == "/": continue |
|
992 | 996 | self.ui.note("getting %s\n" % f) |
|
993 | 997 | t = self.file(f).read(get[f]) |
|
994 | wp = self.wjoin(f) | |
|
995 | 998 | try: |
|
996 |
file( |
|
|
999 | self.wfile(f, "w").write(t) | |
|
997 | 1000 | except IOError: |
|
998 | 1001 | os.makedirs(os.path.dirname(wp)) |
|
999 |
file( |
|
|
1000 |
set_exec( |
|
|
1002 | self.wfile(f, "w").write(t) | |
|
1003 | set_exec(self.wjoin(f), mf2[f]) | |
|
1001 | 1004 | self.dirstate.update([f], mode) |
|
1002 | 1005 | |
|
1003 | 1006 | # merge the tricky bits |
General Comments 0
You need to be logged in to leave comments.
Login now