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

comparison mercurial/commands.py @ 1568:1d7d0c07e8f3

make all commands be repo-wide by default - refactor code in commands.py so that: if no pattern is given, the command will be repo-wide else it will work on the working dir - update the doc - fix the tests

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Thu, 01 Dec 2005 10:51:45 -0600
parents	b4956bbbadc9
children	6a104941d56a 63799b01985c

comparison

equal deleted inserted replaced

-:b4956bbbadc9
+:1d7d0c07e8f3
 cwd = repo.getcwd()
 if cwd:
 return [util.normpath(os.path.join(cwd, x)) for x in args]
 return args
-def matchpats(repo, cwd, pats=[], opts={}, head=''):
+def matchpats(repo, pats=[], opts={}, head=''):
+cwd = repo.getcwd()
+if not pats and cwd:
+opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
+opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
+cwd = ''
 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
-opts.get('exclude'), head)
+opts.get('exclude'), head) + (cwd,)
 def makewalk(repo, pats, opts, head=''):
-cwd = repo.getcwd()
+files, matchfn, anypats, cwd = matchpats(repo, pats, opts, head)
-files, matchfn, anypats = matchpats(repo, cwd, pats, opts, head)
 exact = dict(zip(files, files))
 def walk():
 for src, fn in repo.walk(files=files, match=matchfn):
 yield src, fn, util.pathto(cwd, fn), fn in exact
 return files, matchfn, walk()
 def walk(repo, pats, opts, head=''):
 files, matchfn, results = makewalk(repo, pats, opts, head)
 for r in results:
 yield r
-def walkchangerevs(ui, repo, cwd, pats, opts):
+def walkchangerevs(ui, repo, pats, opts):
 '''Iterate over files and the revs they changed in.
 Callers most commonly need to iterate backwards over the history
 it is interested in.  Doing so has awful (quadratic-looking)
 performance, so we use iterators in a "windowed" way.
 over with "add" - use to display data'''
 if repo.changelog.count() == 0:
 return [], False
-cwd = repo.getcwd()
+files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
-if not pats and cwd:
-opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
-opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
-files, matchfn, anypats = matchpats(repo, (pats and cwd) or '',
-pats, opts)
 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
 wanted = {}
 slowpath = anypats
 window = 300
 fncache = {}
 Schedule files to be version controlled and added to the repository.
 The files will be added to the repository at the next commit.
-If no names are given, add all files in the current directory and
+If no names are given, add all files in the repository.
-its subdirectories.
 """
 names = []
 for src, abs, rel, exact in walk(repo, pats, opts):
 if exact:
 """commit the specified files or all outstanding changes
 Commit changes to the given files into the repository.
 If a list of files is omitted, all changes reported by "hg status"
-from the root of the repository will be commited.
+will be commited.
 The HGEDITOR or EDITOR environment variables are used to start an
 editor to add a commit comment.
 """
 message = opts['message']
 raise util.Abort(_("can't read commit message '%s': %s") %
 (logfile, inst.strerror))
 if opts['addremove']:
 addremove(ui, repo, *pats, **opts)
-cwd = repo.getcwd()
+fns, match, anypats, cwd = matchpats(repo, pats, opts)
-if not pats and cwd:
-opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
-opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
-fns, match, anypats = matchpats(repo, (pats and repo.getcwd()) or '',
-pats, opts)
 if pats:
 c, a, d, u = repo.changes(files=fns, match=match)
 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
 else:
 files = []
 for src, abs, rel, exact in items:
 line = fmt % (src, abs, rel, exact and 'exact' or '')
 ui.write("%s\n" % line.rstrip())
 def diff(ui, repo, *pats, **opts):
-"""diff working directory (or selected files)
+"""diff repository (or selected files)
 Show differences between revisions for the specified files.
 Differences between files are shown using the unified diff format.
 if len(revs) > 1:
 node2 = revs[1]
 if len(revs) > 2:
 raise util.Abort(_("too many revisions to diff"))
-fns, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts)
+fns, matchfn, anypats, cwd = matchpats(repo, pats, opts)
 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
 text=opts['text'])
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
 counts[change] += 1
 return counts['+'], counts['-']
 fstate = {}
 skip = {}
-changeiter, getchange = walkchangerevs(ui, repo, repo.getcwd(), pats, opts)
+changeiter, getchange = walkchangerevs(ui, repo, pats, opts)
 count = 0
 incrementing = False
 for st, rev, fns in changeiter:
 if st == 'window':
 incrementing = rev
 def debug(self, *args):
 if self.debugflag:
 self.write(*args)
 def __getattr__(self, key):
 return getattr(self.ui, key)
-cwd = repo.getcwd()
+changeiter, getchange = walkchangerevs(ui, repo, pats, opts)
-if not pats and cwd:
-opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
-opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
-changeiter, getchange = walkchangerevs(ui, repo, (pats and cwd) or '',
-pats, opts)
 for st, rev, fns in changeiter:
 if st == 'window':
 du = dui(ui)
 elif st == 'add':
 du.bump(rev)
 If a file has been deleted, it is recreated.  If the executable
 mode of a file was changed, it is reset.
 If names are given, all files matching the names are reverted.
-If no names are given, all files in the current directory and
+If no arguments are given, all files in the repository are reverted.
-its subdirectories are reverted.
 """
 node = opts['rev'] and repo.lookup(opts['rev']) or \
 repo.dirstate.parents()[0]
-files, choose, anypats = matchpats(repo, repo.getcwd(), pats, opts)
+files, choose, anypats, cwd = matchpats(repo, pats, opts)
 (c, a, d, u) = repo.changes(match=choose)
 repo.forget(a)
 repo.undelete(d)
 return repo.update(node, False, True, choose, False)
 httpd.serve_forever()
 def status(ui, repo, *pats, **opts):
 """show changed files in the working directory
-Show changed files in the working directory.  If no names are
+Show changed files in the repository.  If names are
-given, all files are shown.  Otherwise, only files matching the
+given, only files that match are shown.
-given names are shown.
 The codes used to show the status of files are:
 M = modified
 A = added
 R = removed
 ? = not tracked
 """
-cwd = repo.getcwd()
+files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
-files, matchfn, anypats = matchpats(repo, cwd, pats, opts)
 (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
 for n in repo.changes(files=files, match=matchfn)]
 changetypes = [(_('modified'), 'M', c),
 (_('added'), 'A', a),

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 1568:1d7d0c07e8f3