Mercurial > hg > gitweb

changeset 2784:12a7bfcafd8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add log option --follow-first to follow only the first parent of merges. This can be useful to extract a single line of development.
author Brendan Cully <brendan@kublai.com>
date Thu, 03 Aug 2006 11:48:56 -0700
parents 2e0cd25fe4ac
children e7f70588af30
files mercurial/commands.py
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Aug 03 13:29:31 2006 -0700
+++ b/mercurial/commands.py	Thu Aug 03 11:48:56 2006 -0700
@@ -125,7 +125,7 @@
 
 
     files, matchfn, anypats = matchpats(repo, pats, opts)
-    follow = opts.get('follow')
+    follow = opts.get('follow') or opts.get('follow_first')
 
     if repo.changelog.count() == 0:
         return [], False, matchfn
@@ -217,13 +217,17 @@
 
     def iterate():
         class followfilter:
-            def __init__(self):
+            def __init__(self, onlyfirst=False):
                 self.startrev = -1
                 self.roots = []
+                self.onlyfirst = onlyfirst
 
             def match(self, rev):
                 def realparents(rev):
-                    return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
+                    if self.onlyfirst:
+                        return repo.changelog.parentrevs(rev)[0:1]
+                    else:
+                        return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
 
                 if self.startrev == -1:
                     self.startrev = rev
@@ -249,7 +253,7 @@
                 return False
 
         if follow and not files:
-            ff = followfilter()
+            ff = followfilter(onlyfirst=opts.get('follow_first'))
             def want(rev):
                 if rev not in wanted:
                     return False
@@ -2025,7 +2029,8 @@
     File history is shown without following rename or copy history of
     files.  Use -f/--follow with a file name to follow history across
     renames and copies. --follow without a file name will only show
-    ancestors or descendants of the starting revision.
+    ancestors or descendants of the starting revision. --follow-first
+    only follows the first parent of merge revisions.
 
     If no revision range is specified, the default is tip:0 unless
     --follow is set, in which case the working directory parent is
@@ -3144,6 +3149,8 @@
          [('b', 'branches', None, _('show branches')),
           ('f', 'follow', None,
            _('follow changeset history, or file history across copies and renames')),
+          ('', 'follow-first', None,
+           _('only follow the first parent of merge changesets')),
           ('k', 'keyword', [], _('search for a keyword')),
           ('l', 'limit', '', _('limit number of changes displayed')),
           ('r', 'rev', [], _('show the specified revision or range')),