mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:9a2a73ea6135
+:97b734fb9c6f
 This command takes effect in the next commit. To undo a copy
 before that, see hg revert.
 """
 wlock = repo.wlock(False)
-errs, copied = docopy(ui, repo, pats, opts, wlock)
+try:
+errs, copied = docopy(ui, repo, pats, opts, wlock)
+finally:
+del wlock
 return errs
 def debugancestor(ui, index, rev1, rev2):
 """find the ancestor revision of two revisions in a given index"""
 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
 if rev == "":
 rev = repo.changelog.tip()
 ctx = repo.changectx(rev)
 files = ctx.manifest()
 wlock = repo.wlock()
-repo.dirstate.rebuild(rev, files)
+try:
+repo.dirstate.rebuild(rev, files)
+finally:
+del wlock
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
 m1 = repo.changectx(parent1).manifest()
 wlock = repo.wlock()
 try:
 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
 finally:
-wlock.release()
+del wlock
 def debugstate(ui, repo):
 """show the contents of the current dirstate"""
 dc = repo.dirstate._map
 k = dc.keys()
 if opts.get('exact') or not opts['force']:
 cmdutil.bail_if_changed(repo)
 d = opts["base"]
 strip = opts["strip"]
+wlock = lock = None
-wlock = repo.wlock()
+try:
-lock = repo.lock()
+wlock = repo.wlock()
+lock = repo.lock()
 for p in patches:
 pf = os.path.join(d, p)
 if pf == '-':
 ui.status(_("applying patch from stdin\n"))
-tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
+data = patch.extract(ui, sys.stdin)
-else:
-ui.status(_("applying %s\n") % p)
-tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf, 'rb'))
-if tmpname is None:
-raise util.Abort(_('no diffs found'))
-try:
-cmdline_message = cmdutil.logmessage(opts)
-if cmdline_message:
-# pickup the cmdline msg
-message = cmdline_message
-elif message:
-# pickup the patch msg
-message = message.strip()
 else:
-# launch the editor
+ui.status(_("applying %s\n") % p)
-message = None
+data = patch.extract(ui, file(pf, 'rb'))
-ui.debug(_('message:\n%s\n') % message)
+tmpname, message, user, date, branch, nodeid, p1, p2 = data
-wp = repo.workingctx().parents()
-if opts.get('exact'):
+if tmpname is None:
-if not nodeid or not p1:
+raise util.Abort(_('no diffs found'))
-raise util.Abort(_('not a mercurial patch'))
-p1 = repo.lookup(p1)
+try:
-p2 = repo.lookup(p2 or hex(nullid))
+cmdline_message = cmdutil.logmessage(opts)
+if cmdline_message:
-if p1 != wp[0].node():
+# pickup the cmdline msg
-hg.clean(repo, p1, wlock=wlock)
+message = cmdline_message
-repo.dirstate.setparents(p1, p2)
+elif message:
-elif p2:
+# pickup the patch msg
+message = message.strip()
+else:
+# launch the editor
+message = None
+ui.debug(_('message:\n%s\n') % message)
+wp = repo.workingctx().parents()
+if opts.get('exact'):
+if not nodeid or not p1:
+raise util.Abort(_('not a mercurial patch'))
+p1 = repo.lookup(p1)
+p2 = repo.lookup(p2 or hex(nullid))
+if p1 != wp[0].node():
+hg.clean(repo, p1, wlock=wlock)
+repo.dirstate.setparents(p1, p2)
+elif p2:
+try:
+p1 = repo.lookup(p1)
+p2 = repo.lookup(p2)
+if p1 == wp[0].node():
+repo.dirstate.setparents(p1, p2)
+except hg.RepoError:
+pass
+if opts.get('exact') or opts.get('import_branch'):
+repo.dirstate.setbranch(branch or 'default')
+files = {}
 try:
-p1 = repo.lookup(p1)
+fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
-p2 = repo.lookup(p2)
+files=files)
-if p1 == wp[0].node():
+finally:
-repo.dirstate.setparents(p1, p2)
+files = patch.updatedir(ui, repo, files, wlock=wlock)
-except hg.RepoError:
+n = repo.commit(files, message, user, date, wlock=wlock,
-pass
+lock=lock)
-if opts.get('exact') or opts.get('import_branch'):
+if opts.get('exact'):
-repo.dirstate.setbranch(branch or 'default')
+if hex(n) != nodeid:
+repo.rollback(wlock=wlock, lock=lock)
-files = {}
+raise util.Abort(_('patch is damaged' +
-try:
+' or loses information'))
-fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
-files=files)
 finally:
-files = patch.updatedir(ui, repo, files, wlock=wlock)
+os.unlink(tmpname)
-n = repo.commit(files, message, user, date, wlock=wlock, lock=lock)
+finally:
-if opts.get('exact'):
+del wlock, lock
-if hex(n) != nodeid:
-repo.rollback(wlock=wlock, lock=lock)
-raise util.Abort(_('patch is damaged or loses information'))
-finally:
-os.unlink(tmpname)
 def incoming(ui, repo, source="default", **opts):
 """show new changesets found in source
 Show new changesets found in the specified path/URL or the default
 This command takes effect in the next commit. To undo a rename
 before that, see hg revert.
 """
 wlock = repo.wlock(False)
-errs, copied = docopy(ui, repo, pats, opts, wlock)
+try:
-names = []
+errs, copied = docopy(ui, repo, pats, opts, wlock)
-for abs, rel, exact in copied:
+names = []
-if ui.verbose or not exact:
+for abs, rel, exact in copied:
-ui.status(_('removing %s\n') % rel)
+if ui.verbose or not exact:
-names.append(abs)
+ui.status(_('removing %s\n') % rel)
-if not opts.get('dry_run'):
+names.append(abs)
-repo.remove(names, True, wlock=wlock)
+if not opts.get('dry_run'):
-return errs
+repo.remove(names, True, wlock=wlock)
+return errs
+finally:
+del wlock
 def revert(ui, repo, *pats, **opts):
 """revert files or dirs to their states as of some revision
 With no revision specified, revert the named files or directories
 if node == parent:
 pmf = mf
 else:
 pmf = None
