view tests/test-merge2.t @ 35928:c8e2d6ed1f9e

cmdutil: drop aliases for logcmdutil functions (API)

.. api::

   Log-related utility functions has been renamed as follows:

    - cmdutil.loglimit -> logcmdutil.getlimit
    - cmdutil.diffordiffstat -> logcmdutil.diffordiffstat
    - cmdutil._changesetlabels -> logcmdutil.changesetlabels
    - cmdutil.changeset_printer -> logcmdutil.changesetprinter
    - cmdutil.jsonchangeset = logcmdutil.jsonchangeset
    - cmdutil.changeset_templater -> logcmdutil.changesettemplater
    - cmdutil.logtemplatespec -> logcmdutil.templatespec
    - cmdutil.makelogtemplater -> logcmdutil.maketemplater
    - cmdutil.show_changeset -> logcmdutil.changesetdisplayer
    - cmdutil.getlogrevs -> logcmdutil.getrevs
    - cmdutil.getloglinerangerevs -> logcmdutil.getlinerangerevs
    - cmdutil.displaygraph -> logcmdutil.displaygraph
    - cmdutil.graphlog -> logcmdutil.graphlog
    - cmdutil.checkunsupportedgraphflags -> logcmdutil.checkunsupportedgraphflags
    - cmdutil.graphrevs -> logcmdutil.graphrevs
    - cmdutil._makenofollowlogfilematcher -> logcmdutil._makenofollowfilematcher

  $ hg init t
  $ cd t
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ rm b
  $ hg update 0
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo This is file b2 > b
  $ hg add b
  $ hg commit -m "commit #2"
  created new head
  $ cd ..; rm -r t

  $ mkdir t
  $ cd t
  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ rm b
  $ hg update 0
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo This is file b2 > b
  $ hg commit -A -m "commit #2"
  adding b
  created new head
  $ cd ..; rm -r t

  $ hg init t
  $ cd t
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ rm b
  $ hg remove b
  $ hg update 0
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo This is file b2 > b
  $ hg commit -A -m "commit #2"
  adding b
  created new head

  $ cd ..