Mercury equivalent of "cvs -nq update"

Question

For those unfamiliar with CVS, cvs -nq update shows something like this.

 $ cvs -nq update M file_changed_locally.c U file_changed_remotely.c C file_with_conflicts.c ? untracked_file.c 

I know that I can use hg status to get locally modified files and hg incoming to display lists of changes that still need to be pulled, but is there a way to get a report like the one above that combines local and remote changes in the file level?

A valid (but worse) substitute is one that shows the corresponding data between hg pull and hg update .

Answer 1

Here is what I ended up with:

 $ hg pull && hg status --rev .: 

It lists the files that will be affected by hg update .

Answer 2

hg summary --remote will give an overview of your repo compared to the parent of your working copy and the default paths for incoming / outgoing changes.

It will show something like:

 parent: 14344:e1db8a00188b tip win32.py: more explicit definition of _STD_ERROR_HANDLE branch: default commit: 1 modified update: (current) remote: 1 or more incoming mq: 1 unapplied 

However, it does not provide a list of files.

Answer 3

Although there is no single command for this, you can add two commands on the command line or use a batch file / shell script.

If you have access to GNU utilities, you can add Tim's answer with hg st :

> hg st; hg summary --remote

which gives you something like this:

If you have a Windows CMD, you can use this to get very similar results:

> hg st & hg summary --remote