Show More
@@ -32,7 +32,7 b' refresh contents of top applied patch ' | |||||
32 | from mercurial.demandload import * |
|
32 | from mercurial.demandload import * | |
33 | from mercurial.i18n import gettext as _ |
|
33 | from mercurial.i18n import gettext as _ | |
34 | demandload(globals(), "os sys re struct traceback errno bz2") |
|
34 | demandload(globals(), "os sys re struct traceback errno bz2") | |
35 | demandload(globals(), "mercurial:commands,hg,patch,revlog,ui,util") |
|
35 | demandload(globals(), "mercurial:cmdutil,commands,hg,patch,revlog,ui,util") | |
36 |
|
36 | |||
37 | commands.norepo += " qclone qversion" |
|
37 | commands.norepo += " qclone qversion" | |
38 |
|
38 | |||
@@ -480,8 +480,7 b' class queue:' | |||||
480 | cfiles = files |
|
480 | cfiles = files | |
481 | if cwd: |
|
481 | if cwd: | |
482 | cfiles = [util.pathto(cwd, f) for f in files] |
|
482 | cfiles = [util.pathto(cwd, f) for f in files] | |
483 |
c |
|
483 | cmdutil.addremove(repo, cfiles, wlock=wlock) | |
484 | opts={}, wlock=wlock) |
|
|||
485 | n = repo.commit(files, message, user, date, force=1, lock=lock, |
|
484 | n = repo.commit(files, message, user, date, force=1, lock=lock, | |
486 | wlock=wlock) |
|
485 | wlock=wlock) | |
487 |
|
486 |
@@ -90,3 +90,20 b' def walk(repo, pats, opts, node=None, he' | |||||
90 | files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch) |
|
90 | files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch) | |
91 | for r in results: |
|
91 | for r in results: | |
92 | yield r |
|
92 | yield r | |
|
93 | ||||
|
94 | def addremove(repo, pats, opts={}, wlock=None, dry_run=None): | |||
|
95 | if dry_run is None: | |||
|
96 | dry_run = opts.get('dry_run') | |||
|
97 | add, remove = [], [] | |||
|
98 | for src, abs, rel, exact in walk(repo, pats, opts): | |||
|
99 | if src == 'f' and repo.dirstate.state(abs) == '?': | |||
|
100 | add.append(abs) | |||
|
101 | if repo.ui.verbose or not exact: | |||
|
102 | repo.ui.status(_('adding %s\n') % ((pats and rel) or abs)) | |||
|
103 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): | |||
|
104 | remove.append(abs) | |||
|
105 | if repo.ui.verbose or not exact: | |||
|
106 | repo.ui.status(_('removing %s\n') % ((pats and rel) or abs)) | |||
|
107 | if not dry_run: | |||
|
108 | repo.add(add, wlock=wlock) | |||
|
109 | repo.remove(remove, wlock=wlock) |
@@ -655,22 +655,7 b' def addremove(ui, repo, *pats, **opts):' | |||||
655 | """ |
|
655 | """ | |
656 | ui.warn(_('(the addremove command is deprecated; use add and remove ' |
|
656 | ui.warn(_('(the addremove command is deprecated; use add and remove ' | |
657 | '--after instead)\n')) |
|
657 | '--after instead)\n')) | |
658 |
return addremove |
|
658 | return cmdutil.addremove(repo, pats, opts) | |
659 |
|
||||
660 | def addremove_lock(ui, repo, pats, opts, wlock=None): |
|
|||
661 | add, remove = [], [] |
|
|||
662 | for src, abs, rel, exact in cmdutil.walk(repo, pats, opts): |
|
|||
663 | if src == 'f' and repo.dirstate.state(abs) == '?': |
|
|||
664 | add.append(abs) |
|
|||
665 | if ui.verbose or not exact: |
|
|||
666 | ui.status(_('adding %s\n') % ((pats and rel) or abs)) |
|
|||
667 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): |
|
|||
668 | remove.append(abs) |
|
|||
669 | if ui.verbose or not exact: |
|
|||
670 | ui.status(_('removing %s\n') % ((pats and rel) or abs)) |
|
|||
671 | if not opts.get('dry_run'): |
|
|||
672 | repo.add(add, wlock=wlock) |
|
|||
673 | repo.remove(remove, wlock=wlock) |
|
|||
674 |
|
659 | |||
675 | def annotate(ui, repo, *pats, **opts): |
|
660 | def annotate(ui, repo, *pats, **opts): | |
676 | """show changeset information per file line |
|
661 | """show changeset information per file line | |
@@ -945,7 +930,7 b' def commit(ui, repo, *pats, **opts):' | |||||
945 | message = logmessage(opts) |
|
930 | message = logmessage(opts) | |
946 |
|
931 | |||
947 | if opts['addremove']: |
|
932 | if opts['addremove']: | |
948 |
addremove |
|
933 | cmdutil.addremove(repo, pats, opts) | |
949 | fns, match, anypats = cmdutil.matchpats(repo, pats, opts) |
|
934 | fns, match, anypats = cmdutil.matchpats(repo, pats, opts) | |
950 | if pats: |
|
935 | if pats: | |
951 | modified, added, removed = repo.status(files=fns, match=match)[:3] |
|
936 | modified, added, removed = repo.status(files=fns, match=match)[:3] | |
@@ -1722,7 +1707,7 b' def import_(ui, repo, patch1, *patches, ' | |||||
1722 | x = gp.mode & 0100 != 0 |
|
1707 | x = gp.mode & 0100 != 0 | |
1723 | dst = os.path.join(repo.root, gp.path) |
|
1708 | dst = os.path.join(repo.root, gp.path) | |
1724 | util.set_exec(dst, x) |
|
1709 | util.set_exec(dst, x) | |
1725 |
addremove |
|
1710 | cmdutil.addremove(repo, cfiles, wlock=wlock) | |
1726 | files = files.keys() |
|
1711 | files = files.keys() | |
1727 | files.extend([r for r in removes if r not in files]) |
|
1712 | files.extend([r for r in removes if r not in files]) | |
1728 | repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
|
1713 | repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
General Comments 0
You need to be logged in to leave comments.
Login now