-wlock = repo.wlock()
 # need all matching names in dirstate and manifest of target rev,
 # so have to walk both. do not print errors if files exist in one
 # but not other.
 names = {}
 target_only = {}
-# walk dirstate.
+wlock = repo.wlock()
+try:
-for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
+# walk dirstate.
-badmatch=mf.has_key):
+for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
-names[abs] = (rel, exact)
+badmatch=mf.has_key):
-if src == 'b':
+names[abs] = (rel, exact)
+if src == 'b':
+target_only[abs] = True
+# walk target manifest.
+def badmatch(path):
+if path in names:
+return True
+path_ = path + '/'
+for f in names:
+if f.startswith(path_):
+return True
+return False
+for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
+badmatch=badmatch):
+if abs in names or src == 'b':
+continue
+names[abs] = (rel, exact)
 target_only[abs] = True
-# walk target manifest.
+changes = repo.status(match=names.has_key, wlock=wlock)[:5]
+modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
-def badmatch(path):
-if path in names:
+revert = ([], _('reverting %s\n'))
-return True
+add = ([], _('adding %s\n'))
-path_ = path + '/'
+remove = ([], _('removing %s\n'))
-for f in names:
+forget = ([], _('forgetting %s\n'))
-if f.startswith(path_):
+undelete = ([], _('undeleting %s\n'))
-return True
+update = {}
-return False
+disptable = (
-for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
+# dispatch table:
-badmatch=badmatch):
+#   file state
-if abs in names or src == 'b':
+#   action if in target manifest
-continue
+#   action if not in target manifest
-names[abs] = (rel, exact)
+#   make backup if in target manifest
-target_only[abs] = True
+#   make backup if not in target manifest
+(modified, revert, remove, True, True),
-changes = repo.status(match=names.has_key, wlock=wlock)[:5]
+(added, revert, forget, True, False),
-modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
+(removed, undelete, None, False, False),
+(deleted, revert, remove, False, False),
-revert = ([], _('reverting %s\n'))
+(unknown, add, None, True, False),
-add = ([], _('adding %s\n'))
+(target_only, add, None, False, False),
-remove = ([], _('removing %s\n'))
+)
-forget = ([], _('forgetting %s\n'))
-undelete = ([], _('undeleting %s\n'))
+entries = names.items()
-update = {}
+entries.sort()
-disptable = (
+for abs, (rel, exact) in entries:
-# dispatch table:
+mfentry = mf.get(abs)
-#   file state
+target = repo.wjoin(abs)
-#   action if in target manifest
+def handle(xlist, dobackup):
-#   action if not in target manifest
+xlist[0].append(abs)
-#   make backup if in target manifest
+update[abs] = 1
-#   make backup if not in target manifest
+if dobackup and not opts['no_backup'] and util.lexists(target):
-(modified, revert, remove, True, True),
+bakname = "%s.orig" % rel
-(added, revert, forget, True, False),
+ui.note(_('saving current version of %s as %s\n') %
-(removed, undelete, None, False, False),
+(rel, bakname))
-(deleted, revert, remove, False, False),
+if not opts.get('dry_run'):
-(unknown, add, None, True, False),
+util.copyfile(target, bakname)
-(target_only, add, None, False, False),
+if ui.verbose or not exact:
-)
+ui.status(xlist[1] % rel)
+for table, hitlist, misslist, backuphit, backupmiss in disptable:
-entries = names.items()
+if abs not in table: continue
-entries.sort()
+# file has changed in dirstate
+if mfentry:
-for abs, (rel, exact) in entries:
+handle(hitlist, backuphit)
-mfentry = mf.get(abs)
+elif misslist is not None:
-target = repo.wjoin(abs)
+handle(misslist, backupmiss)
-def handle(xlist, dobackup):
+else:
-xlist[0].append(abs)
+if exact: ui.warn(_('file not managed: %s\n') % rel)
-update[abs] = 1
+break
-if dobackup and not opts['no_backup'] and util.lexists(target):
-bakname = "%s.orig" % rel
-ui.note(_('saving current version of %s as %s\n') %
-(rel, bakname))
-if not opts.get('dry_run'):
-util.copyfile(target, bakname)
-if ui.verbose or not exact:
-ui.status(xlist[1] % rel)
-for table, hitlist, misslist, backuphit, backupmiss in disptable:
-if abs not in table: continue
-# file has changed in dirstate
-if mfentry:
-handle(hitlist, backuphit)
-elif misslist is not None:
-handle(misslist, backupmiss)
 else:
