chiark / gitweb /
topgit.git
5 years agowip i/new-update
Ian Jackson [Wed, 28 Dec 2011 02:12:35 +0000 (02:12 +0000)]
wip

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge i/basis-merge i/new-update
Ian Jackson [Wed, 28 Dec 2011 02:06:24 +0000 (02:06 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge branch 'i/build' into refs/top-bases/i/basis-merge i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 02:06:23 +0000 (02:06 +0000)]
Merge branch 'i/build' into refs/top-bases/i/basis-merge

5 years agoadd changelog entry i/build
Ian Jackson [Wed, 28 Dec 2011 02:06:16 +0000 (02:06 +0000)]
add changelog entry

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:56:26 +0000 (01:56 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge branch 'fixes/tg--r-require-arg' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:56:26 +0000 (01:56 +0000)]
Merge branch 'fixes/tg--r-require-arg' into refs/top-bases/i/basis-merge

5 years agoMerge commit 'refs/top-bases/fixes/tg--r-require-arg' into fixes/tg--r-require-arg fixes/tg--r-require-arg
Ian Jackson [Wed, 28 Dec 2011 01:56:26 +0000 (01:56 +0000)]
Merge commit 'refs/top-bases/fixes/tg--r-require-arg' into fixes/tg--r-require-arg

5 years agoNew TopGit dependency: fixes/tg--r-require-arg
Ian Jackson [Wed, 28 Dec 2011 01:56:25 +0000 (01:56 +0000)]
New TopGit dependency: fixes/tg--r-require-arg

5 years agoMerge branch 'fixes/more-help' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:56:10 +0000 (01:56 +0000)]
Merge branch 'fixes/more-help' into refs/top-bases/i/basis-merge

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:56:10 +0000 (01:56 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge commit 'refs/top-bases/fixes/more-help' into fixes/more-help fixes/more-help
Ian Jackson [Wed, 28 Dec 2011 01:56:10 +0000 (01:56 +0000)]
Merge commit 'refs/top-bases/fixes/more-help' into fixes/more-help

5 years agoNew TopGit dependency: fixes/more-help
Ian Jackson [Wed, 28 Dec 2011 01:56:09 +0000 (01:56 +0000)]
New TopGit dependency: fixes/more-help

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:55:52 +0000 (01:55 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:55:46 +0000 (01:55 +0000)]
Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge

Conflicts:
tg.sh

5 years agoNew TopGit dependency: fixes/independent-help
Ian Jackson [Wed, 28 Dec 2011 01:53:00 +0000 (01:53 +0000)]
New TopGit dependency: fixes/independent-help

5 years agoMerge commit 'refs/top-bases/fixes/independent-help' into fixes/independent-help fixes/independent-help
Ian Jackson [Wed, 28 Dec 2011 01:52:52 +0000 (01:52 +0000)]
Merge commit 'refs/top-bases/fixes/independent-help' into fixes/independent-help

5 years agoMerge branch 'fixes/export--b-deps' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:52:37 +0000 (01:52 +0000)]
Merge branch 'fixes/export--b-deps' into refs/top-bases/i/basis-merge

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:52:37 +0000 (01:52 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoNew TopGit dependency: fixes/export--b-deps
Ian Jackson [Wed, 28 Dec 2011 01:52:37 +0000 (01:52 +0000)]
New TopGit dependency: fixes/export--b-deps

5 years agoMerge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps fixes/export--b-deps
Ian Jackson [Wed, 28 Dec 2011 01:52:20 +0000 (01:52 +0000)]
Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps

5 years agoMerge branch 'fixes/ensure-worktree' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:52:01 +0000 (01:52 +0000)]
Merge branch 'fixes/ensure-worktree' into refs/top-bases/i/basis-merge

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:52:01 +0000 (01:52 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge commit 'refs/top-bases/fixes/ensure-worktree' into fixes/ensure-worktree fixes/ensure-worktree
Ian Jackson [Wed, 28 Dec 2011 01:51:43 +0000 (01:51 +0000)]
Merge commit 'refs/top-bases/fixes/ensure-worktree' into fixes/ensure-worktree

Conflicts:
tg.sh

5 years agoNew TopGit dependency: fixes/ensure-worktree
Ian Jackson [Wed, 28 Dec 2011 01:48:20 +0000 (01:48 +0000)]
New TopGit dependency: fixes/ensure-worktree

5 years agoMerge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:47:50 +0000 (01:47 +0000)]
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

