Add log -b to show the branch a specific revision lives in This can be somewhat slow on very large repositories, so I didn't want to include it in -v --- hg.orig/mercurial/commands.py 2005-09-13 14:21:57.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-13 18:55:52.000000000 -0500 @@ -1161,7 +1161,10 @@ def log(ui, repo, *pats, **opts): du = dui(ui) elif st == 'add': du.bump(rev) - show_changeset(du, repo, rev) + br = None + if opts['branch']: + br = repo.branchlookup([repo.changelog.node(rev)]) + show_changeset(du, repo, rev, brinfo=br) if opts['patch']: changenode = repo.changelog.node(rev) prev, other = repo.changelog.parents(changenode) @@ -1743,6 +1746,7 @@ table = { (log, [('I', 'include', [], 'include path in search'), ('X', 'exclude', [], 'exclude path from search'), + ('b', 'branch', None, 'show branches'), ('r', 'rev', [], 'revision'), ('p', 'patch', None, 'show patch')], 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),

     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 (OSError, IOError):

    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