Mercurial > hg
diff hgext/graphlog.py @ 16174:0a73c4bd9f47
graphlog: implement --follow-first
log --graph --follow-first FILE cannot be compared with the regular version
because it never worked: --follow-first is not taken in account in
walkchangerevs() fast path and is explicitely bypassed in FILE case in
walkchangerevs() nested iterate() function.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 25 Feb 2012 22:11:36 +0100 |
parents | 9178d284b880 |
children | 46a96cc830c2 |
line wrap: on
line diff
--- a/hgext/graphlog.py Sat Feb 25 22:11:36 2012 +0100 +++ b/hgext/graphlog.py Sat Feb 25 22:11:36 2012 +0100 @@ -237,7 +237,7 @@ return (len(repo) - 1, 0) def check_unsupported_flags(pats, opts): - for op in ["follow_first", "copies", "newest_first"]: + for op in ["copies", "newest_first"]: if op in opts and opts[op]: raise util.Abort(_("-G/--graph option is incompatible with --%s") % op.replace("_", "-")) @@ -246,18 +246,20 @@ """Return revset str built of revisions, log options and file patterns. """ opt2revset = { - 'follow': ('follow()', None), - 'no_merges': ('not merge()', None), - 'only_merges': ('merge()', None), - 'removed': ('removes("*")', None), - 'date': ('date(%(val)r)', None), - 'branch': ('branch(%(val)r)', ' or '), - '_patslog': ('filelog(%(val)r)', ' or '), - '_patsfollow': ('follow(%(val)r)', ' or '), - 'keyword': ('keyword(%(val)r)', ' or '), - 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), - 'user': ('user(%(val)r)', ' or '), - 'rev': ('%(val)s', ' or '), + 'follow': ('follow()', None), + 'follow_first': ('_followfirst()', None), + 'no_merges': ('not merge()', None), + 'only_merges': ('merge()', None), + 'removed': ('removes("*")', None), + 'date': ('date(%(val)r)', None), + 'branch': ('branch(%(val)r)', ' or '), + '_patslog': ('filelog(%(val)r)', ' or '), + '_patsfollow': ('follow(%(val)r)', ' or '), + '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), + 'keyword': ('keyword(%(val)r)', ' or '), + 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), + 'user': ('user(%(val)r)', ' or '), + 'rev': ('%(val)s', ' or '), } opts = dict(opts) @@ -266,9 +268,12 @@ if 'branch' in opts and 'only_branch' in opts: opts['branch'] = opts['branch'] + opts.pop('only_branch') - follow = opts.get('follow') + follow = opts.get('follow') or opts.get('follow_first') + followfirst = opts.get('follow_first') if 'follow' in opts: del opts['follow'] + if 'follow_first' in opts: + del opts['follow_first'] # pats/include/exclude are passed to match.match() directly in # _matchfile() revset but walkchangerevs() builds its matcher with # scmutil.match(). The difference is input pats are globbed on @@ -310,10 +315,16 @@ opts['rev'] = opts.get('rev', []) + ['_matchfiles(%s)' % matchargs] else: if follow: - if pats: - opts['_patsfollow'] = list(pats) + if followfirst: + if pats: + opts['_patsfollowfirst'] = list(pats) + else: + opts['follow_first'] = True else: - opts['follow'] = True + if pats: + opts['_patsfollow'] = list(pats) + else: + opts['follow'] = True else: opts['_patslog'] = list(pats)