5 years agoMerge branch 'features/vim-modelines' into refs/top-bases/i/basis-merge
Ian Jackson [Wed, 28 Dec 2011 01:47:49 +0000 (01:47 +0000)]
Merge branch 'features/vim-modelines' into refs/top-bases/i/basis-merge

5 years agoNew TopGit dependency: features/vim-modelines
Ian Jackson [Wed, 28 Dec 2011 01:47:49 +0000 (01:47 +0000)]
New TopGit dependency: features/vim-modelines

5 years agoMerge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines features/vim-modelines
Ian Jackson [Wed, 28 Dec 2011 01:47:49 +0000 (01:47 +0000)]
Merge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines

5 years agobegin
Ian Jackson [Wed, 28 Dec 2011 01:47:30 +0000 (01:47 +0000)]
begin

5 years agoadd .gitignore for substvars
Ian Jackson [Wed, 28 Dec 2011 01:46:29 +0000 (01:46 +0000)]
add .gitignore for substvars

5 years agoremove patch from build-stamp
Ian Jackson [Wed, 28 Dec 2011 01:45:55 +0000 (01:45 +0000)]
remove patch from build-stamp

5 years agoMerge commit 'refs/top-bases/debian/locations' into debian/locations debian/locations i/build
Ian Jackson [Wed, 28 Dec 2011 01:33:36 +0000 (01:33 +0000)]
Merge commit 'refs/top-bases/debian/locations' into debian/locations

5 years agoMerge branch 'master' into refs/top-bases/debian/locations debian/locations
Ian Jackson [Wed, 28 Dec 2011 01:33:36 +0000 (01:33 +0000)]
Merge branch 'master' into refs/top-bases/debian/locations

6 years agoMerge commit 'index-wt~2' of git://repo.or.cz/topgit/bertw upstream features/vim-modelines fixes/ensure-worktree fixes/export--b-deps fixes/independent-help fixes/more-help fixes/tg--r-require-arg
Uwe Kleine-König [Sun, 26 Dec 2010 12:20:26 +0000 (13:20 +0100)]
Merge commit 'index-wt~2' of git://repo.or.cz/topgit/bertw

