merge with stable

hgext/record.py

@@ -42,7 +42,8 b' def record(ui, repo, *pats, **opts):'
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
-    You will be prompted for whether to record changes to each
+    If using the text interface (see :hg:`help config`),
+    you will be prompted for whether to record changes to each
     modified file, and for files with multiple changes, for each
     change to use. For each query, the following responses are
     possible::

mercurial/ui.py

@@ -70,7 +70,7 b' default = %s'
 # path aliases to other clones of this repo in URLs or filesystem paths
 # (see 'hg help config.paths' for more info)
 #
-# default-push = ssh://[e-mail]/hg/jdoes-fork
+# default:pushurl = ssh://[e-mail]/hg/jdoes-fork
 # my-fork      = ssh://[e-mail]/hg/jdoes-fork
 # my-clone     = /home/jdoe/jdoes-clone
 
@@ -86,7 +86,7 b' default = %s'
 # (see 'hg help config.paths' for more info)
 #
 # default      = http://example.com/hg/example-repo
-# default-push = ssh://[e-mail]/hg/jdoes-fork
+# default:pushurl = ssh://[e-mail]/hg/jdoes-fork
 # my-fork      = ssh://[e-mail]/hg/jdoes-fork
 # my-clone     = /home/jdoe/jdoes-clone
 

mercurial/worker.py

@@ -120,7 +120,10 b' def _posixworker(ui, func, staticargs, a'
                         break
                     else:
                         raise
-            if p:
+            if not p:
+                # skip subsequent steps, because child process should
+                # be still running in this case
+                continue
                 pids.discard(p)
                 st = _exitstatus(st)
             if st and not problem[0]:
@@ -145,12 +148,16 b' def _posixworker(ui, func, staticargs, a'
             # may do some clean-ups which could cause surprises like deadlock.
             # see sshpeer.cleanup for example.
             try:
+                try:
                 scmutil.callcatch(ui, workerfunc)
+                finally:
+                    ui.flush()
             except KeyboardInterrupt:
                 os._exit(255)
             except: # never return, therefore no re-raises
                 try:
                     ui.traceback()
+                    ui.flush()
                 finally:
                     os._exit(255)
             else:

tests/test-hgrc.t

@@ -35,7 +35,7 b" Issue1199: Can't use '%' in hgrc (eg url"
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   

tests/test-pull-http.t

@@ -33,7 +33,7 b' Cloning with a password in the URL shoul'
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   

tests/test-qrecord.t

@@ -39,9 +39,10 b' help record (record)'
   
       See 'hg help dates' for a list of formats valid for -d/--date.
   
-      You will be prompted for whether to record changes to each modified file,
-      and for files with multiple changes, for each change to use. For each
-      query, the following responses are possible:
+      If using the text interface (see 'hg help config'), you will be prompted
+      for whether to record changes to each modified file, and for files with
+      multiple changes, for each change to use. For each query, the following
+      responses are possible:
   
         y - record this change
         n - skip this change

tests/test-record.t

@@ -22,9 +22,10 b' Record help'
   
       See 'hg help dates' for a list of formats valid for -d/--date.
   
-      You will be prompted for whether to record changes to each modified file,
-      and for files with multiple changes, for each change to use. For each
-      query, the following responses are possible:
+      If using the text interface (see 'hg help config'), you will be prompted
+      for whether to record changes to each modified file, and for files with
+      multiple changes, for each change to use. For each query, the following
+      responses are possible:
   
         y - record this change
         n - skip this change

tests/test-revset-outgoing.t

@@ -43,7 +43,7 b''
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   
@@ -95,7 +95,7 b''
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   

tests/test-simple-update.t

@@ -56,3 +56,38 b' update to rev 0 with a date'
   [255]
 
   $ cd ..
+
+update with worker processes
+
+#if no-windows
+
+  $ cat <<EOF > forceworker.py
+  > from mercurial import extensions, worker
+  > def nocost(orig, ui, costperop, nops):
+  >     return worker._numworkers(ui) > 1
+  > def uisetup(ui):
+  >     extensions.wrapfunction(worker, 'worthwhile', nocost)
+  > EOF
+
+  $ hg init worker
+  $ cd worker
+  $ cat <<EOF >> .hg/hgrc
+  > [extensions]
+  > forceworker = $TESTTMP/forceworker.py
+  > [worker]
+  > numcpus = 4
+  > EOF
+  $ for i in `python $TESTDIR/seq.py 1 100`; do
+  >   echo $i > $i
+  > done
+  $ hg ci -qAm 'add 100 files'
+
+  $ hg update null
+  0 files updated, 0 files merged, 100 files removed, 0 files unresolved
+  $ hg update -v | grep 100
+  getting 100
+  100 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ cd ..
+
+#endif

tests/test-subrepo-deep-nested-change.t

@@ -134,7 +134,7 b' Largefiles is NOT enabled in the clone i'
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   
@@ -695,7 +695,7 b' The local repo enables largefiles if a l'
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone
   

tests/test-url-rev.t

@@ -48,7 +48,7 b' Test basic functionality of url#rev synt'
   # path aliases to other clones of this repo in URLs or filesystem paths
   # (see 'hg help config.paths' for more info)
   #
-  # default-push = ssh://[e-mail]/hg/jdoes-fork
+  # default:pushurl = ssh://[e-mail]/hg/jdoes-fork
   # my-fork      = ssh://[e-mail]/hg/jdoes-fork
   # my-clone     = /home/jdoe/jdoes-clone