show: new extension for displaying various repository data Currently, Mercurial has a number of commands to show information. And, there are features coming down the pipe that will introduce more commands for showing information. Currently, when introducing a new class of data or a view that we wish to expose to the user, the strategy is to introduce a new command or overload an existing command, sometimes both. For example, there is a desire to formalize the wip/smartlog/underway/mine functionality that many have devised. There is also a desire to introduce a "topics" concept. Others would like views of "the current stack." In the current model, we'd need a new command for wip/smartlog/etc (that behaves a lot like a pre-defined alias of `hg log`). For topics, we'd likely overload `hg topic[s]` to both display and manipulate topics. Adding new commands for every pre-defined query doesn't scale well and pollutes `hg help`. Overloading commands to perform read-only and write operations is arguably an UX anti-pattern: while having all functionality for a given concept in one command is nice, having a single command doing multiple discrete operations is not. Furthermore, a user may be surprised that a command they thought was read-only actually changes something. We discussed this at the Mercurial 4.0 Sprint in Paris and decided that having a single command where we could hang pre-defined views of various data would be a good idea. Having such a command would: * Help prevent an explosion of new query-related commands * Create a clear separation between read and write operations (mitigates footguns) * Avoids overloading the meaning of commands that manipulate data (bookmark, tag, branch, etc) (while we can't take away the existing behavior for BC reasons, we now won't introduce this behavior on new commands) * Allows users to discover informational views more easily by aggregating them in a single location * Lowers the barrier to creating the new views (since the barrier to creating a top-level command is relatively high) So, this commit introduces the `hg show` command via the "show" extension. This command accepts a positional argument of the "view" to show. New views can be registered with a decorator. To prove it works, we implement the "bookmarks" view, which shows a table of bookmarks and their associated nodes. We introduce a new style to hold everything used by `hg show`. For our initial bookmarks view, the output varies from `hg bookmarks`: * Padding is performed in the template itself as opposed to Python * Revision integers are not shown * shortest() is used to display a 5 character node by default (as opposed to static 12 characters) I chose to implement the "bookmarks" view first because it is simple and shouldn't invite too much bikeshedding that detracts from the evaluation of `hg show` itself. But there is an important point to consider: we now have 2 ways to show a list of bookmarks. I'm not a fan of introducing multiple ways to do very similar things. So it might be worth discussing how we wish to tackle this issue for bookmarks, tags, branches, MQ series, etc. I also made the choice of explicitly declaring the default show template not part of the standard BC guarantees. History has shown that we make mistakes and poor choices with output formatting but can't fix these mistakes later because random tools are parsing output and we don't want to break these tools. Optimizing for human consumption is one of my goals for `hg show`. So, by not covering the formatting as part of BC, the barrier to future change is much lower and humans benefit. There are some improvements that can be made to formatting. For example, we don't yet use label() in the templates. We obviously want this for color. But I'm not sure if we should reuse the existing log.* labels or invent new ones. I figure we can punt that to a follow-up. At the aforementioned Sprint, we discussed and discarded various alternatives to `hg show`. We considered making `hg log <view>` perform this behavior. The main reason we can't do this is because a positional argument to `hg log` can be a file path and if there is a conflict between a path name and a view name, behavior is ambiguous. We could have introduced `hg log --view` or similar, but we felt that required too much typing (we don't want to require a command flag to show a view) and wasn't very discoverable. Furthermore, `hg log` is optimized for showing changelog data and there are things that `hg display` could display that aren't changelog centric. There were concerns about using "show" as the command name. Some users already have a "show" alias that is similar to `hg export`. There were also concerns that Git users adapted to `git show` would be confused by `hg show`'s different behavior. The main difference here is `git show` prints an `hg export` like view of the current commit by default and `hg show` requires an argument. `git show` can also display any Git object. `git show` does not support displaying more complex views: just single objects. If we implemented `hg show <hash>` or `hg show <identifier>`, `hg show` would be a superset of `git show`. Although, I'm hesitant to do that at this time because I view `hg show` as a higher-level querying command and there are namespace collisions between valid identifiers and registered views. There is also a prefix collision with `hg showconfig`, which is an alias of `hg config`. We also considered `hg view`, but that is already used by the "hgk" extension. `hg display` was also proposed at one point. It has a prefix collision with `hg diff`. General consensus was "show" or "view" are the best verbs. And since "view" was taken, "show" was chosen. There are a number of inline TODOs in this patch. Some of these represent decisions yet to be made. Others represent features requiring non-trivial complexity. Rather than bloat the patch or invite additional bikeshedding, I figured I'd document future enhancements via TODO so we can get a minimal implmentation landed. Something is better than nothing.

     1

#!/bin/sh -e

     2

#

     3

# Build a Mercurial debian package from the current repo

     4

#

     5

# Tested on Jessie (stable as of original script authoring.)

     6

     7

. $(dirname $0)/packagelib.sh

     8

     9

BUILD=1

    10

CLEANUP=1

    11

DISTID=`(lsb_release -is 2> /dev/null | tr '[:upper:]' '[:lower:]') || echo debian`

    12

CODENAME=`lsb_release -cs 2> /dev/null || echo unknown`

    13

DEBFLAGS=-b

    14

while [ "$1" ]; do

    15

    case "$1" in

    16

    --distid )

    17

        shift

    18

        DISTID="$1"

    19

        shift

    20

        ;;

    21

    --codename )

    22

        shift

    23

        CODENAME="$1"

    24

        shift

    25

        ;;

    26

    --cleanup )

    27

        shift

    28

        BUILD=

    29

        ;;

    30

    --build )

    31

        shift

    32

        CLEANUP=

    33

        ;;

    34

    --source-only )

    35

        shift

    36

        DEBFLAGS=-S

    37

        ;;

    38

    * )

    39

        echo "Invalid parameter $1!" 1>&2

    40

        exit 1

    41

        ;;

    42

    esac

    43