7 years agotg-prev/tg-next: commands to explore dependencies
Bert Wesarg [Fri, 8 Oct 2010 07:32:36 +0000 (09:32 +0200)]
tg-prev/tg-next: commands to explore dependencies

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>
7 years agotg-mail: accept -i/-w
Bert Wesarg [Sat, 9 Oct 2010 20:52:19 +0000 (22:52 +0200)]
tg-mail: accept -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agotg-summary: accept -i/-w
Bert Wesarg [Thu, 7 Oct 2010 21:05:08 +0000 (23:05 +0200)]
tg-summary: accept -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agolist_deps: accept -i/-w
Bert Wesarg [Tue, 26 Oct 2010 21:15:55 +0000 (23:15 +0200)]
list_deps: accept -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agotg-patch: use pretty_tree and diff-tree to generate the patch
Bert Wesarg [Mon, 8 Nov 2010 07:25:33 +0000 (08:25 +0100)]
tg-patch: use pretty_tree and diff-tree to generate the patch

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agobranch_empty: use pretty_tree and therefore respect -i/-w
Bert Wesarg [Thu, 7 Oct 2010 19:54:22 +0000 (21:54 +0200)]
branch_empty: use pretty_tree and therefore respect -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agotg-files: simplify arg checking and add sanity check for -i/-w
Bert Wesarg [Mon, 8 Nov 2010 07:26:28 +0000 (08:26 +0100)]
tg-files: simplify arg checking and add sanity check for -i/-w

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agotg-export: use pretty_tree -b for base
Bert Wesarg [Mon, 8 Nov 2010 07:25:10 +0000 (08:25 +0100)]
tg-export: use pretty_tree -b for base

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
7 years agocat_file: take -i/-w parameters
Bert Wesarg [Wed, 20 Oct 2010 20:17:47 +0000 (22:17 +0200)]
cat_file: take -i/-w parameters

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>
7 years agoprovide a global temporary directory
Bert Wesarg [Wed, 20 Oct 2010 20:17:46 +0000 (22:17 +0200)]
provide a global temporary directory

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>
7 years agoREADME: clearify note describing short-comings of tg log
Uwe Kleine-König [Tue, 2 Nov 2010 20:54:21 +0000 (21:54 +0100)]
README: clearify note describing short-comings of tg log

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg-files: list files changed by the topic branch
Bert Wesarg [Mon, 4 Oct 2010 18:27:47 +0000 (20:27 +0200)]
tg-files: list files changed by the topic branch

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>
7 years agohooks/pre-commit: check for deps repetitions
Bert Wesarg [Mon, 4 Oct 2010 21:22:17 +0000 (23:22 +0200)]
hooks/pre-commit: check for deps repetitions

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>
7 years agohooks/pre-commit: check .topdeps for valid branches
Bert Wesarg [Mon, 4 Oct 2010 21:18:50 +0000 (23:18 +0200)]
hooks/pre-commit: check .topdeps for valid branches

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agohooks/pre-commit: check for cycles in dependencies
Bert Wesarg [Mon, 4 Oct 2010 21:07:27 +0000 (23:07 +0200)]
hooks/pre-commit: check for cycles in dependencies

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>
7 years agohooks/pre-commit: check .top* files in the to-be-commited tree
Bert Wesarg [Mon, 4 Oct 2010 18:54:57 +0000 (20:54 +0200)]
hooks/pre-commit: check .top* files in the to-be-commited tree

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>
7 years agotg.sh: simplify cat_file
Bert Wesarg [Mon, 4 Oct 2010 18:47:01 +0000 (20:47 +0200)]
tg.sh: simplify cat_file

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>
7 years agoREADME: move note about shortcomings of using --first-parent from tg base to tg log
Bert Wesarg [Mon, 4 Oct 2010 19:06:29 +0000 (21:06 +0200)]
README: move note about shortcomings of using --first-parent from tg 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>
7 years agotg-log: short cut to git log
Bert Wesarg [Sun, 3 Oct 2010 21:25:57 +0000 (23:25 +0200)]
tg-log: short cut to git log

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>
7 years agoput die() messages to stderr
Bert Wesarg [Sun, 3 Oct 2010 21:25:56 +0000 (23:25 +0200)]
put die() messages to stderr

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg-remote: use default remote if none is given
Bert Wesarg [Sun, 3 Oct 2010 21:25:53 +0000 (23:25 +0200)]
tg-remote: use default remote if none is given

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>
7 years agoLet tg-update take a branch parameter
Bert Wesarg [Sun, 3 Oct 2010 21:25:52 +0000 (23:25 +0200)]
Let tg-update take a branch parameter

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoAdd pointer about the problems regarding tg depend rm to README
Olaf Dabrunz [Mon, 6 Sep 2010 00:02:54 +0000 (02:02 +0200)]
Add pointer about the problems regarding tg depend rm to README

