mercurial-scm/hg-stable: mercurial/commands.py comparison

comparison mercurial/commands.py @ 1253:a45e717c61a8

Add rename/mv command. This is the logical equivalent of copy and remove, and is in fact implemented as such. It doesn't use the remove command directly.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Wed, 14 Sep 2005 16:34:22 -0700
parents	0ad3f9b27260
children	e6560042b7b8

comparison

equal deleted inserted replaced

-:94f38724283f
+:a45e717c61a8
 try:
 repo.commit(files, message, opts['user'], opts['date'], match)
 except ValueError, inst:
 raise util.Abort(str(inst))
-def copy(ui, repo, *pats, **opts):
+def docopy(ui, repo, pats, opts):
-"""mark files as copied for the next commit"""
 if not pats:
 raise util.Abort('no source or destination specified')
 elif len(pats) == 1:
 raise util.Abort('no destination specified')
 pats = list(pats)
 if opts['parents']:
 raise util.Abort('with --parents, destination must be a directory')
 elif len(sources) > 1:
 raise util.Abort('with multiple sources, destination must be a '
 'directory')
-errs = 0
+errs, copied = 0, []
 for abs, rel, exact in sources:
 if opts['parents']:
 mydest = os.path.join(dest, rel)
 elif destisfile:
 mydest = reldest
 try:
 shutil.copyfile(rel, myreldest)
 n = repo.manifest.tip()
 mf = repo.manifest.readflags(n)
 util.set_exec(myreldest, util.is_exec(rel, mf[abs]))
+except shutil.Error, inst:
+raise util.Abort(str(inst))
 except IOError, inst:
 if inst.errno == errno.ENOENT:
 ui.warn('%s: deleted in working copy\n' % rel)
 else:
 ui.warn('%s: cannot copy - %s\n' % (rel, inst.strerror))
 errs += 1
 continue
 repo.copy(abs, myabsdest)
+copied.append((abs, rel, exact))
 if errs:
-ui.warn('(consider using --after to record failed copies)\n')
+ui.warn('(consider using --after)\n')
+return errs, copied
+def copy(ui, repo, *pats, **opts):
+"""mark files as copied for the next commit"""
+errs, copied = docopy(ui, repo, pats, opts)
 return errs
 def debugcheckstate(ui, repo):
 """validate the correctness of the current dirstate"""
 parent1, parent2 = repo.dirstate.parents()
 def okaytoremove(abs, rel, exact):
 c, a, d, u = repo.changes(files = [abs])
 reason = None
 if c: reason = 'is modified'
 elif a: reason = 'has been marked for add'
-elif u: reason = 'not managed'
+elif u: reason = 'is not managed'
 if reason and exact:
 ui.warn('not removing %s: file %s\n' % (rel, reason))
 else:
 return True
 for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):
 if okaytoremove(abs, rel, exact):
-if not exact: ui.status('removing %s\n' % rel)
+if ui.verbose or not exact: ui.status('removing %s\n' % rel)
 names.append(abs)
 for name in names:
 try:
 os.unlink(name)
 except OSError, inst:
 if inst.errno != errno.ENOENT: raise
 repo.remove(names)
+def rename(ui, repo, *pats, **opts):
+"""rename files; equivalent of copy + remove"""
+errs, copied = docopy(ui, repo, pats, opts)
+names = []
+for abs, rel, exact in copied:
+if ui.verbose or not exact: ui.status('removing %s\n' % rel)
+try:
+os.unlink(rel)
+except OSError, inst:
+if inst.errno != errno.ENOENT: raise
+names.append(abs)
+repo.remove(names)
+return errs
 def revert(ui, repo, *names, **opts):
 """revert modified files or dirs back to their unmodified states"""
 node = opts['rev'] and repo.lookup(opts['rev']) or \
 repo.dirstate.parents()[0]
 (import_,
 [('p', 'strip', 1, 'path strip'),
 ('f', 'force', None, 'skip check for outstanding changes'),
 ('b', 'base', "", 'base path')],
 "hg import [-f] [-p NUM] [-b BASE] PATCH..."),
 "incoming|in": (incoming,
 [('p', 'patch', None, 'show patch')],
 'hg incoming [-p] [SOURCE]'),
 "^init": (init, [], 'hg init [DEST]'),
 "locate":
 (locate,
 ('b', 'branch', None, 'show branches'),
 ('r', 'rev', [], 'revision'),
 ('p', 'patch', None, 'show patch')],
 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
 "manifest": (manifest, [], 'hg manifest [REV]'),
 "outgoing|out": (outgoing,
 [('p', 'patch', None, 'show patch')],
 'hg outgoing [-p] [DEST]'),
 "parents": (parents, [], 'hg parents [REV]'),
 "paths": (paths, [], 'hg paths [NAME]'),
 "^pull":
 "recover": (recover, [], "hg recover"),
 "^remove|rm": (remove,
 [('I', 'include', [], 'include path in search'),
 ('X', 'exclude', [], 'exclude path from search')],
 "hg remove [OPTION]... FILE..."),
+"rename|mv": (rename,
+[('I', 'include', [], 'include path in search'),
+('X', 'exclude', [], 'exclude path from search'),
+('A', 'after', None, 'record a copy after it has happened'),
+('f', 'force', None, 'replace destination if it exists'),
+('p', 'parents', None, 'append source path to dest')],
+'hg rename [OPTION]... [SOURCE]... DEST'),
 "^revert":
 (revert,
 [("n", "nonrecursive", None, "don't recurse into subdirs"),
 ("r", "rev", "", "revision")],
 "hg revert [-n] [-r REV] [NAME]..."),

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 1253:a45e717c61a8