##// END OF EJS Templates
kill trailing whitespace
Dirkjan Ochtman -
r9312:c5f0825c default
parent child Browse files
Show More
@@ -311,7 +311,7 b' class svn_source(converter_source):'
311 self.module += '/' + trunk
311 self.module += '/' + trunk
312 self.head = self.latest(self.module, self.last_changed)
312 self.head = self.latest(self.module, self.last_changed)
313 if not self.head:
313 if not self.head:
314 raise util.Abort(_('no revision found in module %s')
314 raise util.Abort(_('no revision found in module %s')
315 % self.module)
315 % self.module)
316
316
317 # First head in the list is the module's head
317 # First head in the list is the module's head
@@ -454,8 +454,8 b' class svn_source(converter_source):'
454 # Here/tags/tag.1 discarded as well as its children.
454 # Here/tags/tag.1 discarded as well as its children.
455 # It happens with tools like cvs2svn. Such tags cannot
455 # It happens with tools like cvs2svn. Such tags cannot
456 # be represented in mercurial.
456 # be represented in mercurial.
457 addeds = dict((p, e.copyfrom_path) for p, e
457 addeds = dict((p, e.copyfrom_path) for p, e
458 in origpaths.iteritems()
458 in origpaths.iteritems()
459 if e.action == 'A' and e.copyfrom_path)
459 if e.action == 'A' and e.copyfrom_path)
460 badroots = set()
460 badroots = set()
461 for destroot in addeds:
461 for destroot in addeds:
@@ -210,7 +210,7 b' def _readtagcache(ui, repo):'
210 # have no <tagnode>. The cache is ordered from tip to oldest (which
210 # have no <tagnode>. The cache is ordered from tip to oldest (which
211 # is part of why <headrev> is there: a quick visual check is all
211 # is part of why <headrev> is there: a quick visual check is all
212 # that's required to ensure correct order).
212 # that's required to ensure correct order).
213 #
213 #
214 # This information is enough to let us avoid the most expensive part
214 # This information is enough to let us avoid the most expensive part
215 # of finding global tags, which is looking up <tagnode> in the
215 # of finding global tags, which is looking up <tagnode> in the
216 # manifest for each head.
216 # manifest for each head.
@@ -243,9 +243,8 b' def _readtagcache(ui, repo):'
243 return (None, None, tags, False)
243 return (None, None, tags, False)
244 if cachefile:
244 if cachefile:
245 cachefile.close() # ignore rest of file
245 cachefile.close() # ignore rest of file
246
246
247 repoheads = repo.heads()
247 repoheads = repo.heads()
248
249 # Case 2 (uncommon): empty repo; get out quickly and don't bother
248 # Case 2 (uncommon): empty repo; get out quickly and don't bother
250 # writing an empty cache.
249 # writing an empty cache.
251 if repoheads == [nullid]:
250 if repoheads == [nullid]:
@@ -288,7 +288,7 b' class ui(object):'
288 """Prompt user with msg, read response, and ensure it matches
288 """Prompt user with msg, read response, and ensure it matches
289 one of the provided choices. The index of the choice is returned.
289 one of the provided choices. The index of the choice is returned.
290 choices is a sequence of acceptable responses with the format:
290 choices is a sequence of acceptable responses with the format:
291 ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
291 ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
292 If ui is not interactive, the default is returned.
292 If ui is not interactive, the default is returned.
293 """
293 """
294 resps = [s[s.index('&')+1].lower() for s in choices]
294 resps = [s[s.index('&')+1].lower() for s in choices]
General Comments 0
You need to be logged in to leave comments. Login now