Signed-off-by: Olaf Dabrunz <odabrunz@gmx.net>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoIndicate the current branch in "tg summary --graphviz"
Per Cederqvist [Sun, 3 Oct 2010 21:41:45 +0000 (23:41 +0200)]
Indicate the current branch in "tg summary --graphviz"

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 years agoImplement "tg summary --deps" as a shell function.
Per Cederqvist [Sun, 3 Oct 2010 21:37:52 +0000 (23:37 +0200)]
Implement "tg summary --deps" as a shell function.

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>
7 years agoDo basic error checking in "tg depend add"
Per Cederqvist [Mon, 6 Sep 2010 05:12:16 +0000 (07:12 +0200)]
Do basic error checking in "tg depend add"

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>
7 years agoRefactor tg summary
Per Cederqvist [Mon, 6 Sep 2010 05:12:16 +0000 (07:12 +0200)]
Refactor tg summary

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>
7 years agoFix pretty_tree to work in a subdirectory
Uwe Kleine-König [Tue, 24 Aug 2010 18:56:06 +0000 (20:56 +0200)]
Fix pretty_tree to work in a subdirectory

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>
7 years agoGeneralize subcommand selection in "tg depend"
Per Cederqvist [Tue, 24 Aug 2010 18:32:39 +0000 (20:32 +0200)]
Generalize subcommand selection in "tg depend"

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>
7 years agoAdd "tg base" that prints the base version.
Per Cederqvist [Tue, 24 Aug 2010 18:32:05 +0000 (20:32 +0200)]
Add "tg base" that prints the base version.

Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoIgnore Emacs auto-save files
Per Cederqvist [Tue, 24 Aug 2010 18:32:06 +0000 (20:32 +0200)]
Ignore Emacs auto-save files

Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoOrder .gitignore alphabetically
Uwe Kleine-König [Tue, 24 Aug 2010 18:39:35 +0000 (20:39 +0200)]
Order .gitignore alphabetically

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>
7 years agoDon't implement the usage message of tg depend more than once
Per Cederqvist [Tue, 24 Aug 2010 18:32:38 +0000 (20:32 +0200)]
Don't implement the usage message of tg depend more than once

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>
7 years agocontrol: depend on git | git-core master
Uwe Kleine-König [Wed, 28 Jul 2010 13:22:23 +0000 (15:22 +0200)]
control: depend on git | git-core

The package providing git was renamed some time ago from git-core to git.
git-core is only a transitional dummy package in squeeze.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoAdded the --deps option to "tg summary".
Per Cederqvist [Wed, 14 Jul 2010 16:21:15 +0000 (18:21 +0200)]
Added the --deps option to "tg summary".

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>
7 years agoImplemented "tg summary --sort".
Per Cederqvist [Wed, 14 Jul 2010 16:21:02 +0000 (18:21 +0200)]
Implemented "tg summary --sort".

This uses tsort to sort the branches based on their dependency graph.
Note: only a single sort order that fulfills the dependency graph is
printed.  There may be many other possible orderings.

A graphical text view would be much more useful, but this is till
a lot better than nothing.

Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg2quilt.mk: don't call git-status with git-commit options
Uwe Kleine-König [Sun, 16 May 2010 06:51:38 +0000 (08:51 +0200)]
tg2quilt.mk: don't call git-status with git-commit options

git-status older than v1.7.0-rc0~137^2~17 used to take the same options
as git-commit.  So reimplement the needed logic using plumbing.  An
alternative would be using git commit --dry-run.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: James Vega <jamessan@debian.org>
Closes: http://bugs.debian.org/581582

7 years agoMerge commit 'refs/top-bases/fixes/tg--r-require-arg' into fixes/tg--r-require-arg
Carsten Hey [Mon, 26 Apr 2010 08:19:00 +0000 (10:19 +0200)]
Merge commit 'refs/top-bases/fixes/tg--r-require-arg' into fixes/tg--r-require-arg

