Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/parallel into HEAD

Conflicts:
	doc/release_new_version

doc/release_new_version

@@ -226,9 +226,9 @@ cc:Tim Cuthbertson <tim3d.junk@gmail.com>,
    Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>,
    Jesse Alama <jesse.alama@gmail.com>
 
-Subject: GNU Parallel 20141222 ('') released
+Subject: GNU Parallel 20141222 ('Manila') released
 
-GNU Parallel 20141222 ('') has been released. It is available for download at: http://ftp.gnu.org/gnu/parallel/
+GNU Parallel 20141222 ('Manila') has been released. It is available for download at: http://ftp.gnu.org/gnu/parallel/
 
 Haiku of the month:
 
@@ -238,6 +238,18 @@ New in this release:
 
 * GNU Parallel was cited in: Parallel post-processing with MPI-Bash http://dl.acm.org/citation.cfm?id=2691137
 
+* A semibig refactoring of big functions. All non-trivial functions are now less than 100 lines. The refactoring makes this release beta quality.
+
+* GNU Parallel was cited in: Parallel post-processing with MPI-Bash http://dl.acm.org/citation.cfm?id=2691137
+
+* GNU Parallel was cited in: Distinguishing cause from effect using observational data: methods and benchmarks http://arxiv-web3.library.cornell.edu/pdf/1412.3773.pdf
+
+* GNU Parallel was cited in: Bayesian Inference of Protein Structure from Chemical Shift Data https://peerj.com/preprints/692.pdf
+
+* GNU Parallel: Open Source For You (OSFY) magazine, October 2013 edition http://www.shakthimaan.com/posts/2014/11/27/gnu-parallel/news.html
+
+* コマンドを並列に実行するGNU parallelがとても便利 http://bicycle1885.hatenablog.com/entry/2014/08/10/143612
+
 * Bug fixes and man page updates.
 
 GNU Parallel - For people who live life in the parallel lane.

src/Makefile.in

@@ -78,7 +78,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

src/parallel.pod

@@ -3058,7 +3058,7 @@ To submit your jobs to the queue:
 You can of course use B<-S> to distribute the jobs to remote
 computers:
 
-  true >jobqueue; tail -f jobqueue | parallel -S ..
+  true >jobqueue; tail -n+0 -f jobqueue | parallel -S ..
 
 There is a a small issue when using GNU B<parallel> as queue
 system/batch manager: You have to submit JobSlot number of jobs before

src/parallel_tutorial.1

@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PARALLEL_TUTORIAL 1"
-.TH PARALLEL_TUTORIAL 1 "2014-11-10" "20141022" "parallel"
+.TH PARALLEL_TUTORIAL 1 "2014-11-26" "20141122" "parallel"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

testsuite/tests-to-run/parallel-local-0.3s.sh

@@ -23,11 +23,42 @@ echo '### Test bug #43284: {%} and {#} with --xapply';
 echo '**'
 
 echo '### Test bug #43376: {%} and {#} with --pipe'
