view contrib/hammerclient.py @ 4241:df22f010cf24

next: make next command --evolve by default

Before this patch, if we need to evolve to update to the next child,
we were suggesting the user to use --evolve flag. This patch make some
changes to evolve by default in that conditions.

After making next command to evolve by default we have to consider
the following points:

1) If we don't need to evolve while updating to the next child:

  a) And if wdir is dirty, we suggest to use --merge flag
  b) if wdir is clean, we simply update to next child (if ambiguous,
     prompt the user to select one)

2) If we need to evolve:

  a) when wdir is dirty, we suggest the user to use `hg shelve` first,
     to make wdir clean. As we don't support --merge while evovling.
  b) when wdir is clean, we evolve the next cset.

Changes made in test-prev-next.t reflect the changed behaviour.

#!/usr/bin/env python
import os
import sys
import subprocess

if len(sys.argv) < 2:
    execname = os.path.basename(sys.argv[0])
    print >> sys.stderr, "usage: %s CLIENT_ID" % execname

client_id = sys.argv[1]

subprocess.check_call(['hg', 'branch', "--force", "hammer-branch-%s" % client_id])

while True:
    subprocess.check_call([
        'hg', 'commit',
        "--config", "ui.allowemptycommit=yes",
        "--message", "hammer-%s" % client_id,
    ])
    nodeid = subprocess.check_output([
        'hg', 'log', '--rev', '.', '--template', '{node}'
    ])
    subprocess.check_call([
        'hg', 'debugobsolete', ''.join(reversed(nodeid)), nodeid
    ])
    subprocess.check_call(['hg', 'pull'])
    subprocess.check_call(['hg', 'push', '--force'])