On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: > On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote: > > Hg is really very nice. The only feature i miss from git is the > > whatchanged -p, which shows a diff along with a changeset. > > python before, i just dig into the mercurial/commands.py a while and > > see what diff(), dodiff(), export(), show_changeset(), log() would > > normally do. There might be one thing or two missed or wrong. But here > > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg > > log -d' to show the whole history with the diff or 'hg log -d <file>' to > > show that info of a particular file. And also works with the '-r' > > option. > > Let's use -p. We're going to be combining the global and per command > switch namespace shortly and the global -p will disappear. Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have 'hg log -p'. > Also, the argument list for show_changeset is getting a bit unwieldy. This time i remain show_changeset untouched at all. Only changed some bits of log().

     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

            try:

    47

                os.unlink(self.f)

    48

            except: pass

    49