add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----END PGP SIGNATURE-----

     1

# lock.py - simple locking scheme for mercurial

     2

#

     3

# Copyright 2005 Matt Mackall <mpm@selenic.com>

     4

#

     5

# This software may be used and distributed according to the terms

     6

# of the GNU General Public License, incorporated herein by reference.

     7

     8

import os, time

     9

import util

    10

    11

class LockHeld(Exception):

    12

    pass

    13

    14

class lock:

    15

    def __init__(self, file, wait = 1):

    16

        self.f = file

    17

        self.held = 0

    18

        self.wait = wait

    19

        self.lock()

    20

    21

    def __del__(self):

    22

        self.release()

    23

    24

    def lock(self):

    25

        while 1:

    26

            try:

    27

                self.trylock()

    28

                return 1

    29

            except LockHeld, inst:

    30

                if self.wait:

    31

                    time.sleep(1)

    32

                    continue

    33

                raise inst

    34

    35

    def trylock(self):

    36

        pid = os.getpid()

    37

        try:

    38

            util.makelock(str(pid), self.f)

    39

            self.held = 1

    40

        except:

    41

            raise LockHeld(util.readlock(self.f))

    42

    43

    def release(self):

    44

        if self.held:

    45

            self.held = 0

    46

            os.unlink(self.f)

    47