Permalink
Switch branches/tags
Nothing to show
Commits on Dec 26, 2010
  1. Merge commit 'index-wt~2' of git://repo.or.cz/topgit/bertw

    Uwe Kleine-König committed Dec 26, 2010
Commits on Nov 8, 2010
  1. tg-prev/tg-next: commands to explore dependencies

    bertwesarg committed Oct 8, 2010
    Two new commands to explore the dependencies of TopGit branches:
    
      a) tg prev [-i | -w] [NAME]
         outputs the dependencies of NAME
    
      b) tg next [-i | -w] [NAME]
         outputs branches which depends on NAME
    
    Obviously, quilt next was the inspiration.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  2. tg-mail: accept -i/-w

    bertwesarg committed Oct 9, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  3. tg-summary: accept -i/-w

    bertwesarg committed Oct 7, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  4. list_deps: accept -i/-w

    bertwesarg committed Oct 26, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  5. tg-patch: use pretty_tree and diff-tree to generate the patch

    bertwesarg committed Nov 8, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  6. branch_empty: use pretty_tree and therefore respect -i/-w

    bertwesarg committed Oct 7, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  7. tg-files: simplify arg checking and add sanity check for -i/-w

    bertwesarg committed Nov 8, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
  8. tg-export: use pretty_tree -b for base

    bertwesarg committed Nov 8, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Commits on Nov 2, 2010
  1. cat_file: take -i/-w parameters

    bertwesarg committed with Uwe Kleine-König Oct 20, 2010
    This changes the way how cat_file selects the source of the file. It
    accepts an optional parameter which is either -i or -w and will react on this
    instead of the branch name. tg-patch is updated accordingly and can now
    accepts the current branch name as argument with -i or -w given.
    
    cat_file was also broken for the worktree case when we are not in the top level.
    
    Also, tg-patch allowed to be on the top-base branch, but -i and -w doesn't
    make sense there too.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. provide a global temporary directory

    bertwesarg committed with Uwe Kleine-König Oct 20, 2010
    The standard procedure 'tmp=mktemp; trap "rm $tmp" 0' was broken with the
    introduction of the pager. Which overwrites the trap itself to close and
    remove the pager fifo.
    
    Now tg provides a temp playground and all other temp files should be created
    inside this directory and only this directory will be removed with the exit
    trap. setup_pager still overwrites the trap, but keeps the rm command from
    the global temp directory. To simplify this the new function get_temp() is
    provided.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. README: clearify note describing short-comings of tg log

    Uwe Kleine-König committed Nov 2, 2010
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  4. tg-files: list files changed by the topic branch

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    this could also be a --name-only option to tg-patch. But I like the
    similarity to 'quilt files'.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Oct 5, 2010
  1. hooks/pre-commit: check for deps repetitions

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    A dep should only be listed once in .topdeps, force this.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. hooks/pre-commit: check .topdeps for valid branches

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. hooks/pre-commit: check for cycles in dependencies

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    We need only to consider newly added dependencies.  For each of these deps we
    need to check if there is a path from this dep to the current HEAD.
    
    We use recursive_dep() for this task.  Even if recursive_dep() uses a DFS
    traversal it will not run into an endless loop if there would be a cycle,
    because recursive_dep() takes .topdeps only from committed trees.  And we
    require that the committed dependency graph has no cycles.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  4. hooks/pre-commit: check .top* files in the to-be-commited tree

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    We currently check fo these files only in the working tree. But we should check
    what would be commited. We use write-tree to be able to utilize ls-tree and
    check the result.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  5. tg.sh: simplify cat_file

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    Use shell parameter expansion to strip the leading (w): and (i)
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  6. README: move note about shortcomings of using --first-parent from tg …

    bertwesarg committed with Uwe Kleine-König Oct 4, 2010
    …base to tg log
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Oct 3, 2010
  1. tg-log: short cut to git log

    bertwesarg committed with Uwe Kleine-König Oct 3, 2010
    A short cut to show the history of a named topgit branch.  Additional options
    to git log can be given after a '--'.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. put die() messages to stderr

    bertwesarg committed with Uwe Kleine-König Oct 3, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. tg-remote: use default remote if none is given

    bertwesarg committed with Uwe Kleine-König Oct 3, 2010
    This is useful if the remote has new topics and you need to populate the local
    top-bases.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  4. Let tg-update take a branch parameter

    bertwesarg committed with Uwe Kleine-König Oct 3, 2010
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  5. Add pointer about the problems regarding tg depend rm to README

    Olaf Dabrunz committed with Uwe Kleine-König Sep 6, 2010
    Signed-off-by: Olaf Dabrunz <odabrunz@gmx.net>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  6. Indicate the current branch in "tg summary --graphviz"

    cederlys committed with Uwe Kleine-König Oct 3, 2010
    Give the current branch a yellow background in the output of
    "tg summary --graphviz".
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  7. Implement "tg summary --deps" as a shell function.

    cederlys committed with Uwe Kleine-König Oct 3, 2010
    This avoids running "$tg summary --deps" from all commands that need
    that information internally.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Sep 6, 2010
  1. Do basic error checking in "tg depend add"

    cederlys committed with Uwe Kleine-König Sep 6, 2010
    Check for the following errors:
    
     - Working on a non-TopGit branch.
     - Adding a branch as a dependency of itself.
     - Adding a dependency that introduces a loop.
     - Adding a dependency that already exists.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. Refactor tg summary

    cederlys committed with Uwe Kleine-König Sep 6, 2010
    Break out the normal processing performed when no options are given to
    a shell function.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Aug 24, 2010
  1. Fix pretty_tree to work in a subdirectory

    Uwe Kleine-König committed Aug 24, 2010
    Without this change a freshly exported branch contains the .top* files
    when tg export was started from a subdirectory.
    
    Reported-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. Generalize subcommand selection in "tg depend"

    cederlys committed with Uwe Kleine-König Aug 24, 2010
    Prepare "tg depend" for new subcommands by moving the implementation
    of "tg add" to a function.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. Add "tg base" that prints the base version.

    cederlys committed with Uwe Kleine-König Aug 24, 2010
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  4. Ignore Emacs auto-save files

    cederlys committed with Uwe Kleine-König Aug 24, 2010
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  5. Order .gitignore alphabetically

    Uwe Kleine-König committed Aug 24, 2010
    This should reduce merge conflicts for commits that add entries (at
    least after this commit is handled :-)
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  6. Don't implement the usage message of tg depend more than once

    cederlys committed with Uwe Kleine-König Aug 24, 2010
    The implmentation of "tg depend" had the usage message in two places.
    Fixed by creating a usage function, so that there is a single place
    to edit if the usage changes.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Jul 25, 2010
  1. Added the --deps option to "tg summary".

    cederlys committed with Uwe Kleine-König Jul 14, 2010
    The --deps option can be used by scripts that need to know
    the dependencies between the topic branches.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>