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

equal deleted inserted replaced

-:28e2f13ca7c4
+:503aaf19a040
 return util.matcher(repo, cwd, pats or ['.'], opts.get('include'),
 opts.get('exclude'), head)
 def makewalk(repo, pats, opts, head = ''):
 cwd = repo.getcwd()
-files, matchfn = matchpats(repo, cwd, 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()
 end -= 1
 step = -1
 for rev in xrange(start, end, step):
 yield str(rev)
 else:
-yield spec
+yield str(fix(spec, None))
 def make_filename(repo, r, pat, node=None,
 total=None, seqno=None, revwidth=None):
 node_expander = {
 'H': lambda: hg.hex(node),
 for f in d:
 to = repo.file(f).read(mmap[f])
 tn = None
 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
-def show_changeset(ui, repo, rev=0, changenode=None, filelog=None, brinfo=None):
+def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
 """show a single changeset or file revision"""
-changelog = repo.changelog
+log = repo.changelog
-if filelog:
+if changenode is None:
-log = filelog
+changenode = log.node(rev)
-filerev = rev
+elif not rev:
-node = filenode = filelog.node(filerev)
+rev = log.rev(changenode)
-changerev = filelog.linkrev(filenode)
-changenode = changenode or changelog.node(changerev)
-else:
-log = changelog
-changerev = rev
-if changenode is None:
-changenode = changelog.node(changerev)
-elif not changerev:
-rev = changerev = changelog.rev(changenode)
-node = changenode
 if ui.quiet:
-ui.write("%d:%s\n" % (rev, hg.short(node)))
+ui.write("%d:%s\n" % (rev, hg.short(changenode)))
 return
-changes = changelog.read(changenode)
+changes = log.read(changenode)
 t, tz = changes[2].split(' ')
 # a conversion tool was sticking non-integer offsets into repos
 try:
 tz = int(tz)
 except ValueError:
 tz = 0
 date = time.asctime(time.localtime(float(t))) + " %+05d" % (int(tz)/-36)
 parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p))
-for p in log.parents(node)
+for p in log.parents(changenode)
 if ui.debugflag or p != hg.nullid]
 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
 parents = []
 if ui.verbose:
-ui.write("changeset:   %d:%s\n" % (changerev, hg.hex(changenode)))
+ui.write("changeset:   %d:%s\n" % (rev, hg.hex(changenode)))
 else:
-ui.write("changeset:   %d:%s\n" % (changerev, hg.short(changenode)))
+ui.write("changeset:   %d:%s\n" % (rev, hg.short(changenode)))
 for tag in repo.nodetags(changenode):
 ui.status("tag:         %s\n" % tag)
 for parent in parents:
 ui.write("parent:      %d:%s\n" % parent)
-if filelog:
-ui.debug("file rev:    %d:%s\n" % (filerev, hg.hex(filenode)))
 if brinfo and changenode in brinfo:
 br = brinfo[changenode]
 ui.write("branch:      %s\n" % " ".join(br))
 hg.hex(changes[0])))
 ui.status("user:        %s\n" % changes[1])
 ui.status("date:        %s\n" % date)
 if ui.debugflag:
-files = repo.changes(changelog.parents(changenode)[0], changenode)
+files = repo.changes(log.parents(changenode)[0], changenode)
 for key, value in zip(["files:", "files+:", "files-:"], files):
 if value:
 ui.note("%-12s %s\n" % (key, " ".join(value)))
 else:
 ui.note("files:       %s\n" % " ".join(changes[3]))
 addremove(ui, repo, *pats, **opts)
 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']]
-fns, match = matchpats(repo, (pats and repo.getcwd()) or '', pats, opts)
+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 = []
 if opts['fullpath']:
 ui.write(os.path.join(repo.root, abs), end)
 else:
 ui.write(rel, end)
