Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 8908:105343f9f744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix warning: Seen unexpected token "%"
author Dongsheng Song <dongsheng.song@gmail.com>
date Fri, 19 Jun 2009 14:28:29 +0800
parents db3c1ab0e632
children 3df8dbf706b0
comparison
equal deleted inserted replaced
8831:91e26fb24fb1 8908:105343f9f744
75 self.sharedpath = self.path 75 self.sharedpath = self.path
76 try: 76 try:
77 s = os.path.realpath(self.opener("sharedpath").read()) 77 s = os.path.realpath(self.opener("sharedpath").read())
78 if not os.path.exists(s): 78 if not os.path.exists(s):
79 raise error.RepoError( 79 raise error.RepoError(
80 _('.hg/sharedpath points to nonexistent directory %s' % s)) 80 _('.hg/sharedpath points to nonexistent directory %s') % s)
81 self.sharedpath = s 81 self.sharedpath = s
82 except IOError, inst: 82 except IOError, inst:
83 if inst.errno != errno.ENOENT: 83 if inst.errno != errno.ENOENT:
84 raise 84 raise
85 85
1513 warn = 1 1513 warn = 1
1514 1514
1515 if warn: 1515 if warn:
1516 if not rheads: # new branch requires --force 1516 if not rheads: # new branch requires --force
1517 self.ui.warn(_("abort: push creates new" 1517 self.ui.warn(_("abort: push creates new"
1518 " remote branch '%s'!\n" % 1518 " remote branch '%s'!\n") %
1519 self[updatelh[0]].branch())) 1519 self[updatelh[0]].branch())
1520 else: 1520 else:
1521 self.ui.warn(_("abort: push creates new remote heads!\n")) 1521 self.ui.warn(_("abort: push creates new remote heads!\n"))
1522 1522
1523 self.ui.status(_("(did you forget to merge?" 1523 self.ui.status(_("(did you forget to merge?"
1524 " use push -f to force)\n")) 1524 " use push -f to force)\n"))