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

equal deleted inserted replaced

-:2e0cd25fe4ac
+:12a7bfcafd8f
 if windowsize < sizelimit:
 windowsize *= 2
 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
 if follow:
 fncache[rev] = matches
 wanted[rev] = 1
 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
 return True
 return True
 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
 return ff.match(rev)
 else:
 project.
 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
 used as the starting revision.
 "^log|history":
 (log,
 [('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')),
 ('M', 'no-merges', None, _('do not show merges')),
 ('', 'style', '', _('display using template map file')),

changeset 2779	12a7bfcafd8f
parent 2778	2e0cd25fe4ac
child 2784	e3564699409c