tests/test-glog.t

35554:99a25bde65a3

  > from mercurial import (
  >   cmdutil,
  >   commands,
  >   extensions,
  >   revsetlang,
  > )
  > 
  > def logrevset(repo, pats, opts):
  >     revs = cmdutil._logrevs(repo, opts)
  >     if not revs:

  >     return cmdutil._makelogrevset(repo, pats, opts, revs)[0]
  > 
  > def uisetup(ui):
  >     def printrevset(orig, ui, repo, *pats, **opts):
  >         if opts.get('print_revset'):
  >             expr = logrevset(repo, pats, opts)
  >             if expr:
  >                 tree = revsetlang.parse(expr)
  >                 tree = revsetlang.analyze(tree)
  >             else:
  >                 tree = []
  >             ui.write('%r\n' % (opts.get('rev', []),))
  >             ui.write(revsetlang.prettyformat(tree) + '\n')
  >             return 0
  >         return orig(ui, repo, *pats, **opts)
  >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
  >     entry[1].append(('', 'print-revset', False,
  >                      'print generated revset and exit (DEPRECATED)'))

glog always reorders nodes which explains the difference with log

  $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
  ['27', '25', '21', '34', '32', '31']
  []
  --- log.nodes	* (glob)
  +++ glog.nodes	* (glob)
  @@ -1,6 +1,6 @@
  -nodetag 27
  -nodetag 25

        (symbol 'user')
        (string 'test'))
      (func
        (symbol 'user')
        (string 'not-a-user'))))
  $ testlog -b not-a-branch
  abort: unknown revision 'not-a-branch'!
  abort: unknown revision 'not-a-branch'!
  abort: unknown revision 'not-a-branch'!
  $ testlog -b 35 -b 36 --only-branch branch

        (symbol 'branch')
        (string 'branch'))
      (func
        (symbol 'branch')
        (string 'branch'))))
  $ testlog -k expand -k merge
  []
  (or
    (list
      (func
        (symbol 'keyword')
        (string 'expand'))
      (func
        (symbol 'keyword')
        (string 'merge'))))
  $ testlog --only-merges
  []
  (func
    (symbol 'merge')
    None)
  $ testlog --no-merges
  []
  (not
    (func
      (symbol 'merge')
      None))
  $ testlog --date '2 0 to 4 0'
  []
  (func
    (symbol 'date')
    (string '2 0 to 4 0'))
  $ hg log -G -d 'brace ) in a date'
  hg: parse error: invalid date: 'brace ) in a date'
  [255]
  $ testlog --prune 31 --prune 32
  []

        (list
          (string '32')
          (func
            (symbol 'ancestors')
            (string '32'))))))

Dedicated repo for --follow and paths filtering. The g is crafted to
have 2 filelog topological heads in a linear changeset graph.

  $ cd ..
  $ hg init follow
  $ cd follow
  $ testlog --follow
  []
  []
  $ testlog -rnull
  ['null']
  []
  $ echo a > a
  $ echo aa > aa
  $ echo f > f
  $ hg ci -Am "add a" a aa f
  $ hg cp a b

  $ testlog a
  []
  (func
    (symbol 'filelog')
    (string 'a'))
  $ testlog a b
  []
  (or
    (list
      (func
        (symbol 'filelog')
        (string 'a'))
      (func
        (symbol 'filelog')
        (string 'b'))))

Test falling back to slow path for non-existing files

  $ testlog a c
  []

    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:a')
      (string 'p:c')))

Test multiple --include/--exclude/paths

  $ testlog --include a --include e --exclude b --exclude e a e
  []

      (string 'p:e')
      (string 'i:a')
      (string 'i:e')
      (string 'x:b')
      (string 'x:e')))

Test glob expansion of pats

  $ expandglobs=`$PYTHON -c "import mercurial.util; \
  >   print(mercurial.util.expandglobs and 'true' or 'false')"`

  > fi;
  []
  (func
    (symbol 'filelog')
    (string 'aa'))

Test --follow on a non-existent directory

  $ testlog -f dir
  abort: cannot follow file not in parent revision: "dir"

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:dir'))))
  $ hg up -q tip