-if exact: ui.warn(_('file not managed: %s\n') % rel)
+# file has not changed in dirstate
-break
+if node == parent:
-else:
+if exact: ui.warn(_('no changes needed to %s\n') % rel)
-# file has not changed in dirstate
+continue
-if node == parent:
+if pmf is None:
-if exact: ui.warn(_('no changes needed to %s\n') % rel)
+# only need parent manifest in this unlikely case,
-continue
+# so do not read by default
-if pmf is None:
+pmf = repo.changectx(parent).manifest()
-# only need parent manifest in this unlikely case,
+if abs in pmf:
-# so do not read by default
+if mfentry:
-pmf = repo.changectx(parent).manifest()
+# if version of file is same in parent and target
-if abs in pmf:
+# manifests, do nothing
-if mfentry:
+if pmf[abs] != mfentry:
-# if version of file is same in parent and target
+handle(revert, False)
-# manifests, do nothing
+else:
-if pmf[abs] != mfentry:
+handle(remove, False)
-handle(revert, False)
-else:
+if not opts.get('dry_run'):
-handle(remove, False)
+for f in forget[0]:
+repo.dirstate.forget(f)
-if not opts.get('dry_run'):
+r = hg.revert(repo, node, update.has_key, wlock)
-for f in forget[0]:
+for f in add[0]:
-repo.dirstate.forget(f)
+repo.dirstate.add(f)
-r = hg.revert(repo, node, update.has_key, wlock)
+for f in undelete[0]:
-for f in add[0]:
+repo.dirstate.normal(f)
-repo.dirstate.add(f)
+for f in remove[0]:
-for f in undelete[0]:
+repo.dirstate.remove(f)
-repo.dirstate.normal(f)
+return r
-for f in remove[0]:
+finally:
-repo.dirstate.remove(f)
+del wlock
-return r
 def rollback(ui, repo):
 """roll back the last transaction in this repository
 Roll back the last transaction in this repository, restoring the

changeset 4959	97b734fb9c6f
parent 4958	9a2a73ea6135
child 4961	126f527b3ba3