##// END OF EJS Templates
Renamed localrepo.undo() to rollback() and talk about "rollback information".
Thomas Arendsen Hein -
r2362:482d3fb4 default
parent child Browse files
Show More
@@ -2432,7 +2432,7 b' def rollback(ui, repo):'
2432 repository; for example an in-progress pull from the repository
2432 repository; for example an in-progress pull from the repository
2433 may fail if a rollback is performed.
2433 may fail if a rollback is performed.
2434 """
2434 """
2435 repo.undo()
2435 repo.rollback()
2436
2436
2437 def root(ui, repo):
2437 def root(ui, repo):
2438 """print the root (top) of the current working dir
2438 """print the root (top) of the current working dir
@@ -2757,7 +2757,7 b' def undo(ui, repo):'
2757 instructions, see the rollback command.
2757 instructions, see the rollback command.
2758 """
2758 """
2759 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2759 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2760 repo.undo()
2760 repo.rollback()
2761
2761
2762 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2762 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2763 branch=None, **opts):
2763 branch=None, **opts):
@@ -303,7 +303,7 b' class localrepository(object):'
303 if tr != None and tr.running():
303 if tr != None and tr.running():
304 return tr.nest()
304 return tr.nest()
305
305
306 # save dirstate for undo
306 # save dirstate for rollback
307 try:
307 try:
308 ds = self.opener("dirstate").read()
308 ds = self.opener("dirstate").read()
309 except IOError:
309 except IOError:
@@ -327,7 +327,7 b' class localrepository(object):'
327 self.ui.warn(_("no interrupted transaction available\n"))
327 self.ui.warn(_("no interrupted transaction available\n"))
328 return False
328 return False
329
329
330 def undo(self, wlock=None):
330 def rollback(self, wlock=None):
331 if not wlock:
331 if not wlock:
332 wlock = self.wlock()
332 wlock = self.wlock()
333 l = self.lock()
333 l = self.lock()
@@ -338,7 +338,7 b' class localrepository(object):'
338 self.reload()
338 self.reload()
339 self.wreload()
339 self.wreload()
340 else:
340 else:
341 self.ui.warn(_("no undo information available\n"))
341 self.ui.warn(_("no rollback information available\n"))
342
342
343 def wreload(self):
343 def wreload(self):
344 self.dirstate.read()
344 self.dirstate.read()
General Comments 0
You need to be logged in to leave comments. Login now