Mercurial > hg > pyhgsh
changeset 725:c6b912f8b5b2
Merge with Matt's tip.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 19 Jul 2005 07:00:03 -0800 |
| parents | 1c0c413cccdd (diff) 7dae73778114 (current diff) |
| children | 809a870a0e73 |
| files | .hgignore doc/FAQ.txt doc/hg.1.txt mercurial/commands.py mercurial/hg.py mercurial/util.py templates/map tests/test-help.out |
| diffstat | 4 files changed, 255 insertions(+), 107 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hg.1.txt Sun Jul 17 08:39:44 2005 +0100 +++ b/doc/hg.1.txt Tue Jul 19 07:00:03 2005 -0800 @@ -33,7 +33,8 @@ ---------------- files ...:: - indicates one or more filename or relative path filenames + indicates one or more filename or relative path filenames; see + "FILE NAME PATTERNS" for information on pattern matching path:: indicates a path on the local machine @@ -51,11 +52,14 @@ COMMANDS -------- -add [files ...]:: +add [options] [files ...]:: 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 + its subdirectory. + addremove:: Add all new files and remove all missing files from the repository. @@ -183,14 +187,10 @@ init:: Initialize a new repository in the current directory. -locate [options] [patterns]:: - Print all files under Mercurial control whose basenames match the +locate [options] [files]:: + Print all files under Mercurial control whose names match the given patterns. - Patterns are shell-style globs. To restrict searches to specific - directories, use the "-i <pat>" option. To eliminate particular - directories from searching, use the "-x <pat>" option. - This command searches the current directory and its subdirectories. To search an entire repository, move to the root of the repository. @@ -207,9 +207,9 @@ -0, --print0 end filenames with NUL, for use with xargs -f, --fullpath print complete paths from the filesystem root - -i, --include <pat> include directories matching the given globs + -I, --include <pat> include directories matching the given patterns -r, --rev <rev> search the repository as it stood at rev - -x, --exclude <pat> exclude directories matching the given globs + -X, --exclude <pat> exclude directories matching the given patterns log [-r revision ...] [-p] [file]:: Print the revision history of the specified file or the entire project. @@ -398,6 +398,52 @@ the changelog, manifest, and tracked files, as well as the integrity of their crosslinks and indices. +FILE NAME PATTERNS +------------------ + + Mercurial accepts several notations for identifying one or more + file at a time. + + By default, Mercurial treats file names as shell-style extended + glob patterns. + + Alternate pattern notations must be specified explicitly. + + To use a plain path name without any pattern matching, start a + name with "path:". These path names must match completely, from + the root of the current repository. + + To use an extended glob, start a name with "glob:". Globs are + rooted at the current directory; a glob such as "*.c" will match + files ending in ".c" in the current directory only. + + The supported glob syntax extensions are "**" to match any string + across path separators, and "{a,b}" to mean "a or b". + + To use a Perl/Python regular expression, start a name with "re:". + Regexp pattern matching is anchored at the root of the repository. + + Plain examples: + + path:foo/bar a name bar in a directory named foo in the root of + the repository + path:path:name a file or directory named "path:name" + + Glob examples: + + glob:*.c any name ending in ".c" in the current directory + *.c any name ending in ".c" in the current directory + **.c any name ending in ".c" in the current directory, or + any subdirectory + foo/*.c any name ending in ".c" in the directory foo + foo/**.c any name ending in ".c" in the directory foo, or any + subdirectory + + Regexp examples: + + re:.*\.c$ any name ending in ".c", anywhere in the repsitory + + SPECIFYING SINGLE REVISIONS ---------------------------
--- a/mercurial/commands.py Sun Jul 17 08:39:44 2005 +0100 +++ b/mercurial/commands.py Tue Jul 19 07:00:03 2005 -0800 @@ -36,6 +36,39 @@ for x in args] return args +def matchpats(ui, cwd, pats = [], opts = {}): + head = '' + if opts.get('rootless'): head = '(?:.*/|)' + def reify(name, tail): + if name.startswith('re:'): + return name[3:] + elif name.startswith('glob:'): + return head + util.globre(name[5:], '', tail) + elif name.startswith('path:'): + return '^' + re.escape(name[5:]) + '$' + return head + util.globre(name, '', tail) + cwdsep = cwd + os.sep + def under(fn): + if not cwd or fn.startswith(cwdsep): return True + def matchfn(pats, tail, ifempty = util.always): + if not pats: return ifempty + pat = '(?:%s)' % '|'.join([reify(p, tail) for p in pats]) + if cwd: pat = re.escape(cwd + os.sep) + pat + ui.debug('regexp: %s\n' % pat) + return re.compile(pat).match + patmatch = matchfn(pats, '$') + incmatch = matchfn(opts.get('include'), '(?:/|$)', under) + excmatch = matchfn(opts.get('exclude'), '(?:/|$)', util.never) + return lambda fn: (incmatch(fn) and not excmatch(fn) and + (fn.endswith('/') or patmatch(fn))) + +def walk(repo, pats, opts): + cwd = repo.getcwd() + if cwd: c = len(cwd) + 1 + for fn in repo.walk(match = matchpats(repo.ui, cwd, pats, opts)): + if cwd: yield fn, fn[c:] + else: yield fn, fn + revrangesep = ':' def revrange(ui, repo, revs, revlog=None): @@ -288,9 +321,17 @@ # Commands start here, listed alphabetically -def add(ui, repo, file1, *files): +def add(ui, repo, *pats, **opts): '''add the specified files on the next commit''' - repo.add(relpath(repo, (file1,) + files)) + names = [] + q = dict(zip(pats, pats)) + for abs, rel in walk(repo, pats, opts): + if rel in q or abs in q: + names.append(abs) + elif repo.dirstate.state(abs) == '?': + ui.status('adding %s\n' % rel) + names.append(abs) + repo.add(names) def addremove(ui, repo, *files): """add all new files, delete all missing files""" @@ -307,7 +348,7 @@ elif s not in 'nmai' and isfile: u.append(f) else: - (c, a, d, u) = repo.changes(None, None) + (c, a, d, u) = repo.changes() repo.add(u) repo.remove(d) @@ -586,7 +627,7 @@ return hexfunc = ui.verbose and hg.hex or hg.short - (c, a, d, u) = repo.changes(None, None) + (c, a, d, u) = repo.changes() output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]), (c or a or d) and "+" or "")] @@ -671,46 +712,15 @@ def locate(ui, repo, *pats, **opts): """locate files matching specific patterns""" - if [p for p in pats if os.sep in p]: - ui.warn("error: patterns may not contain '%s'\n" % os.sep) - ui.warn("use '-i <dir>' instead\n") - sys.exit(1) - def compile(pats, head='^', tail=os.sep, on_empty=True): - if not pats: - class c: - def match(self, x): - return on_empty - return c() - fnpats = [fnmatch.translate(os.path.normpath(os.path.normcase(p)))[:-1] - for p in pats] - regexp = r'%s(?:%s)%s' % (head, '|'.join(fnpats), tail) - return re.compile(regexp) - exclude = compile(opts['exclude'], on_empty=False) - include = compile(opts['include']) - pat = compile(pats, head='', tail='$') - end = opts['print0'] and '\0' or '\n' - if opts['rev']: - node = repo.manifest.lookup(opts['rev']) - else: - node = repo.manifest.tip() - manifest = repo.manifest.read(node) - cwd = repo.getcwd() - cwd_plus = cwd and (cwd + os.sep) - found = [] - for f in manifest: - f = os.path.normcase(f) - if exclude.match(f) or not(include.match(f) and - f.startswith(cwd_plus) and - pat.match(os.path.basename(f))): - continue + if opts['print0']: end = '\0' + else: end = '\n' + opts['rootless'] = True + for abs, rel in walk(repo, pats, opts): + if repo.dirstate.state(abs) == '?': continue if opts['fullpath']: - f = os.path.join(repo.root, f) - elif cwd: - f = f[len(cwd_plus):] - found.append(f) - found.sort() - for f in found: - ui.write(f, end) + ui.write(os.path.join(repo.root, abs), end) + else: + ui.write(rel, end) def log(ui, repo, f=None, **opts): """show the revision history of the repository or a single file""" @@ -986,7 +996,7 @@ R = removed ? = not tracked''' - (c, a, d, u) = repo.changes(None, None) + (c, a, d, u) = repo.changes() (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) for f in c: @@ -1017,7 +1027,7 @@ repo.opener("localtags", "a").write("%s %s\n" % (r, name)) return - (c, a, d, u) = repo.changes(None, None) + (c, a, d, u) = repo.changes() for x in (c, a, d, u): if ".hgtags" in x: ui.warn("abort: working copy of .hgtags is changed!\n") @@ -1088,8 +1098,11 @@ # Command options and aliases are listed here, alphabetically table = { - "^add": (add, [], "hg add FILE..."), - "addremove": (addremove, [], "hg addremove [FILE]..."), + "^add": (add, + [('I', 'include', [], 'include path in search'), + ('X', 'exclude', [], 'exclude path from search')], + "hg add [OPTIONS] [FILES]"), + "addremove": (addremove, [], "hg addremove [FILES]"), "^annotate": (annotate, [('r', 'rev', '', 'revision'), @@ -1140,9 +1153,9 @@ (locate, [('0', 'print0', None, 'end records with NUL'), ('f', 'fullpath', None, 'print complete paths'), - ('i', 'include', [], 'include path in search'), + ('I', 'include', [], 'include path in search'), ('r', 'rev', '', 'revision'), - ('x', 'exclude', [], 'exclude path from search')], + ('X', 'exclude', [], 'exclude path from search')], 'hg locate [OPTION]... [PATTERN]...'), "^log|history": (log,
--- a/mercurial/hg.py Sun Jul 17 08:39:44 2005 +0100 +++ b/mercurial/hg.py Tue Jul 19 07:00:03 2005 -0800 @@ -277,6 +277,33 @@ self.map = None self.pl = None self.copies = {} + self.ignorefunc = None + + def wjoin(self, f): + return os.path.join(self.root, f) + + def ignore(self, f): + if not self.ignorefunc: + bigpat = [] + try: + l = file(self.wjoin(".hgignore")) + for pat in l: + if pat != "\n": + p = util.pconvert(pat[:-1]) + try: + r = re.compile(p) + except: + self.ui.warn("ignoring invalid ignore" + + " regular expression '%s'\n" % p) + else: + bigpat.append(util.pconvert(pat[:-1])) + except IOError: pass + + s = "(?:%s)" % (")|(?:".join(bigpat)) + r = re.compile(s) + self.ignorefunc = r.search + + return self.ignorefunc(f) def __del__(self): if self.dirty: @@ -298,8 +325,12 @@ self.read() return self.pl + def markdirty(self): + if not self.dirty: + self.dirty = 1 + def setparents(self, p1, p2 = nullid): - self.dirty = 1 + self.markdirty() self.pl = p1, p2 def state(self, key): @@ -334,7 +365,7 @@ def copy(self, source, dest): self.read() - self.dirty = 1 + self.markdirty() self.copies[dest] = source def copied(self, file): @@ -349,7 +380,7 @@ if not files: return self.read() - self.dirty = 1 + self.markdirty() for f in files: if state == "r": self.map[f] = ('r', 0, 0, 0) @@ -360,7 +391,7 @@ def forget(self, files): if not files: return self.read() - self.dirty = 1 + self.markdirty() for f in files: try: del self.map[f] @@ -370,7 +401,7 @@ def clear(self): self.map = {} - self.dirty = 1 + self.markdirty() def write(self): st = self.opener("dirstate", "w") @@ -383,23 +414,23 @@ st.write(e + f) self.dirty = 0 - def changes(self, files, ignore): + def walk(self, files = None, match = util.always): self.read() dc = self.map.copy() - lookup, changed, added, unknown = [], [], [], [] - - # compare all files by default + # walk all files by default if not files: files = [self.root] - - # recursive generator of all files listed - def walk(files): + def traverse(): for f in util.unique(files): f = os.path.join(self.root, f) if os.path.isdir(f): for dir, subdirs, fl in os.walk(f): d = dir[len(self.root) + 1:] + if d == '.hg': + subdirs[:] = [] + continue for sd in subdirs: - if ignore(os.path.join(d, sd +'/')): + ds = os.path.join(d, sd +'/') + if self.ignore(ds) or not match(ds): subdirs.remove(sd) for fn in fl: fn = util.pconvert(os.path.join(d, fn)) @@ -410,7 +441,23 @@ for k in dc.keys(): yield k - for fn in util.unique(walk(files)): + # yield only files that match: all in dirstate, others only if + # not in .hgignore + + for fn in util.unique(traverse()): + if fn in dc: + del dc[fn] + elif self.ignore(fn): + continue + if match(fn): + yield fn + + def changes(self, files = None, match = util.always): + self.read() + dc = self.map.copy() + lookup, changed, added, unknown = [], [], [], [] + + for fn in self.walk(files, match): try: s = os.stat(os.path.join(self.root, fn)) except: continue @@ -429,7 +476,7 @@ elif c[1] != s.st_mode or c[3] != s.st_mtime: lookup.append(fn) else: - if not ignore(fn): unknown.append(fn) + if match(fn): unknown.append(fn) return (lookup, changed, added, dc.keys(), unknown) @@ -493,7 +540,6 @@ self.wopener = opener(self.root) self.manifest = manifest(self.opener) self.changelog = changelog(self.opener) - self.ignorefunc = None self.tagscache = None self.nodetagscache = None @@ -503,29 +549,6 @@ self.ui.readconfig(self.opener("hgrc")) except IOError: pass - def ignore(self, f): - if not self.ignorefunc: - bigpat = ["^.hg/$"] - try: - l = file(self.wjoin(".hgignore")) - for pat in l: - if pat != "\n": - p = util.pconvert(pat[:-1]) - try: - r = re.compile(p) - except: - self.ui.warn("ignoring invalid ignore" - + " regular expression '%s'\n" % p) - else: - bigpat.append(util.pconvert(pat[:-1])) - except IOError: pass - - s = "(?:%s)" % (")|(?:".join(bigpat)) - r = re.compile(s) - self.ignorefunc = r.search - - return self.ignorefunc(f) - def hook(self, name, **args): s = self.ui.config("hooks", name) if s: @@ -738,7 +761,7 @@ else: self.ui.warn("%s not tracked!\n" % f) else: - (c, a, d, u) = self.changes(None, None) + (c, a, d, u) = self.changes() commit = c + a remove = d @@ -815,7 +838,16 @@ if not self.hook("commit", node=hex(n)): return 1 - def changes(self, node1, node2, files=None): + def walk(self, node = None, files = [], match = util.always): + if node: + change = self.changelog.read(node) + fns = filter(match, self.manifest.read(change[0])) + else: + fns = self.dirstate.walk(files, match) + for fn in fns: yield fn + + def changes(self, node1 = None, node2 = None, files = [], + match = util.always): mf2, u = None, [] def fcmp(fn, mf): @@ -823,16 +855,23 @@ t2 = self.file(fn).revision(mf[fn]) return cmp(t1, t2) + def mfmatches(node): + mf = dict(self.manifest.read(node)) + for fn in mf.keys(): + if not match(fn): + del mf[fn] + return mf + # are we comparing the working directory? if not node2: - l, c, a, d, u = self.dirstate.changes(files, self.ignore) + l, c, a, d, u = self.dirstate.changes(files, match) # are we comparing working dir against its parent? if not node1: if l: # do a full compare of any files that might have changed change = self.changelog.read(self.dirstate.parents()[0]) - mf2 = self.manifest.read(change[0]) + mf2 = mfmatches(change[0]) for f in l: if fcmp(f, mf2): c.append(f) @@ -847,20 +886,20 @@ if not node2: if not mf2: change = self.changelog.read(self.dirstate.parents()[0]) - mf2 = self.manifest.read(change[0]).copy() + mf2 = mfmatches(change[0]) for f in a + c + l: mf2[f] = "" for f in d: if f in mf2: del mf2[f] else: change = self.changelog.read(node2) - mf2 = self.manifest.read(change[0]) + mf2 = mfmatches(change[0]) # flush lists from dirstate before comparing manifests c, a = [], [] change = self.changelog.read(node1) - mf1 = self.manifest.read(change[0]).copy() + mf1 = mfmatches(change[0]) for fn in mf2: if mf1.has_key(fn): @@ -885,7 +924,7 @@ self.ui.warn("%s does not exist!\n" % f) elif not os.path.isfile(p): self.ui.warn("%s not added: mercurial only supports files currently\n" % f) - elif self.dirstate.state(f) == 'n': + elif self.dirstate.state(f) in 'an': self.ui.warn("%s already tracked!\n" % f) else: self.dirstate.update([f], "a") @@ -1268,7 +1307,7 @@ ma = self.manifest.read(man) mfa = self.manifest.readflags(man) - (c, a, d, u) = self.changes(None, None) + (c, a, d, u) = self.changes() # is this a jump, or a merge? i.e. is there a linear path # from p1 to p2?
--- a/mercurial/util.py Sun Jul 17 08:39:44 2005 +0100 +++ b/mercurial/util.py Tue Jul 19 07:00:03 2005 -0800 @@ -6,6 +6,8 @@ # of the GNU General Public License, incorporated herein by reference. import os, errno +from demandload import * +demandload(globals(), "re") def unique(g): seen = {} @@ -29,6 +31,54 @@ return "stopped by signal %d" % val, val raise ValueError("invalid exit code") +def always(fn): return True +def never(fn): return False + +def globre(pat, head = '^', tail = '$'): + "convert a glob pattern into a regexp" + i, n = 0, len(pat) + res = '' + group = False + def peek(): return i < n and pat[i] + while i < n: + c = pat[i] + i = i+1 + if c == '*': + if peek() == '*': + i += 1 + res += '.*' + else: + res += '[^/]*' + elif c == '?': + res += '.' + elif c == '[': + j = i + if j < n and pat[j] in '!]': + j += 1 + while j < n and pat[j] != ']': + j += 1 + if j >= n: + res += '\\[' + else: + stuff = pat[i:j].replace('\\','\\\\') + i = j + 1 + if stuff[0] == '!': + stuff = '^' + stuff[1:] + elif stuff[0] == '^': + stuff = '\\' + stuff + res = '%s[%s]' % (res, stuff) + elif c == '{': + group = True + res += '(?:' + elif c == '}' and group: + res += ')' + group = False + elif c == ',' and group: + res += '|' + else: + res += re.escape(c) + return head + res + tail + def system(cmd, errprefix=None): """execute a shell command that must succeed""" rc = os.system(cmd)