done

    44

    45

trap "if [ '$CLEANUP' ] ; then rm -r '$PWD/debian' ; fi" EXIT

    46

    47

set -u

    48

    49

if [ ! -d .hg ]; then

    50

    echo 'You are not inside a Mercurial repository!' 1>&2

    51

    exit 1

    52

fi

    53

    54

gethgversion

    55

debver="$version"

    56

if [ -n "$type" ] ; then

    57

    debver="$debver~$type"

    58

fi

    59

if [ -n "$distance" ] ; then

    60

    debver="$debver+$distance-$CODENAME-$node"

    61

elif [ "$DEBFLAGS" = "-S" ] ; then

    62

    # for building a ppa (--source-only) for a release (distance == 0), we need

    63

    # to version the distroseries so that we can upload to launchpad

    64

    debver="$debver~${CODENAME}1"

    65

fi

    66

    67

control=debian/control

    68

changelog=debian/changelog

    69

    70

if [ "$BUILD" ]; then

    71

    if [ -d debian ] ; then

    72

        echo "Error! debian control directory already exists!"

    73

        exit 1

    74

    fi

    75

    76

    cp -r $PWD/contrib/debian debian

    77

    78

    sed -i.tmp "s/__VERSION__/$debver/" $changelog

    79

    sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog

    80

    sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog

    81

    rm $changelog.tmp

    82

    83

    # remove the node from the version string

    84

    SRCFILE="mercurial_$(echo $debver | sed "s,-$node,,").orig.tar.gz"

    85

    "$PWD/hg" archive $SRCFILE

    86

    mv $SRCFILE ..

    87

    debuild -us -uc -i -I $DEBFLAGS

    88

    if [ $? != 0 ]; then

    89

        echo 'debuild failed!'

    90

        exit 1

    91

    fi

    92

    93

fi

    94

if [ "$CLEANUP" ] ; then

    95

    echo

    96

    OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}

    97

    mkdir -p "$OUTPUTDIR"

    98

    find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \

    99

          ../mercurial*.dsc ../mercurial*.gz \

   100

          -type f -newer $control -print0 2>/dev/null | \

   101

      xargs -Inarf -0 mv narf "$OUTPUTDIR"

   102

    echo "Built packages for $debver:"

   103

    find "$OUTPUTDIR" -type f -newer $control -name '*.deb'

   104

fi