Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 26098:ce26928cbe41
spelling: behaviour -> behavior
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 28 Aug 2015 10:53:55 -0400 |
| parents | 3670efdc7088 |
| children | ab1c6e4efda4 |
comparison
equal
deleted
inserted
replaced
| 26097:220ee13946d3 | 26098:ce26928cbe41 |
|---|---|
| 1434 def _show(self, ctx, copies, matchfn, props): | 1434 def _show(self, ctx, copies, matchfn, props): |
| 1435 '''show a single changeset or file revision''' | 1435 '''show a single changeset or file revision''' |
| 1436 | 1436 |
| 1437 showlist = templatekw.showlist | 1437 showlist = templatekw.showlist |
| 1438 | 1438 |
| 1439 # showparents() behaviour depends on ui trace level which | 1439 # showparents() behavior depends on ui trace level which |
| 1440 # causes unexpected behaviours at templating level and makes | 1440 # causes unexpected behaviors at templating level and makes |
| 1441 # it harder to extract it in a standalone function. Its | 1441 # it harder to extract it in a standalone function. Its |
| 1442 # behaviour cannot be changed so leave it here for now. | 1442 # behavior cannot be changed so leave it here for now. |
| 1443 def showparents(**args): | 1443 def showparents(**args): |
| 1444 ctx = args['ctx'] | 1444 ctx = args['ctx'] |
| 1445 parents = [[('rev', p.rev()), | 1445 parents = [[('rev', p.rev()), |
| 1446 ('node', p.hex()), | 1446 ('node', p.hex()), |
| 1447 ('phase', p.phasestr())] | 1447 ('phase', p.phasestr())] |
| 1927 follow = opts.get('follow') or opts.get('follow_first') | 1927 follow = opts.get('follow') or opts.get('follow_first') |
| 1928 if opts.get('follow_first'): | 1928 if opts.get('follow_first'): |
| 1929 followfirst = 1 | 1929 followfirst = 1 |
| 1930 else: | 1930 else: |
| 1931 followfirst = 0 | 1931 followfirst = 0 |
| 1932 # --follow with FILE behaviour depends on revs... | 1932 # --follow with FILE behavior depends on revs... |
| 1933 it = iter(revs) | 1933 it = iter(revs) |
| 1934 startrev = it.next() | 1934 startrev = it.next() |
| 1935 followdescendants = startrev < next(it, startrev) | 1935 followdescendants = startrev < next(it, startrev) |
| 1936 | 1936 |
| 1937 # branch and only_branch are really aliases and must be handled at | 1937 # branch and only_branch are really aliases and must be handled at |
| 2048 else: | 2048 else: |
| 2049 expr = None | 2049 expr = None |
| 2050 return expr, filematcher | 2050 return expr, filematcher |
| 2051 | 2051 |
| 2052 def _logrevs(repo, opts): | 2052 def _logrevs(repo, opts): |
| 2053 # Default --rev value depends on --follow but --follow behaviour | 2053 # Default --rev value depends on --follow but --follow behavior |
| 2054 # depends on revisions resolved from --rev... | 2054 # depends on revisions resolved from --rev... |
| 2055 follow = opts.get('follow') or opts.get('follow_first') | 2055 follow = opts.get('follow') or opts.get('follow_first') |
| 2056 if opts.get('rev'): | 2056 if opts.get('rev'): |
| 2057 revs = scmutil.revrange(repo, opts['rev']) | 2057 revs = scmutil.revrange(repo, opts['rev']) |
| 2058 elif follow and repo.dirstate.p1() == nullid: | 2058 elif follow and repo.dirstate.p1() == nullid: |