-echo foo | parallel -q --pipe -k echo {#}
+  echo foo | parallel -q --pipe -k echo {#}
-echo foo | parallel --pipe -k echo {%}
+  echo foo | parallel --pipe -k echo {%}
-echo foo | parallel -q --pipe -k echo {%}
+  echo foo | parallel -q --pipe -k echo {%}
-echo foo | parallel --pipe -k echo {#}
+  echo foo | parallel --pipe -k echo {#}
 
 echo '**'
 
+echo '### {= and =} in different groups separated by space'
+  parallel echo {= s/a/b/ =} ::: a
+  parallel echo {= s/a/b/=} ::: a
+  parallel echo {= s/a/b/=}{= s/a/b/=} ::: a
+  parallel echo {= s/a/b/=}{=s/a/b/=} ::: a
+  parallel echo {= s/a/b/=}{= {= s/a/b/=} ::: a
+  parallel echo {= s/a/b/=}{={=s/a/b/=} ::: a
+  parallel echo {= s/a/b/ =} {={==} ::: a
+  parallel echo {={= =} ::: a
+  parallel echo {= {= =} ::: a
+  parallel echo {= {= =} =} ::: a
+
+echo '**'
+
+echo '### {} as part of the command'
+  echo p /bin/ls | parallel l{= s/p/s/ =}
+  echo /bin/ls-p | parallel --colsep '-' l{=2 s/p/s/ =} {1}
+  echo s /bin/ls | parallel l{}
+  echo /bin/ls | parallel ls {}
+  echo ls /bin/ls | parallel {}
+  echo ls /bin/ls | parallel
+
+echo '**'
+
+echo '### bug #43817: Some JP char cause problems in positional replacement strings'
+  parallel -k echo ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+  parallel -k echo {1} ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+  parallel -Xj1 echo ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+  parallel -Xj1 echo {1} ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+
+
 EOF

testsuite/wanted-results/parallel-local-0.3s

@@ -16,13 +16,67 @@ echo '**'
 **
 echo '### Test bug #43376: {%} and {#} with --pipe'
 ### Test bug #43376: {%} and {#} with --pipe
-echo foo | parallel -q --pipe -k echo {#}
+  echo foo | parallel -q --pipe -k echo {#}
 1
-echo foo | parallel --pipe -k echo {%}
+  echo foo | parallel --pipe -k echo {%}
 1
-echo foo | parallel -q --pipe -k echo {%}
+  echo foo | parallel -q --pipe -k echo {%}
 1
-echo foo | parallel --pipe -k echo {#}
+  echo foo | parallel --pipe -k echo {#}
 1
 echo '**'
 **
+echo '### {= and =} in different groups separated by space'
+### {= and =} in different groups separated by space
+  parallel echo {= s/a/b/ =} ::: a
+b
+  parallel echo {= s/a/b/=} ::: a
+b
+  parallel echo {= s/a/b/=}{= s/a/b/=} ::: a
+bb
+  parallel echo {= s/a/b/=}{=s/a/b/=} ::: a
+bb
+  parallel echo {= s/a/b/=}{= {= s/a/b/=} ::: a
+b{= b
+  parallel echo {= s/a/b/=}{={=s/a/b/=} ::: a
+b{=b
+  parallel echo {= s/a/b/ =} {={==} ::: a
+b {=a
+  parallel echo {={= =} ::: a
+{=a
+  parallel echo {= {= =} ::: a
+{= a
+  parallel echo {= {= =} =} ::: a
+{= a =}
+echo '**'
+**
+echo '### {} as part of the command'
+### {} as part of the command
+  echo p /bin/ls | parallel l{= s/p/s/ =}
+/bin/ls
+  echo /bin/ls-p | parallel --colsep '-' l{=2 s/p/s/ =} {1}
+/bin/ls
+  echo s /bin/ls | parallel l{}
+/bin/ls
+  echo /bin/ls | parallel ls {}
+/bin/ls
+  echo ls /bin/ls | parallel {}
+/bin/ls
+  echo ls /bin/ls | parallel
+/bin/ls
+echo '**'
+**
+echo '### bug #43817: Some JP char cause problems in positional replacement strings'
+### bug #43817: Some JP char cause problems in positional replacement strings
+  parallel -k echo ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+<EFBFBD><<3C>>
+<EFBFBD><1 $_=2<>>
+ワ
+  parallel -k echo {1} ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+<EFBFBD><<3C>>
+<EFBFBD><1 $_=2<>>
+ワ
+  parallel -Xj1 echo ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+<EFBFBD><<3C>> <20><1 $_=2<>> ワ
+  parallel -Xj1 echo {1} ::: '<27><<3C>>' '<27><1 $_=2<>>' 'ワ'
+<EFBFBD><<3C>>

testsuite/wanted-results/parallel-local1

@@ -1,7 +1,7 @@
 echo "bug #43654: --bar with command not using {}"
 bug #43654: --bar with command not using {}
   COLUMNS=80 stdout parallel --bar true {.} ::: 1
-

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
100
100% 1:0=0s 1                                                                   
+

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
0
0% 0:1=0s 1                                                                     

#   0 sec 1                                                                     
100
100% 1:0=0s 1                                                                   
 echo "### Test --basenamereplace"
 ### Test --basenamereplace
   parallel -j1 -k -X --basenamereplace FOO echo FOO ::: /a/b.c a/b.c b.c /a/b a/b b