Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 17145:f7152a0d90df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Martin Geisler <mg@aragost.com>
date Thu, 12 Jul 2012 10:41:56 +0200
parents 1894dac619de 54714fc4ae33
children 5884812686f7
comparison
equal deleted inserted replaced
17139:ad1b5e070f16 17145:f7152a0d90df
1183 (current.split('/', 2)[2], self._relpath)) 1183 (current.split('/', 2)[2], self._relpath))
1184 self._gitcommand(cmd + ['origin', current]) 1184 self._gitcommand(cmd + ['origin', current])
1185 return True 1185 return True
1186 else: 1186 else:
1187 self._ui.warn(_('no branch checked out in subrepo %s\n' 1187 self._ui.warn(_('no branch checked out in subrepo %s\n'
1188 'cannot push revision %s') % 1188 'cannot push revision %s\n') %
1189 (self._relpath, self._state[1])) 1189 (self._relpath, self._state[1]))
1190 return False 1190 return False
1191 1191
1192 def remove(self): 1192 def remove(self):
1193 if self._gitmissing(): 1193 if self._gitmissing():