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

comparison mercurial/commands.py @ 2782:21e571c21a6b

Make log --follow without a file list follow a single head. This includes all the parents or children (depending on the direction of the revision range).

author	Brendan Cully <brendan@kublai.com>
date	Thu, 03 Aug 2006 11:06:09 -0700
parents	71029a3247cb
children	2e0cd25fe4ac

comparison

equal deleted inserted replaced

-:0327bd1c831c
+:21e571c21a6b
 if matches:
 fncache[rev] = matches
 wanted[rev] = 1
 def iterate():
+class followfilter:
+def __init__(self):
+self.startrev = -1
+self.roots = []
+def match(self, rev):
+def realparents(rev):
+return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
+if self.startrev == -1:
+self.startrev = rev
+return True
+if rev > self.startrev:
+# forward: all descendants
+if not self.roots:
+self.roots.append(self.startrev)
+for parent in realparents(rev):
+if parent in self.roots:
+self.roots.append(rev)
+return True
+else:
+# backwards: all parents
+if not self.roots:
+self.roots.extend(realparents(self.startrev))
+if rev in self.roots:
+self.roots.remove(rev)
+self.roots.extend(realparents(rev))
+return True
+return False
+if follow and not files:
+ff = followfilter()
+def want(rev):
+if rev not in wanted:
+return False
+return ff.match(rev)
+else:
+def want(rev):
+return rev in wanted
 for i, window in increasing_windows(0, len(revs)):
 yield 'window', revs[0] < revs[-1], revs[-1]
-nrevs = [rev for rev in revs[i:i+window]
+nrevs = [rev for rev in revs[i:i+window] if want(rev)]
-if rev in wanted]
 srevs = list(nrevs)
 srevs.sort()
 for rev in srevs:
 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
 yield 'add', rev, fns
 Print the revision history of the specified files or the entire
 project.
 File history is shown without following rename or copy history of
-files.  Use -f/--follow to follow history across renames and
+files.  Use -f/--follow with a file name to follow history across
-copies.
+renames and copies. --follow without a file name will only show
+ancestors or descendants of the starting revision.
 By default this command outputs: changeset id and hash, tags,
 non-trivial parents, user, date and time, and a summary for each
 commit. When the -v/--verbose switch is used, the list of changed
 files and full commit message is shown.
 _('hg locate [OPTION]... [PATTERN]...')),
 "^log|history":
 (log,
 [('b', 'branches', None, _('show branches')),
 ('f', 'follow', None,
-_('follow file history across copies and renames')),
+_('follow changeset history, or file history across copies and renames')),
 ('k', 'keyword', [], _('search for a keyword')),
 ('l', 'limit', '', _('limit number of changes displayed')),
 ('r', 'rev', [], _('show the specified revision or range')),
 ('M', 'no-merges', None, _('do not show merges')),
 ('', 'style', '', _('display using template map file')),

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 2782:21e571c21a6b