equal
deleted
inserted
replaced
358 |
358 |
359 def markdirty(self): |
359 def markdirty(self): |
360 if not self.dirty: |
360 if not self.dirty: |
361 self.dirty = 1 |
361 self.dirty = 1 |
362 |
362 |
363 def setparents(self, p1, p2 = nullid): |
363 def setparents(self, p1, p2=nullid): |
364 self.markdirty() |
364 self.markdirty() |
365 self.pl = p1, p2 |
365 self.pl = p1, p2 |
366 |
366 |
367 def state(self, key): |
367 def state(self, key): |
368 try: |
368 try: |
478 else: |
478 else: |
479 break |
479 break |
480 bs += 1 |
480 bs += 1 |
481 return ret |
481 return ret |
482 |
482 |
483 def walk(self, files = None, match = util.always, dc=None): |
483 def walk(self, files=None, match=util.always, dc=None): |
484 self.read() |
484 self.read() |
485 |
485 |
486 # walk all files by default |
486 # walk all files by default |
487 if not files: |
487 if not files: |
488 files = [self.root] |
488 files = [self.root] |
814 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
814 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
815 self.dirstate = dirstate(self.opener, self.ui, self.root) |
815 self.dirstate = dirstate(self.opener, self.ui, self.root) |
816 else: |
816 else: |
817 self.ui.warn("no undo information available\n") |
817 self.ui.warn("no undo information available\n") |
818 |
818 |
819 def lock(self, wait = 1): |
819 def lock(self, wait=1): |
820 try: |
820 try: |
821 return lock.lock(self.join("lock"), 0) |
821 return lock.lock(self.join("lock"), 0) |
822 except lock.LockHeld, inst: |
822 except lock.LockHeld, inst: |
823 if wait: |
823 if wait: |
824 self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
824 self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
909 elif s == 'r': |
909 elif s == 'r': |
910 remove.append(f) |
910 remove.append(f) |
911 else: |
911 else: |
912 self.ui.warn("%s not tracked!\n" % f) |
912 self.ui.warn("%s not tracked!\n" % f) |
913 else: |
913 else: |
914 (c, a, d, u) = self.changes(match = match) |
914 (c, a, d, u) = self.changes(match=match) |
915 commit = c + a |
915 commit = c + a |
916 remove = d |
916 remove = d |
917 |
917 |
918 p1, p2 = self.dirstate.parents() |
918 p1, p2 = self.dirstate.parents() |
919 c1 = self.changelog.read(p1) |
919 c1 = self.changelog.read(p1) |
1016 |
1016 |
1017 if not self.hook("commit", node=hex(n)): |
1017 if not self.hook("commit", node=hex(n)): |
1018 return None |
1018 return None |
1019 return n |
1019 return n |
1020 |
1020 |
1021 def walk(self, node = None, files = [], match = util.always): |
1021 def walk(self, node=None, files=[], match=util.always): |
1022 if node: |
1022 if node: |
1023 for fn in self.manifest.read(self.changelog.read(node)[0]): |
1023 for fn in self.manifest.read(self.changelog.read(node)[0]): |
1024 if match(fn): yield 'm', fn |
1024 if match(fn): yield 'm', fn |
1025 else: |
1025 else: |
1026 for src, fn in self.dirstate.walk(files, match): |
1026 for src, fn in self.dirstate.walk(files, match): |