Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 151:1f6c61a60586
Bail on attempts to do an empty commit
author | mpm@selenic.com |
---|---|
date | Wed, 25 May 2005 08:53:34 -0800 |
parents | 8cd45e152c83 |
children | 083c38bdfa64 083c38bdfa64 |
comparison
equal
deleted
inserted
replaced
150:8029ee2949b8 | 151:1f6c61a60586 |
---|---|
296 def transaction(self): | 296 def transaction(self): |
297 return transaction(self.opener, self.join("journal"), | 297 return transaction(self.opener, self.join("journal"), |
298 self.join("undo")) | 298 self.join("undo")) |
299 | 299 |
300 def commit(self, parent, update = None, text = ""): | 300 def commit(self, parent, update = None, text = ""): |
301 tr = self.transaction() | |
302 | |
303 try: | 301 try: |
304 remove = [ l[:-1] for l in self.opener("to-remove") ] | 302 remove = [ l[:-1] for l in self.opener("to-remove") ] |
305 os.unlink(self.join("to-remove")) | 303 os.unlink(self.join("to-remove")) |
306 | 304 |
307 except IOError: | 305 except IOError: |
308 remove = [] | 306 remove = [] |
309 | 307 |
310 if update == None: | 308 if update == None: |
311 update = self.diffdir(self.root, parent)[0] | 309 update = self.diffdir(self.root, parent)[0] |
310 | |
311 if not update: | |
312 self.ui.status("nothing changed\n") | |
313 return | |
314 | |
315 tr = self.transaction() | |
312 | 316 |
313 # check in files | 317 # check in files |
314 new = {} | 318 new = {} |
315 linkrev = self.changelog.count() | 319 linkrev = self.changelog.count() |
316 update.sort() | 320 update.sort() |