changeset 11886:73112cb2a6d7

Merge with stable

--- a/contrib/check-code.py	Sun Aug 15 17:42:44 2010 +0200
+++ b/contrib/check-code.py	Sun Aug 15 18:13:46 2010 +0200
@@ -46,6 +46,7 @@
     (r'^function', "don't use 'function', use old style"),
     (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"),
     (r'echo.*\\n', "don't use 'echo \\n', use printf"),
+    (r'echo -n', "don't use 'echo -n', use printf"),
     (r'^diff.*-\w*N', "don't use 'diff -N'"),
     (r'(^| )wc[^|]*$', "filter wc output"),
     (r'head -c', "don't use 'head -c', use 'dd'"),

--- a/mercurial/commands.py	Sun Aug 15 17:42:44 2010 +0200
+++ b/mercurial/commands.py	Sun Aug 15 18:13:46 2010 +0200
@@ -726,8 +726,10 @@
     If you are committing the result of a merge, do not provide any
     filenames or -I/-X filters.
 
-    If no commit message is specified, the configured editor is
-    started to prompt you for a message.
+    If no commit message is specified, Mercurial starts your
+    configured editor where you can enter a message. In case your
+    commit fails, you will find a backup of your message in
+    ``.hg/last-message.txt``.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
@@ -874,7 +876,7 @@
      - empty to denote the default parent.
 
     All string valued-elements are either strictly alphanumeric, or must
-    be enclosed in double quotes ("..."), with "\" as escape character.
+    be enclosed in double quotes ("..."), with "\\" as escape character.
 
     Note that the --overwritten-file and --appended-file options imply the
     use of "HGMERGE=internal:local" during DAG buildup.

--- a/mercurial/revset.py	Sun Aug 15 17:42:44 2010 +0200
+++ b/mercurial/revset.py	Sun Aug 15 18:13:46 2010 +0200
@@ -437,7 +437,7 @@
 def outgoing(repo, subset, x):
     import hg # avoid start-up nasties
     l = getargs(x, 0, 1, _("outgoing wants a repository path"))
-    dest = l[1:] or ''
+    dest = l and getstring(l[0], _("outgoing wants a repository path")) or ''
     dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = hg.parseurl(dest)
     other = hg.repository(hg.remoteui(repo, {}), dest)

--- a/tests/test-revset	Sun Aug 15 17:42:44 2010 +0200
+++ b/tests/test-revset	Sun Aug 15 18:13:46 2010 +0200
@@ -57,6 +57,11 @@
 
 hg tag -r6 1.0
 
+hg clone --quiet -U -r 7 . ../remote1
+hg clone --quiet -U -r 8 . ../remote2
+echo "[paths]" >> .hg/hgrc
+echo "default = ../remote1" >> .hg/hgrc
+
 # names that should work without quoting
 try a
 try b-a
@@ -113,6 +118,9 @@
 log 'min(contains(a))'
 log 'merge()'
 log 'modifies(b)'
+log 'outgoing()'
+log 'outgoing("../remote1")'
+log 'outgoing("../remote2")'
 log 'p1(merge())'
 log 'p2(merge())'
 log 'parents(merge())'

--- a/tests/test-revset.out	Sun Aug 15 17:42:44 2010 +0200
+++ b/tests/test-revset.out	Sun Aug 15 18:13:46 2010 +0200
@@ -158,6 +158,18 @@
 6
 % log 'modifies(b)'
 4
+% log 'outgoing()'
+8
+9
+% log 'outgoing("../remote1")'
+8
+9
+% log 'outgoing("../remote2")'
+3
+5
+6
+7
+9
 % log 'p1(merge())'
 5
 % log 'p2(merge())'