* commit 'refs/top-bases/fixes/tg--r-require-arg': (31 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/fixes/more-help' into fixes/more-help
Carsten Hey [Mon, 26 Apr 2010 08:19:00 +0000 (10:19 +0200)]
Merge commit 'refs/top-bases/fixes/more-help' into fixes/more-help

* commit 'refs/top-bases/fixes/more-help': (31 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/fixes/independent-help' into fixes/independent-help
Carsten Hey [Mon, 26 Apr 2010 08:19:00 +0000 (10:19 +0200)]
Merge commit 'refs/top-bases/fixes/independent-help' into fixes/independent-help

* commit 'refs/top-bases/fixes/independent-help': (31 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps
Carsten Hey [Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)]
Merge commit 'refs/top-bases/fixes/export--b-deps' into fixes/export--b-deps

* commit 'refs/top-bases/fixes/export--b-deps': (31 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/fixes/ensure-worktree' into fixes/ensure-worktree
Carsten Hey [Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)]
Merge commit 'refs/top-bases/fixes/ensure-worktree' into fixes/ensure-worktree

* commit 'refs/top-bases/fixes/ensure-worktree': (30 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines
Carsten Hey [Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)]
Merge commit 'refs/top-bases/features/vim-modelines' into features/vim-modelines

* commit 'refs/top-bases/features/vim-modelines': (31 commits)
  tg patch: treat all files as ascii
  tg mail: document config setting to prevent unintended mass mail sending
  Don't call pre-commit hook if tg is not installed
  tg-delete: Handle the case where the branch has been removed already, but the base is still left.
  tg-mail: Properly quote argument to --in-reply-to
  tg-push: Filter out plain SHA1s from being pushed.
  Make 'tg patch' work in subdirectories
  quote $LESS in case it includes spaces
  deal with single quotes in from/to headers
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  recurse_deps: if no_remotes is set don't recurse into remote deps
  ...

7 years agoMerge commit 'refs/top-bases/debian/locations' into debian/locations
Carsten Hey [Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)]
Merge commit 'refs/top-bases/debian/locations' into debian/locations

* commit 'refs/top-bases/debian/locations':
  adapt debian/changelog for 0.8-1.1
  do not fail if no quilt patches to pop
  tg-cleanexport is PHONY
  check for applied patches/uncommitted changes before tg-rmdir
  also remove the dpkgv3 patch stamp file
  simplify removal of files in tg-rmdir
  change section to vcs
  debian/changelog: new upstream release fixes #516188

7 years agoMerge branch 'master' into refs/top-bases/debian/locations
Carsten Hey [Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)]
Merge branch 'master' into refs/top-bases/debian/locations

* master: (89 commits)
  adapt debian/changelog for 0.8-1.1
  do not fail if no quilt patches to pop
  tg-cleanexport is PHONY
  check for applied patches/uncommitted changes before tg-rmdir
  also remove the dpkgv3 patch stamp file
  simplify removal of files in tg-rmdir
  change section to vcs
  debian/changelog: new upstream release fixes #516188
  drop fixes/ensure-worktree
  debian/changelog: document new upstream release
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  ...

7 years agoadapt debian/changelog for 0.8-1.1
Carsten Hey [Mon, 26 Apr 2010 08:18:58 +0000 (10:18 +0200)]
adapt debian/changelog for 0.8-1.1

7 years agotg patch: treat all files as ascii
Uwe Kleine-König [Wed, 25 Mar 2009 17:21:04 +0000 (18:21 +0100)]
tg patch: treat all files as ascii

This fixes patching binary files, for a problem case check out
http://bugs.debian.org/521173 .

Closes: http://bugs.debian.org/521173
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg mail: document config setting to prevent unintended mass mail sending
Uwe Kleine-König [Sat, 10 Apr 2010 13:24:47 +0000 (15:24 +0200)]
tg mail: document config setting to prevent unintended mass mail sending

Addresses: http://bugs.debian.org/506306
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoDon't call pre-commit hook if tg is not installed
Carsten Hey [Sat, 10 Apr 2010 13:20:10 +0000 (15:20 +0200)]
Don't call pre-commit hook if tg is not installed

Signed-off-by: Carsten Hey <carsten@debian.org>
Closes: http://bugs.debian.org/576221
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg-delete: Handle the case where the branch has been removed already, but the base...
Thomas Schwinge [Sun, 28 Feb 2010 11:39:34 +0000 (12:39 +0100)]
tg-delete: Handle the case where the branch has been removed already, but the base is still left.

