view tests/test-cmdserver.t @ 6655:81fe0a498447 stable

topic: internal config option to fix hg pick behavior (issue6406)

After some consideration, hg pick was made to always use current topic (and
topic namespace), even if it's not set, in which case the resulting changeset
will not have any topic.

Previously the intended behavior was to only update topic if there was an
active topic, and not touch commit extras at all otherwise. That wasn't ideal,
since pick doesn't change active topic, and amending the just-picked commit
would unset its topic without clear user's intent to do so and to their
surprise.

#require no-rhg no-chg

XXX-RHG this test hangs if `hg` is really `rhg`. This was hidden by the use of
`alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed
buggy. This need to be resolved sooner than later.

XXX-CHG this test hangs if `hg` is really `chg`. This was hidden by the use of
`alias hg=chg` by run-tests.py. With such alias removed, this test is revealed
buggy. This need to be resolved sooner than later.

  $ . "$TESTDIR/testlib/topic_setup.sh"

#if windows
  $ PYTHONPATH="$RUNTESTDIR/../contrib;$PYTHONPATH"
#else
  $ PYTHONPATH="$RUNTESTDIR/../contrib:$PYTHONPATH"
#endif
  $ export PYTHONPATH

typical client does not want echo-back messages, so test without it:

  $ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new
  $ mv $HGRCPATH.new $HGRCPATH

  $ hg init repo
  $ cd repo

  $ touch a
  $ hg ci -Am 'a'
  adding a
  $ touch b
  $ hg ci -Am 'b'
  adding b
  $ touch c
  $ hg ci -Am 'c'
  adding c
  $ touch d
  $ hg ci -Am 'd'
  adding d

Ensure that topics are not left around for stale revisions.

  >>> from hgclient import check, readchannel, runcommand
  >>> @check
  ... def checkruncommand(server):
  ...     # hello block
  ...     readchannel(server)
  ... 
  ...     # Initial case
  ...     runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
  ... 
  ...     # first topic
  ...     runcommand(server, [b'topic', b'topic1', b'-r', b'.'])
  ... 
  ...     # Current state
  ...     runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
  ... 
  ...     # status quo ante
  ...     runcommand(server, [b'rollback', b'--config', b'ui.rollback=True'])
  ... 
  ...     # Current state
  ...     runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
  ... 
  ...     # second topic
  ...     runcommand(server, [b'topic', b'topic2', b'-r', b'(.^^)::'])
  ... 
  ...     # Current state
  ...     runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
  ... 
  ...     # status quo ante
  ...     runcommand(server, [b'rollback', b'--config', b'ui.rollback=True'])
  ... 
  ...     # Current state
  ...     runcommand(server, [b'log', b'-T', b'{rev} {desc} ({topic})\n'])
  *** runcommand log -T {rev} {desc} ({topic})
  
  3 d ()
  2 c ()
  1 b ()
  0 a ()
  *** runcommand topic topic1 -r .
  switching to topic topic1
  changed topic on 1 changesets to "topic1"
  *** runcommand log -T {rev} {desc} ({topic})
  
  4 d (topic1)
  2 c ()
  1 b ()
  0 a ()
  *** runcommand rollback --config ui.rollback=True
  repository tip rolled back to revision 3 (undo rewrite-topics)
  working directory now based on revision 3
  *** runcommand log -T {rev} {desc} ({topic})
  
  3 d ()
  2 c ()
  1 b ()
  0 a ()
  *** runcommand topic topic2 -r (.^^)::
  switching to topic topic2
  changed topic on 3 changesets to "topic2"
  *** runcommand log -T {rev} {desc} ({topic})
  
  6 d (topic2)
  5 c (topic2)
  4 b (topic2)
  0 a ()
  *** runcommand rollback --config ui.rollback=True
  repository tip rolled back to revision 3 (undo rewrite-topics)
  working directory now based on revision 3
  *** runcommand log -T {rev} {desc} ({topic})
  
  3 d ()
  2 c ()
  1 b ()
  0 a ()