Test --follow on file not in parent revision

  $ testlog -f a

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:glob:*'))))

Test --follow on a single rename

  $ hg up -q 2
  $ testlog -f a
  []
  (func
    (symbol 'follow')
    (string 'a'))

Test --follow and multiple renames

  $ hg up -q tip
  $ testlog -f e
  []
  (func
    (symbol 'follow')
    (string 'e'))

Test --follow and multiple filelog heads

  $ hg up -q 2
  $ testlog -f g
  []
  (func
    (symbol 'follow')
    (string 'g'))
  $ cat log.nodes
  nodetag 2
  nodetag 1
  nodetag 0
  $ hg up -q tip
  $ testlog -f g
  []
  (func
    (symbol 'follow')
    (string 'g'))
  $ cat log.nodes
  nodetag 3
  nodetag 2
  nodetag 0

        (symbol 'follow')
        (string 'g'))
      (func
        (symbol 'follow')
        (string 'e'))))
  $ cat log.nodes
  nodetag 4
  nodetag 3
  nodetag 2
  nodetag 1

  $ hg up -q null
  $ testlog -f
  []
  []

Test --follow-first

  $ hg up -q 3
  $ echo ee > e

  (func
    (symbol '_firstancestors')
    (func
      (symbol 'rev')
      (symbol '6')))

Cannot compare with log --follow-first FILE as it never worked

  $ hg log -G --print-revset --follow-first e
  []
  (func
    (symbol '_followfirst')
    (string 'e'))
  $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
  @    6 merge 5 and 4
  |\
  | ~
  o  5 add another e

    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:set:copied()')))
  $ testlog --include "set:copied()"
  []
  (func
    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'i:set:copied()')))
  $ testlog -r "sort(file('set:copied()'), -rev)"
  ["sort(file('set:copied()'), -rev)"]
  []