A user might have used 'git branch -D B' to remove the branch B, and then
certain TopGit commands complain, because the base of branch B is still there.

Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg-mail: Properly quote argument to --in-reply-to
Thomas Schwinge [Sun, 28 Feb 2010 13:24:08 +0000 (14:24 +0100)]
tg-mail: Properly quote argument to --in-reply-to

Message-Ids usually contain < and >.  These need to be quoted.

Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agotg-push: Filter out plain SHA1s from being pushed.
Thomas Schwinge [Sun, 28 Feb 2010 13:57:41 +0000 (14:57 +0100)]
tg-push: Filter out plain SHA1s from being pushed.

Otherwise, problems arise when branches depend (via .topdeps) on SHA1s:

    $ tg push -r tmp t/____longjmp_chk_cleanup_linux_x86_64
    fatal: 77c84aeb81808c3109665949448dba59965c391e cannot be resolved to branch.
    fatal: The remote end hung up unexpectedly

Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
7 years agoMake 'tg patch' work in subdirectories
Michal Sojka [Tue, 2 Feb 2010 10:31:12 +0000 (11:31 +0100)]
Make 'tg patch' work in subdirectories

When 'tg patch' is called from a subdirectory, it outputs only the
commit message and no diff.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agodo not fail if no quilt patches to pop
martin f. krafft [Fri, 6 Nov 2009 10:14:21 +0000 (11:14 +0100)]
do not fail if no quilt patches to pop

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg-cleanexport is PHONY
martin f. krafft [Fri, 6 Nov 2009 09:33:07 +0000 (10:33 +0100)]
tg-cleanexport is PHONY

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agocheck for applied patches/uncommitted changes before tg-rmdir
martin f. krafft [Fri, 6 Nov 2009 09:32:53 +0000 (10:32 +0100)]
check for applied patches/uncommitted changes before tg-rmdir

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoalso remove the dpkgv3 patch stamp file
martin f. krafft [Fri, 6 Nov 2009 09:18:14 +0000 (10:18 +0100)]
also remove the dpkgv3 patch stamp file

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agosimplify removal of files in tg-rmdir
martin f. krafft [Fri, 6 Nov 2009 09:17:55 +0000 (10:17 +0100)]
simplify removal of files in tg-rmdir

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agochange section to vcs
Uwe Kleine-König [Wed, 4 Nov 2009 20:40:42 +0000 (21:40 +0100)]
change section to vcs

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: martin f. krafft <madduck@debian.org>
8 years agoquote $LESS in case it includes spaces
martin f. krafft [Tue, 27 Oct 2009 18:43:15 +0000 (19:43 +0100)]
quote $LESS in case it includes spaces

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agodeal with single quotes in from/to headers
martin f. krafft [Tue, 27 Oct 2009 18:43:37 +0000 (19:43 +0100)]
deal with single quotes in from/to headers

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agodebian/changelog: new upstream release fixes #516188
Uwe Kleine-König [Wed, 23 Sep 2009 19:01:07 +0000 (21:01 +0200)]
debian/changelog: new upstream release fixes #516188

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoMerge branch 'master' into refs/top-bases/debian/locations
Uwe Kleine-König [Wed, 23 Sep 2009 18:41:10 +0000 (20:41 +0200)]
Merge branch 'master' into refs/top-bases/debian/locations

8 years agoMerge commit 'refs/top-bases/debian/locations' into debian/locations
Uwe Kleine-König [Wed, 23 Sep 2009 18:41:10 +0000 (20:41 +0200)]
Merge commit 'refs/top-bases/debian/locations' into debian/locations

8 years agodrop fixes/ensure-worktree
Uwe Kleine-König [Wed, 23 Sep 2009 18:20:19 +0000 (20:20 +0200)]
drop fixes/ensure-worktree

This patch was a workaround of a bug in git that was fixed in
72183cb297f (== v1.6.1.3~4^2).  As testing already has git 1.6.3.3 we
don't need it any more.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agodebian/changelog: document new upstream release
Uwe Kleine-König [Wed, 23 Sep 2009 16:01:36 +0000 (18:01 +0200)]
debian/changelog: document new upstream release

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>