merge with stable

hgext/largefiles/lfutil.py

@@ -247,6 +247,8 b' def getstandinmatcher(repo, rmatcher=Non'
 
     if rmatcher and not rmatcher.always():
         pats = [os.path.join(standindir, pat) for pat in rmatcher.files()]
+        if not pats:
+            pats = [standindir]
         match = scmutil.match(repo[None], pats, badfn=badfn)
         # if pats is empty, it would incorrectly always match, so clear _always
         match._always = False

hgext/rebase.py

@@ -1026,6 +1026,10 b' def clearrebased(ui, repo, state, skippe'
 def pullrebase(orig, ui, repo, *args, **opts):
     'Call rebase after pull if the latter has been invoked with --rebase'
     if opts.get('rebase'):
+        wlock = lock = None
+        try:
+            wlock = repo.wlock()
+            lock = repo.lock()
         if opts.get('update'):
             del opts['update']
             ui.debug('--update and --rebase are not compatible, ignoring '
@@ -1060,6 +1064,8 b' def pullrebase(orig, ui, repo, *args, **'
                 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                     ui.status(_("updating bookmark %s\n")
                               % repo._activebookmark)
+        finally:
+            release(lock, wlock)
     else:
         if opts.get('tool'):
             raise util.Abort(_('--tool can only be used with --rebase'))

mercurial/commands.py

@@ -6475,12 +6475,14 b' def update(ui, repo, node=None, rev=None'
     if rev is None or rev == '':
         rev = node
 
+    wlock = repo.wlock()
+    try:
     cmdutil.clearunfinished(repo)
 
     # with no argument, we also move the active bookmark, if any
     rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
 
-    # if we defined a bookmark, we have to remember the original bookmark name
+        # if we defined a bookmark, we have to remember the original name
     brev = rev
     rev = scmutil.revsingle(repo, rev, rev).rev()
 
@@ -6520,6 +6522,8 b' def update(ui, repo, node=None, rev=None'
             ui.status(_("(leaving bookmark %s)\n") %
                       repo._activebookmark)
         bookmarks.deactivate(repo)
+    finally:
+        wlock.release()
 
     return ret
 

mercurial/help/scripting.txt

@@ -56,7 +56,7 b' HGENCODING'
    incorrectly (often by using "?" as a placeholder for invalid
    characters in the current locale).
 
-   Explcitly setting this environment variable is a good practice to
+   Explicitly setting this environment variable is a good practice to
    guarantee consistent results. "utf-8" is a good choice on UNIX-like
    environments.
 

mercurial/hg.py

@@ -428,7 +428,7 b' def clone(ui, peeropts, source, dest=Non'
     shareopts = shareopts or {}
     sharepool = shareopts.get('pool')
     sharenamemode = shareopts.get('mode')
-    if sharepool:
+    if sharepool and islocal(dest):
         sharepath = None
         if sharenamemode == 'identity':
             # Resolve the name from the initial changeset in the remote

tests/test-blackbox.t

@@ -119,8 +119,8 b' extension and python hooks - use the eol'
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'update = echo hooked' >> .hg/hgrc
   $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   hooked
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> update
   1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 0 tags

tests/test-clone.t

@@ -1013,3 +1013,15 b' Request to clone a single branch is resp'
   adding remote bookmark bookA
 
   $ ls share-1anowc
+
+Test that auto sharing doesn't cause failure of "hg clone local remote"
+
+  $ cd $TESTTMP
+  $ hg -R a id -r 0
+  acb14030fe0a
+  $ hg id -R remote -r 0
+  abort: there is no Mercurial repository here (.hg not found)
+  [255]
+  $ hg --config share.pool=share -q clone -e "python \"$TESTDIR/dummyssh\"" a ssh://user@dummy/remote
+  $ hg -R remote id -r 0
+  acb14030fe0a

tests/test-histedit-fold.t

@@ -505,4 +505,8 b' into the hook command.'
   1:9599899f62c0 a
   0:79b99e9c8e49 b
 
+  $ echo "foo" > amended.txt
+  $ hg add amended.txt
+  $ hg ci -q --config extensions.largefiles= --amend -I amended.txt
+
   $ cd ..

tests/test-hook.t

@@ -223,8 +223,8 b' update hook'
   $ echo "update = printenv.py update" >> .hg/hgrc
   $ hg update
   preupdate hook: HG_PARENT1=539e4b31b6dc
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 pushkey hook
 
@@ -644,8 +644,8 b' final release (and dirstate flush).'
   $ hg ci -ma
   223eafe2750c tip
   $ hg up 0 --config extensions.largefiles=
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   cb9a9f314b8b
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 make sure --verbose (and --quiet/--debug etc.) are propagated to the local ui
 that is passed to pre/post hooks

tests/test-lock-badness.t

@@ -59,7 +59,6 b' One process waiting for another'
   $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
   waiting for lock on working directory of b held by '*:*' (glob)
   got lock after ? seconds (glob)
-  warning: ignoring unknown working parent d2ae7f538514!
   $ wait
   $ cat stdout
   adding b