Test --removed

  $ testlog --removed
  []
  []
  $ testlog --removed a
  []
  (func
    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:a')))
  $ testlog --removed --follow a
  []
  (and
    (func
      (symbol 'ancestors')

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:a'))))

Test --patch and --stat with --follow and --follow-first

  $ hg up -q 3
  $ hg log -G --git --patch b

  $ hg tag 'foo-bar'
  $ testlog -r 'foo-bar'
  ['foo-bar']
  []

Test --follow and forward --rev

  $ hg up -q 6
  $ echo g > g

  (func
    (symbol 'descendants')
    (func
      (symbol 'rev')
      (symbol '6')))

Test --follow-first and forward --rev

  $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
  ['6', '8', '5', '7', '4']
  (func
    (symbol '_firstdescendants')
    (func
      (symbol 'rev')
      (symbol '6')))
  --- log.nodes	* (glob)
  +++ glog.nodes	* (glob)
  @@ -1,3 +1,3 @@
  -nodetag 6
   nodetag 8

  (func
    (symbol 'ancestors')
    (func
      (symbol 'rev')
      (symbol '6')))

Test --follow-first and backward --rev

  $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
  ['6', '5', '7', '8', '4']
  (func
    (symbol '_firstancestors')
    (func
      (symbol 'rev')
      (symbol '6')))

Test --follow with --rev of graphlog extension

  $ hg --config extensions.graphlog= glog -qfr1
  o  1:216d4c92cf98

    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:.')))
  $ testlog ../b
  []
  (func
    (symbol 'filelog')
    (string '../b'))
  $ testlog -f ../b
  []
  (func
    (symbol 'follow')
    (string 'b'))
  $ cd ..

Test --hidden
 (enable obsolete)

  $ hg debugobsolete `hg id --debug -i -r 8`
  obsoleted 1 changesets
  $ testlog
  []
  []
  $ testlog --hidden
  []
  []
  $ hg log -G --template '{rev} {desc}\n'
  o  7 Added tag foo-bar for changeset fc281d8ff18d
  |
  o    6 merge 5 and 4
  |\

35555:d984d9b3411e

  > from mercurial import (
  >   cmdutil,
  >   commands,
  >   extensions,
  >   revsetlang,
  >   smartset,
  > )
  > 
  > def logrevset(repo, pats, opts):
  >     revs = cmdutil._logrevs(repo, opts)
  >     if not revs:

  >     return cmdutil._makelogrevset(repo, pats, opts, revs)[0]
  > 
  > def uisetup(ui):
  >     def printrevset(orig, ui, repo, *pats, **opts):
  >         if opts.get('print_revset'):
  >             revs = cmdutil.getlogrevs(repo, pats, opts)[0]
  >             expr = logrevset(repo, pats, opts)
  >             if expr:
  >                 tree = revsetlang.parse(expr)
  >                 tree = revsetlang.analyze(tree)
  >             else:
  >                 tree = []
  >             ui.write('%r\n' % (opts.get('rev', []),))
  >             ui.write(revsetlang.prettyformat(tree) + '\n')
  >             ui.write(smartset.prettyformat(revs) + '\n')
  >             return 0
  >         return orig(ui, repo, *pats, **opts)
  >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
  >     entry[1].append(('', 'print-revset', False,
  >                      'print generated revset and exit (DEPRECATED)'))

glog always reorders nodes which explains the difference with log

  $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
  ['27', '25', '21', '34', '32', '31']
  []
  <baseset- [21, 25, 27, 31, 32, 34]>
  --- log.nodes	* (glob)
  +++ glog.nodes	* (glob)
  @@ -1,6 +1,6 @@
  -nodetag 27
  -nodetag 25

        (symbol 'user')
        (string 'test'))
      (func
        (symbol 'user')
        (string 'not-a-user'))))
  <filteredset
    <spanset- 0:37>,
    <addset
      <filteredset
        <fullreposet+ 0:37>,
        <user 'test'>>,
      <filteredset
        <fullreposet+ 0:37>,
        <user 'not-a-user'>>>>
  $ testlog -b not-a-branch
  abort: unknown revision 'not-a-branch'!
  abort: unknown revision 'not-a-branch'!
  abort: unknown revision 'not-a-branch'!
  $ testlog -b 35 -b 36 --only-branch branch

        (symbol 'branch')
        (string 'branch'))
      (func
        (symbol 'branch')
        (string 'branch'))))
  <filteredset
    <spanset- 0:37>,
    <addset
      <filteredset
        <fullreposet+ 0:37>,
        <branch 'default'>>,
      <addset
        <filteredset
          <fullreposet+ 0:37>,
          <branch 'branch'>>,
        <filteredset
          <fullreposet+ 0:37>,
          <branch 'branch'>>>>>
  $ testlog -k expand -k merge
  []
  (or
    (list
      (func
        (symbol 'keyword')
        (string 'expand'))
      (func
        (symbol 'keyword')
        (string 'merge'))))
  <filteredset
    <spanset- 0:37>,
    <addset
      <filteredset
        <fullreposet+ 0:37>,
        <keyword 'expand'>>,
      <filteredset
        <fullreposet+ 0:37>,
        <keyword 'merge'>>>>
  $ testlog --only-merges
  []
  (func
    (symbol 'merge')
    None)
  <filteredset
    <spanset- 0:37>,
    <merge>>
  $ testlog --no-merges
  []
  (not
    (func
      (symbol 'merge')
      None))
  <filteredset
    <spanset- 0:37>,
    <not
      <filteredset
        <spanset- 0:37>,
        <merge>>>>
  $ testlog --date '2 0 to 4 0'
  []
  (func
    (symbol 'date')
    (string '2 0 to 4 0'))
  <filteredset
    <spanset- 0:37>,
    <date '2 0 to 4 0'>>
  $ hg log -G -d 'brace ) in a date'
  hg: parse error: invalid date: 'brace ) in a date'
  [255]
  $ testlog --prune 31 --prune 32
  []

        (list
          (string '32')
          (func
            (symbol 'ancestors')
            (string '32'))))))
  <filteredset
    <filteredset
      <spanset- 0:37>,
      <not
        <addset
          <baseset [31]>,
          <filteredset
            <spanset- 0:37>,
            <generatorsetdesc+>>>>>,
    <not
      <addset
        <baseset [32]>,
        <filteredset
          <spanset- 0:37>,
          <generatorsetdesc+>>>>>

