##// END OF EJS Templates
Whitespace cleanup...
Matt Mackall -
r659:3662e3d6 default
parent child Browse files
Show More
@@ -214,7 +214,7 b' class manifest(revlog):'
214 start = bs
214 start = bs
215 if fn != f:
215 if fn != f:
216 # item not found, insert a new one
216 # item not found, insert a new one
217 end = bs
217 end = bs
218 if w[1] == 1:
218 if w[1] == 1:
219 sys.stderr.write("failed to remove %s from manifest" % f)
219 sys.stderr.write("failed to remove %s from manifest" % f)
220 sys.exit(1)
220 sys.exit(1)
@@ -556,7 +556,7 b' class localrepository:'
556 except TypeError:
556 except TypeError:
557 bin_n = ''
557 bin_n = ''
558 self.tagscache[k.strip()] = bin_n
558 self.tagscache[k.strip()] = bin_n
559
559
560 try:
560 try:
561 # read each head of the tags file, ending with the tip
561 # read each head of the tags file, ending with the tip
562 # and add each tag found to the map, with "newer" ones
562 # and add each tag found to the map, with "newer" ones
@@ -571,7 +571,7 b' class localrepository:'
571 addtag(self, k, n)
571 addtag(self, k, n)
572 except KeyError:
572 except KeyError:
573 pass
573 pass
574
574
575 try:
575 try:
576 f = self.opener("localtags")
576 f = self.opener("localtags")
577 for l in f:
577 for l in f:
@@ -579,9 +579,9 b' class localrepository:'
579 addtag(self, k, n)
579 addtag(self, k, n)
580 except IOError:
580 except IOError:
581 pass
581 pass
582
582
583 self.tagscache['tip'] = self.changelog.tip()
583 self.tagscache['tip'] = self.changelog.tip()
584
584
585 return self.tagscache
585 return self.tagscache
586
586
587 def tagslist(self):
587 def tagslist(self):
@@ -878,7 +878,7 b' class localrepository:'
878 for f in list:
878 for f in list:
879 p = self.wjoin(f)
879 p = self.wjoin(f)
880 if not os.path.exists(p):
880 if not os.path.exists(p):
881 self.ui.warn("%s does not exist!\n" % f)
881 self.ui.warn("%s does not exist!\n" % f)
882 elif not os.path.isfile(p):
882 elif not os.path.isfile(p):
883 self.ui.warn("%s not added: mercurial only supports files currently\n" % f)
883 self.ui.warn("%s not added: mercurial only supports files currently\n" % f)
884 elif self.dirstate.state(f) == 'n':
884 elif self.dirstate.state(f) == 'n':
@@ -911,7 +911,7 b' class localrepository:'
911 if not os.path.exists(dest):
911 if not os.path.exists(dest):
912 self.ui.warn("%s does not exist!\n" % dest)
912 self.ui.warn("%s does not exist!\n" % dest)
913 elif not os.path.isfile(dest):
913 elif not os.path.isfile(dest):
914 self.ui.warn("copy failed: %s is not a file\n" % dest)
914 self.ui.warn("copy failed: %s is not a file\n" % dest)
915 else:
915 else:
916 if self.dirstate.state(dest) == '?':
916 if self.dirstate.state(dest) == '?':
917 self.dirstate.update([dest], "a")
917 self.dirstate.update([dest], "a")
General Comments 0
You need to be logged in to leave comments. Login now