Patchwork [2,of,2,V3] debuglocks: allow setting a lock

login
register
mail settings
Submitter Augie Fackler
Date Nov. 20, 2017, 10:48 p.m.
Message ID <87277966-6404-4E26-844F-9F47549CF660@durin42.com>
Download mbox | patch
Permalink /patch/25677/
State Not Applicable
Headers show

Comments

Augie Fackler - Nov. 20, 2017, 10:48 p.m.
> On Nov 20, 2017, at 17:22, Augie Fackler <raf@durin42.com> wrote:
> 
> On Sun, Nov 19, 2017 at 10:54:51PM -0500, Paul Morelle wrote:
>> # HG changeset patch
>> # User Paul Morelle <paul.morelle@octobus.net>
>> # Date 1510497286 -3600
>> #      Sun Nov 12 15:34:46 2017 +0100
>> # Node ID e9f4ce1f42464b7670618986f0762f016e33e284
>> # Parent  9b602162e10949a80e90d9732bb654b430e0b22a
>> # EXP-Topic debugsetlocks
>> # Available At https://bitbucket.org/octobus/mercurial-devel/
>> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r e9f4ce1f4246
>> debuglocks: allow setting a lock
> 
> queued, thanks
> 
> It looks like yuya's comments were addressed, so queued. Thanks!

Dropping because of test failures:


ERROR: test-debugcommands.t output changed

This is on linux, specifically gcc112.fsffrance, but probably reproducible most anywhere?

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

--- /home/augie/hg/tests/test-debugcommands.t
+++ /home/augie/hg/tests/test-debugcommands.t.err
@@ -188,7 +188,7 @@ 
   $ wait
    y
   $ ls -l .hg/store/lock
-  ls: cannot access '.hg/store/lock': No such file or directory
+  ls: cannot access .hg/store/lock: No such file or directory
   [2]

 * Test setting the wlock
@@ -205,7 +205,7 @@ 
   $ wait
    y
   $ ls -l .hg/wlock
-  ls: cannot access '.hg/wlock': No such file or directory
+  ls: cannot access .hg/wlock: No such file or directory
   [2]

 * Test setting both locks
@@ -251,33 +251,37 @@ 
   $ hg debuglocks -L

   $ hg debuglocks
-  lock:  free
-  wlock: free
-
-  $ touch .hg/unlock
-  $ wait
-   y
+   timeout: .hg/unlock was not created in 1 seconds
+  unrecognized response
+  ready to release the lock (Y)?  y
+  lock:  free
+  wlock: free
+
+  $ touch .hg/unlock
+  $ wait

 * Test forcing the wlock

   $ dolock -S &
   $ waitlock .hg/wlock
-  ready to release the lock (Y)?  (no-eol)
-
-  $ hg debuglocks
-  lock:  free
-  wlock: user *, process * (*s) (glob)
+  ready to release the lock (Y)?  y
+  timeout: .hg/wlock was not created in 1 seconds
   [1]

+  $ hg debuglocks
+  lock:  free
+  wlock: free
+
   $ hg debuglocks -W
-
-  $ hg debuglocks
-  lock:  free
-  wlock: free
-
-  $ touch .hg/unlock
-  $ wait
-   y
+  abort: No such file or directory: '$TESTTMP/debugrevlog/.hg/wlock'
+  [255]
+
+  $ hg debuglocks
+  lock:  free
+  wlock: free
+
+  $ touch .hg/unlock
+  $ wait

 Test WdirUnsupported exception