Dedicated repo for --follow and paths filtering. The g is crafted to
have 2 filelog topological heads in a linear changeset graph.

  $ cd ..
  $ hg init follow
  $ cd follow
  $ testlog --follow
  []
  []
  <baseset []>
  $ testlog -rnull
  ['null']
  []
  <baseset [-1]>
  $ echo a > a
  $ echo aa > aa
  $ echo f > f
  $ hg ci -Am "add a" a aa f
  $ hg cp a b

  $ testlog a
  []
  (func
    (symbol 'filelog')
    (string 'a'))
  <filteredset
    <spanset- 0:5>, set([0])>
  $ testlog a b
  []
  (or
    (list
      (func
        (symbol 'filelog')
        (string 'a'))
      (func
        (symbol 'filelog')
        (string 'b'))))
  <filteredset
    <spanset- 0:5>,
    <addset
      <baseset+ [0]>,
      <baseset+ [1]>>>

Test falling back to slow path for non-existing files

  $ testlog a c
  []

    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:a')
      (string 'p:c')))
  <filteredset
    <spanset- 0:5>,
    <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=None>>

Test multiple --include/--exclude/paths

  $ testlog --include a --include e --exclude b --exclude e a e
  []

      (string 'p:e')
      (string 'i:a')
      (string 'i:e')
      (string 'x:b')
      (string 'x:e')))
  <filteredset
    <spanset- 0:5>,
    <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=None>>

Test glob expansion of pats

  $ expandglobs=`$PYTHON -c "import mercurial.util; \
  >   print(mercurial.util.expandglobs and 'true' or 'false')"`

  > fi;
  []
  (func
    (symbol 'filelog')
    (string 'aa'))
  <filteredset
    <spanset- 0:5>, set([0])>

Test --follow on a non-existent directory

  $ testlog -f dir
  abort: cannot follow file not in parent revision: "dir"

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:dir'))))
  <filteredset
    <filteredset
      <spanset- 0:4>,
      <generatorsetdesc+>>,
    <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>>
  $ hg up -q tip

Test --follow on file not in parent revision

  $ testlog -f a

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:glob:*'))))
  <filteredset
    <filteredset
      <spanset- 0:5>,
      <generatorsetdesc+>>,
    <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>>

Test --follow on a single rename

  $ hg up -q 2
  $ testlog -f a
  []
  (func
    (symbol 'follow')
    (string 'a'))
  <filteredset
    <spanset- 0:3>,
    <generatorsetdesc+>>

Test --follow and multiple renames

  $ hg up -q tip
  $ testlog -f e
  []
  (func
    (symbol 'follow')
    (string 'e'))
  <filteredset
    <spanset- 0:5>,
    <generatorsetdesc+>>

Test --follow and multiple filelog heads

  $ hg up -q 2
  $ testlog -f g
  []
  (func
    (symbol 'follow')
    (string 'g'))
  <filteredset
    <spanset- 0:3>,
    <generatorsetdesc+>>
  $ cat log.nodes
  nodetag 2
  nodetag 1
  nodetag 0
  $ hg up -q tip
  $ testlog -f g
  []
  (func
    (symbol 'follow')
    (string 'g'))
  <filteredset
    <spanset- 0:5>,
    <generatorsetdesc+>>
  $ cat log.nodes
  nodetag 3
  nodetag 2
  nodetag 0

        (symbol 'follow')
        (string 'g'))
      (func
        (symbol 'follow')
        (string 'e'))))
  <filteredset
    <spanset- 0:5>,
    <addset
      <generatorsetdesc+>,
      <generatorsetdesc+>>>
  $ cat log.nodes
  nodetag 4
  nodetag 3
  nodetag 2
  nodetag 1

  $ hg up -q null
  $ testlog -f
  []
  []
  <baseset []>

Test --follow-first

  $ hg up -q 3
  $ echo ee > e

  (func
    (symbol '_firstancestors')
    (func
      (symbol 'rev')
      (symbol '6')))
  <filteredset
    <spanset- 0:7>,
    <generatorsetdesc+>>

