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

equal deleted inserted replaced

-:3bab1fc0ab75
+:23f7d9621783
 except IOError, inst:
 raise util.Abort(_("can't read commit message '%s': %s") %
 (logfile, inst.strerror))
 return message
-def walkchangerevs(ui, repo, pats, opts):
+def walkchangerevs(ui, repo, pats, change, 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.
 We walk a window of revisions in the desired order.  Within the
 window, we first walk forwards to gather data, then in the desired
 order (usually backwards) to display it.
-This function returns an (iterator, getchange, matchfn) tuple.  The
+This function returns an (iterator, matchfn) tuple. The iterator
-getchange function returns the changelog entry for a numeric
+yields 3-tuples. They will be of one of the following forms:
-revision.  The iterator yields 3-tuples.  They will be of one of
-the following forms:
 "window", incrementing, lastrev: stepping through a window,
 positive if walking forwards through revs, last rev in the
 sequence iterated over - use to reset state for the current window
 yield start, min(windowsize, start-end-1)
 start -= windowsize
 if windowsize < sizelimit:
 windowsize *= 2
 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 follow = opts.get('follow') or opts.get('follow_first')
 if repo.changelog.count() == 0:
-return [], False, matchfn
+return [], matchfn
 if follow:
 defrange = '%s:0' % repo.changectx().rev()
 else:
 defrange = 'tip:0'
-revs = map(int, cmdutil.revrange(ui, repo, opts['rev'] or [defrange]))
+revs = cmdutil.revrange(ui, repo, opts['rev'] or [defrange])
 wanted = {}
 slowpath = anypats
 fncache = {}
-chcache = {}
-def getchange(rev):
-ch = chcache.get(rev)
-if ch is None:
-chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
-return ch
 if not slowpath and not files:
 # No files, no patterns.  Display all revs.
-wanted = dict(zip(revs, revs))
+wanted = dict.fromkeys(revs)
 copies = []
 if not slowpath:
 # Only files, no patterns.  Check the history of each file.
 def filerevgen(filelog, node):
 cl_count = repo.changelog.count()
 # The slow path checks files modified in every changeset.
 def changerevgen():
 for i, window in increasing_windows(repo.changelog.count()-1, -1):
 for j in xrange(i - window, i + 1):
-yield j, getchange(j)[3]
+yield j, change(j)[3]
 for rev, changefiles in changerevgen():
 matches = filter(matchfn, changefiles)
 if matches:
 fncache[rev] = matches
 for rev in opts.get('prune', ()):
 rev = repo.changelog.rev(repo.lookup(rev))
 ff = followfilter()
 stop = min(revs[0], revs[-1])
 for x in xrange(rev, stop-1, -1):
-if ff.match(x) and wanted.has_key(x):
+if ff.match(x) and x in wanted:
 del wanted[x]
 def iterate():
 if follow and not files:
 ff = followfilter(onlyfirst=opts.get('follow_first'))
 yield 'window', revs[0] < revs[-1], revs[-1]
 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
 srevs = list(nrevs)
 srevs.sort()
 for rev in srevs:
-fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
+fns = fncache.get(rev) or filter(matchfn, change(rev)[3])
 yield 'add', rev, fns
 for rev in nrevs:
 yield 'iter', rev, None
-return iterate(), getchange, matchfn
+return iterate(), matchfn
 def write_bundle(cg, filename=None, compress=True):
 """Write a bundle file and return its filename.
 Existing files will not be overwritten.
 finally:
 if fh is not None:
 fh.close()
 if cleanup is not None:
 os.unlink(cleanup)
-def trimuser(ui, name, rev, revcache):
-"""trim the name of the user who committed a change"""
-user = revcache.get(rev)
-if user is None:
-user = revcache[rev] = ui.shortuser(name)
-return user
 class changeset_printer(object):
 '''show changeset information when templating not requested.'''
 def __init__(self, ui, repo):
 With the --switch-parent option, the diff will be against the second
 parent. It can be useful to review a merge.
 """
 if not changesets:
 raise util.Abort(_("export requires at least one changeset"))
-revs = list(cmdutil.revrange(ui, repo, changesets))
+revs = cmdutil.revrange(ui, repo, changesets)
 if len(revs) > 1:
 ui.note(_('exporting patches:\n'))
 else:
 ui.note(_('exporting patch:\n'))
 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
 yield ('-', a[i])
 for i in xrange(blo, bhi):
 yield ('+', b[i])
 prev = {}
-ucache = {}
 def display(fn, rev, states, prevstates):
 counts = {'-': 0, '+': 0}
 filerevmatches = {}
 if incrementing or not opts['all']:
-a, b = prevstates, states
+a, b, r = prevstates, states, rev
 else:
-a, b = states, prevstates
+a, b, r = states, prevstates, prev.get(fn, -1)
 for change, l in difflinestates(a, b):
-if incrementing or not opts['all']:
-r = rev
-else:
-r = prev[fn]
 cols = [fn, str(r)]
 if opts['line_number']:
 cols.append(str(l.linenum))
 if opts['all']:
 cols.append(change)
 if opts['user']:
-cols.append(trimuser(ui, getchange(r)[1], rev,
+cols.append(ui.shortuser(getchange(r)[1]))
-ucache))
 if opts['files_with_matches']:
-c = (fn, rev)
+c = (fn, r)
 if c in filerevmatches:
 continue
 filerevmatches[c] = 1
 else:
 cols.append(l.line)
 counts[change] += 1
 return counts['+'], counts['-']
 fstate = {}
 skip = {}
-changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
+getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
+changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)
 count = 0
 incrementing = False
 follow = opts.get('follow')
 for st, rev, fns in changeiter:
 if st == 'window':
 incrementing = rev
 matches.clear()
 elif st == 'add':
-change = repo.changelog.read(repo.lookup(str(rev)))
+mf = repo.changectx(rev).manifest()
-mf = repo.manifest.read(change[0])
 matches[rev] = {}
 for fn in fns:
 if fn in skip:
 continue
 fstate.setdefault(fn, {})
 if self.debugflag:
 self.write(*args)
 def __getattr__(self, key):
 return getattr(self.ui, key)
-changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
+getchange = util.cachefunc(lambda r:repo.changectx(r).changeset())
+changeiter, matchfn = walkchangerevs(ui, repo, pats, getchange, opts)
 if opts['branches']:
 ui.warn(_("the --branches option is deprecated, "
 "please use 'hg branches' instead\n"))
 else:
 limit = sys.maxint
 count = 0
 if opts['copies'] and opts['rev']:
-endrev = max([int(i)
+endrev = max(cmdutil.revrange(ui, repo, opts['rev'])) + 1
-for i in cmdutil.revrange(ui, repo, opts['rev'])]) + 1
 else:
 endrev = repo.changelog.count()
 rcache = {}
 ncache = {}
 dcache = []

changeset 3568	23f7d9621783
parent 3550	eda9e7c9300d
parent 3562	730ca93ed788
child 3571	736a78469a85