Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 13136:6320101a638c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Dec 2010 17:10:01 -0600
parents c36dad4f6e54 c1492615cdee
children f02d7a562a21
comparison
equal deleted inserted replaced
13132:24e3349cba8e 13136:6320101a638c
306 306
307 user: name of user to use if committing 307 user: name of user to use if committing
308 308
309 date: date tuple to use if committing''' 309 date: date tuple to use if committing'''
310 310
311 for x in self.status()[:5]: 311 if not local:
312 if '.hgtags' in x: 312 for x in self.status()[:5]:
313 raise util.Abort(_('working copy of .hgtags is changed ' 313 if '.hgtags' in x:
314 '(please commit .hgtags manually)')) 314 raise util.Abort(_('working copy of .hgtags is changed '
315 '(please commit .hgtags manually)'))
315 316
316 self.tags() # instantiate the cache 317 self.tags() # instantiate the cache
317 self._tag(names, node, message, local, user, date) 318 self._tag(names, node, message, local, user, date)
318 319
319 def tags(self): 320 def tags(self):