Cannot compare with log --follow-first FILE as it never worked

  $ hg log -G --print-revset --follow-first e
  []
  (func
    (symbol '_followfirst')
    (string 'e'))
  <filteredset
    <spanset- 0:7>,
    <generatorsetdesc+>>
  $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
  @    6 merge 5 and 4
  |\
  | ~
  o  5 add another e

    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:set:copied()')))
  <filteredset
    <spanset- 0:7>,
    <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=None>>
  $ testlog --include "set:copied()"
  []
  (func
    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'i:set:copied()')))
  <filteredset
    <spanset- 0:7>,
    <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=None>>
  $ testlog -r "sort(file('set:copied()'), -rev)"
  ["sort(file('set:copied()'), -rev)"]
  []
  <baseset []>

Test --removed

  $ testlog --removed
  []
  []
  <spanset- 0:7>
  $ testlog --removed a
  []
  (func
    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:a')))
  <filteredset
    <spanset- 0:7>,
    <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>>
  $ testlog --removed --follow a
  []
  (and
    (func
      (symbol 'ancestors')

      (symbol '_matchfiles')
      (list
        (string 'r:')
        (string 'd:relpath')
        (string 'p:a'))))
  <filteredset
    <filteredset
      <spanset- 0:5>,
      <generatorsetdesc+>>,
    <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>>

Test --patch and --stat with --follow and --follow-first

  $ hg up -q 3
  $ hg log -G --git --patch b

  $ hg tag 'foo-bar'
  $ testlog -r 'foo-bar'
  ['foo-bar']
  []
  <baseset [6]>

Test --follow and forward --rev

  $ hg up -q 6
  $ echo g > g

  (func
    (symbol 'descendants')
    (func
      (symbol 'rev')
      (symbol '6')))
  <filteredset
    <baseset- [4, 5, 6, 7, 8]>,
    <generatorsetasc+>>

Test --follow-first and forward --rev

  $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
  ['6', '8', '5', '7', '4']
  (func
    (symbol '_firstdescendants')
    (func
      (symbol 'rev')
      (symbol '6')))
  <filteredset
    <baseset- [4, 5, 6, 7, 8]>,
    <generatorsetasc+>>
  --- log.nodes	* (glob)
  +++ glog.nodes	* (glob)
  @@ -1,3 +1,3 @@
  -nodetag 6
   nodetag 8

  (func
    (symbol 'ancestors')
    (func
      (symbol 'rev')
      (symbol '6')))
  <filteredset
    <baseset- [4, 5, 6, 7, 8]>,
    <generatorsetdesc+>>

Test --follow-first and backward --rev

  $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
  ['6', '5', '7', '8', '4']
  (func
    (symbol '_firstancestors')
    (func
      (symbol 'rev')
      (symbol '6')))
  <filteredset
    <baseset- [4, 5, 6, 7, 8]>,
    <generatorsetdesc+>>

Test --follow with --rev of graphlog extension

  $ hg --config extensions.graphlog= glog -qfr1
  o  1:216d4c92cf98

    (symbol '_matchfiles')
    (list
      (string 'r:')
      (string 'd:relpath')
      (string 'p:.')))
  <filteredset
    <spanset- 0:9>,
    <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=None>>
  $ testlog ../b
  []
  (func
    (symbol 'filelog')
    (string '../b'))
  <filteredset
    <spanset- 0:9>, set([1])>
  $ testlog -f ../b
  []
  (func
    (symbol 'follow')
    (string 'b'))
  <filteredset
    <spanset- 0:4>,
    <generatorsetdesc+>>
  $ cd ..

Test --hidden
 (enable obsolete)

  $ hg debugobsolete `hg id --debug -i -r 8`
  obsoleted 1 changesets
  $ testlog
  []
  []
  <spanset- 0:9>
  $ testlog --hidden
  []
  []
  <spanset- 0:9>
  $ hg log -G --template '{rev} {desc}\n'
  o  7 Added tag foo-bar for changeset fc281d8ff18d
  |
  o    6 merge 5 and 4
  |\