-def log(ui, repo, f=None, **opts):
+def log(ui, repo, *pats, **opts):
-"""show the revision history of the repository or a single file"""
+"""show revision history of entire repository or files"""
-if f:
+# This code most commonly needs to iterate backwards over the
-files = relpath(repo, [f])
+# history it is interested in.  This has awful (quadratic-looking)
-filelog = repo.file(files[0])
+# performance, so we use iterators that walk forwards through
-log = filelog
+# windows of revisions, yielding revisions in reverse order, while
-lookup = filelog.lookup
+# walking the windows backwards.
-else:
+files, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts)
-files = None
+revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
-filelog = None
+wanted = {}
-log = repo.changelog
+slowpath = anypats
-lookup = repo.lookup
+window = 300
-revlist = []
+if not slowpath and not files:
-revs = [log.rev(lookup(rev)) for rev in opts['rev']]
+# No files, no patterns.  Display all revs.
-while revs:
+wanted = dict(zip(revs, revs))
-if len(revs) == 1:
+if not slowpath:
-revlist.append(revs.pop(0))
+# Only files, no patterns.  Check the history of each file.
-else:
+def filerevgen(filelog):
-a = revs.pop(0)
+for i in xrange(filelog.count() - 1, 0, -window):
-b = revs.pop(0)
+revs = []
-off = a > b and -1 or 1
+for j in xrange(max(0, i - window), i):
-revlist.extend(range(a, b + off, off))
+revs.append(filelog.linkrev(filelog.node(j)))
+revs.reverse()
-for i in revlist or range(log.count() - 1, -1, -1):
+for rev in revs:
-show_changeset(ui, repo, filelog=filelog, rev=i)
+yield rev
+minrev, maxrev = min(revs), max(revs)
+for filelog in map(repo.file, files):
+# A zero count may be a directory or deleted file, so
+# try to find matching entries on the slow path.
+if filelog.count() == 0:
+slowpath = True
+break
+for rev in filerevgen(filelog):
+if rev <= maxrev:
+if rev < minrev: break
+wanted[rev] = 1
+if slowpath:
+# The slow path checks files modified in every changeset.
+def mfrevgen():
+for i in xrange(repo.changelog.count() - 1, 0, -window):
+for j in xrange(max(0, i - window), i):
+yield j, repo.changelog.read(repo.lookup(str(j)))[3]
+for rev, mf in mfrevgen():
+if filter(matchfn, mf):
+wanted[rev] = 1
+def changerevgen():
+class dui:
+# Implement and delegate some ui protocol.  Save hunks of
+# output for later display in the desired order.
+def __init__(self, ui):
+self.ui = ui
+self.hunk = {}
+def bump(self, rev):
+self.rev = rev
+self.hunk[rev] = []
+def status(self, *args):
+if not self.quiet: self.write(*args)
+def write(self, *args):
+self.hunk[self.rev].append(args)
+def __getattr__(self, key):
+return getattr(self.ui, key)
+for i in xrange(0, len(revs), window):
+nrevs = [rev for rev in revs[i : min(i + window, len(revs))]
+if rev in wanted]
+srevs = list(nrevs)
+srevs.sort()
+du = dui(ui)
+for rev in srevs:
+du.bump(rev)
+yield rev, du
+for rev in nrevs:
+for args in du.hunk[rev]:
+ui.write(*args)
+for rev, dui in changerevgen():
+show_changeset(dui, repo, rev)
 if opts['patch']:
-if filelog:
+changenode = repo.changelog.node(rev)
-filenode = filelog.node(i)
-i = filelog.linkrev(filenode)
-changenode = repo.changelog.node(i)
 prev, other = repo.changelog.parents(changenode)
-dodiff(sys.stdout, ui, repo, prev, changenode, files)
+dodiff(dui, dui, repo, prev, changenode, files)
-ui.write("\n\n")
+du.write("\n\n")
 def manifest(ui, repo, rev=None):
 """output the latest or given revision of the project manifest"""
 if rev:
 try:
 R = removed
 ? = not tracked
 '''
 cwd = repo.getcwd()
-files, matchfn = matchpats(repo, cwd, 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),
 ('I', 'include', [], 'include path in search'),
 ('X', 'exclude', [], 'exclude path from search')],
 'hg locate [OPTION]... [PATTERN]...'),
 "^log|history":
 (log,
-[('r', 'rev', [], 'revision'),
+[('I', 'include', [], 'include path in search'),
+('X', 'exclude', [], 'exclude path from search'),
+('r', 'rev', [], 'revision'),
 ('p', 'patch', None, 'show patch')],
 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
 "manifest": (manifest, [], 'hg manifest [REV]'),
 "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'),
 "parents": (parents, [], 'hg parents [REV]'),

changeset 1031	503aaf19a040
parent 1030	28e2f13ca7c4
child 1034	8dbbea5bc844