mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
Renamed localrepo.undo() to rollback() and talk about "rollback information".
This commit is contained in:
parent
e4abeb4452
commit
4b040d1963
@ -2432,7 +2432,7 @@ def rollback(ui, repo):
|
||||
repository; for example an in-progress pull from the repository
|
||||
may fail if a rollback is performed.
|
||||
"""
|
||||
repo.undo()
|
||||
repo.rollback()
|
||||
|
||||
def root(ui, repo):
|
||||
"""print the root (top) of the current working dir
|
||||
@ -2757,7 +2757,7 @@ def undo(ui, repo):
|
||||
instructions, see the rollback command.
|
||||
"""
|
||||
ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
|
||||
repo.undo()
|
||||
repo.rollback()
|
||||
|
||||
def update(ui, repo, node=None, merge=False, clean=False, force=None,
|
||||
branch=None, **opts):
|
||||
|
@ -303,7 +303,7 @@ class localrepository(object):
|
||||
if tr != None and tr.running():
|
||||
return tr.nest()
|
||||
|
||||
# save dirstate for undo
|
||||
# save dirstate for rollback
|
||||
try:
|
||||
ds = self.opener("dirstate").read()
|
||||
except IOError:
|
||||
@ -327,7 +327,7 @@ class localrepository(object):
|
||||
self.ui.warn(_("no interrupted transaction available\n"))
|
||||
return False
|
||||
|
||||
def undo(self, wlock=None):
|
||||
def rollback(self, wlock=None):
|
||||
if not wlock:
|
||||
wlock = self.wlock()
|
||||
l = self.lock()
|
||||
@ -338,7 +338,7 @@ class localrepository(object):
|
||||
self.reload()
|
||||
self.wreload()
|
||||
else:
|
||||
self.ui.warn(_("no undo information available\n"))
|
||||
self.ui.warn(_("no rollback information available\n"))
|
||||
|
||||
def wreload(self):
|
||||
self.dirstate.read()
|
||||
|
Loading…
Reference in New Issue
Block a user