Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 30492:77cd647b04ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: refer to dirstateguard by its new name
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:06:34 -0500
parents 2019fbdab075
children a90867a22daf
comparison
equal deleted inserted replaced
30491:13251523b20c 30492:77cd647b04ac
29 changegroup, 29 changegroup,
30 changelog, 30 changelog,
31 cmdutil, 31 cmdutil,
32 context, 32 context,
33 dirstate, 33 dirstate,
34 dirstateguard,
34 encoding, 35 encoding,
35 error, 36 error,
36 exchange, 37 exchange,
37 extensions, 38 extensions,
38 filelog, 39 filelog,
1139 wlock = lock = dsguard = None 1140 wlock = lock = dsguard = None
1140 try: 1141 try:
1141 wlock = self.wlock() 1142 wlock = self.wlock()
1142 lock = self.lock() 1143 lock = self.lock()
1143 if self.svfs.exists("undo"): 1144 if self.svfs.exists("undo"):
1144 dsguard = cmdutil.dirstateguard(self, 'rollback') 1145 dsguard = dirstateguard.dirstateguard(self, 'rollback')
1145 1146
1146 return self._rollback(dryrun, force, dsguard) 1147 return self._rollback(dryrun, force, dsguard)
1147 else: 1148 else:
1148 self.ui.warn(_("no rollback information available\n")) 1149 self.ui.warn(_("no rollback information available\n"))
1149 return 1 1150 return 1