chiark / gitweb /
topgit.git
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 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 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

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 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 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>
8 years agoMerge tag 'topgit-0.8' of git://repo.or.cz/topgit
Uwe Kleine-König [Wed, 23 Sep 2009 16:00:13 +0000 (18:00 +0200)]
Merge tag 'topgit-0.8' of git://repo.or.cz/topgit

8 years agobump version number to 0.8
Uwe Kleine-König [Wed, 23 Sep 2009 09:08:14 +0000 (11:08 +0200)]
bump version number to 0.8

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoFix tg export --quilt --numbered w/ > 8 patches
Jon Ringle [Wed, 16 Sep 2009 15:39:24 +0000 (11:39 -0400)]
Fix tg export --quilt --numbered w/ > 8 patches

Creating a quilt patch series with more than 8 patches with:
tg export --quilt --numbered patchdir

Causes the following error to be produced:
eval: 1: arithmetic expression: expecting EOF: "0008 + 1"

This is due to the leading 0 and the $(()) evaluates as octal rather
than decimal.

Add the leading zeros only to the filename, not the number itself.

Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agotg-push: add bash completion
Bert Wesarg [Tue, 26 May 2009 23:31:34 +0000 (01:31 +0200)]
tg-push: add bash completion

Include all options.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agohelp: use pager
Bert Wesarg [Tue, 2 Jun 2009 20:35:12 +0000 (22:35 +0200)]
help: use pager

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agotg-push: handle non-tgish branches
Bert Wesarg [Wed, 27 May 2009 08:17:01 +0000 (10:17 +0200)]
tg-push: handle non-tgish branches

tg push died if you gave it a non-tgish branch:

$ tg push -r push-test master
fatal: Not a valid object name refs/top-bases/master
fatal: ambiguous argument '^{tree}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions
fatal: Not a valid object name master:.topdeps

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agotg-push: prevent handing branches more than once to git-push
Bert Wesarg [Wed, 27 May 2009 08:16:35 +0000 (10:16 +0200)]
tg-push: prevent handing branches more than once to git-push

Doing otherwise can result in a lot of warnings and errors:

warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master
warning, no base found top-bases/master

error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/master is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/master
error: Ref refs/heads/bw/log is at a16df35cc7009b36f6f71717ae3d9a3dc29987da but expected 0000000000000000000000000000000000000000
error: failed to lock refs/heads/bw/log
error: Ref refs/top-bases/bw/log is at b725fc951a37854fc65945ac5bcab3bc61ccbd94 but expected 0000000000000000000000000000000000000000
error: failed to lock refs/top-bases/bw/log

 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] master -> master (failed to lock)
 ! [remote rejected] bw/log -> bw/log (failed to lock)
 ! [remote rejected] refs/top-bases/bw/log -> refs/top-bases/bw/log (failed to lock)

Note, the result is OK only the output is irritating.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agotg-push: remove useless warning about missing bases for non-tgish branches
Bert Wesarg [Wed, 27 May 2009 08:16:22 +0000 (10:16 +0200)]
tg-push: remove useless warning about missing bases for non-tgish branches

The call to ref_exists() isn't needed because $_dep_is_tgish from
recurse_deps() gives us exactly this information.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agotg-update: fix user visible typo in info msg
Ilpo Järvinen [Thu, 28 May 2009 06:04:33 +0000 (09:04 +0300)]
tg-update: fix user visible typo in info msg

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
8 years agotg-remote: don't add push specs but warn about existing ones.
Uwe Kleine-König [Wed, 13 May 2009 09:59:51 +0000 (11:59 +0200)]
tg-remote: don't add push specs but warn about existing ones.

topgit used to add some push specs to assert that topbases are pushed,
too.  This should now be handled by tg-push.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Marc Weber <marco-oweber@gmx.de>
Tested-and-acked-by: martin f. krafft <madduck@debian.org>
Cc: 528442@bugs.debian.org
8 years agotg-push: new command pushing a tgish branch
Marc Weber [Tue, 12 May 2009 08:54:51 +0000 (10:54 +0200)]
tg-push: new command pushing a tgish branch

It pushes recursively all deps and bases together with the branch.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
Tested-and-acked-by: martin f. krafft <madduck@madduck.net>
[ukleinek: fixed some nitpicks and changed remote handling]
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Weber <marco-oweber@gmx.de>
8 years agorecurse_deps: if no_remotes is set don't recurse into remote deps
Uwe Kleine-König [Mon, 11 May 2009 20:32:54 +0000 (22:32 +0200)]
recurse_deps: if no_remotes is set don't recurse into remote deps

This is based on a patch by Marc Weber.  It will be used by tg-push.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Weber <marco-oweber@gmx.de>
8 years agoremove test for git send-email
Uwe Kleine-König [Sun, 10 May 2009 21:59:46 +0000 (23:59 +0200)]
remove test for git send-email

This test didn't work as expected with certain pagers (e.g. vimpager)
when stdout is redirected to a non-terminal.  Now it's the actual call
to git send-email that generates a very similar error message.

Reported-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-and-tested-by: Antonio Ospite <ospite@studenti.unina.it>
8 years agoBug#526392: [PATCH] Provide default values for tg2quilt.mk variables
Frédéric Brière [Thu, 30 Apr 2009 21:34:49 +0000 (17:34 -0400)]
Bug#526392: [PATCH] Provide default values for tg2quilt.mk variables

tg2quilt.mk currently requires that $(QUILT_PATCH_DIR) and
$(QUILT_STAMPFN) be set explicitly, either via quilt.make or manually.

This makes $(QUILT_PATCH_DIR) default to debian/patches, which is the
location used by most packages, now made semi-official with the 3.0
(quilt) source format.

As for $(QUILT_STAMPFN), it is set to "patch" by default, which is
probably the safest and blandest value, being the recommended target
name per Policy.

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agodepend: don't disallow adding a dependency on a non-TopGit-branch
Uwe Kleine-König [Mon, 20 Apr 2009 09:42:53 +0000 (11:42 +0200)]
depend: don't disallow adding a dependency on a non-TopGit-branch

there is no techical reason not to depend on more than one
non-TopGit-branch.  You can argue if you want it though.  This patch
lets you decide if you want it or not.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agohooks/pre-commit.sh: fix bashism
Uwe Kleine-König [Thu, 26 Mar 2009 08:52:26 +0000 (09:52 +0100)]
hooks/pre-commit.sh: fix bashism

This was introduced in fcb488d51e72c7414f9beb40ad06bf529b8b38dc.
A similar fix was suggested by martin f krafft, too.

Reported-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Bert Wesarg <bert.wesarg@googlemail.com>
Tested-by: Bert Wesarg <bert.wesarg@googlemail.com>
8 years agohooks/pre-commit.sh: don't stop commits on non-topgit branches
Uwe Kleine-König [Tue, 24 Mar 2009 21:16:48 +0000 (22:16 +0100)]
hooks/pre-commit.sh: don't stop commits on non-topgit branches

This is a regression introduced by c32d1dd4fcafad3f9c570adeda580a90d56

"${head_#refs/heads/#refs/top-bases#}" doesn't substitute refs/heads by
refs/top-bases, but strips the prefix of $head_ if it starts with
"refs/heads/#refs/top-bases#".

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agodon't use return when being sourced
Uwe Kleine-König [Tue, 24 Mar 2009 20:46:23 +0000 (21:46 +0100)]
don't use return when being sourced

Fabien Thomas reports that a Bourne (not Again) sh on FreeBSD just
ignores the return and continues executing with the rest of the script.

So just wrap everything that was skipped by the return using other
shells in a big if instead.

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

8 years agohooks/pre-commit.sh: don't wail on detached head for missing .top* files
Uwe Kleine-König [Fri, 20 Mar 2009 19:40:07 +0000 (20:40 +0100)]
hooks/pre-commit.sh: don't wail on detached head for missing .top* files

This fixes a warning

fatal: ref HEAD is not a symbolic ref

when your HEAD is detached.

And branches under refs/top-bases/ don't need these files either.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoOptimize creation of orig.tar.gz a bit
Uwe Kleine-König [Tue, 17 Mar 2009 09:35:04 +0000 (10:35 +0100)]
Optimize creation of orig.tar.gz a bit

Checking out the tag isn't necessary.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agofix typo s/follopwing/following/
Uwe Kleine-König [Tue, 17 Mar 2009 09:25:59 +0000 (10:25 +0100)]
fix typo s/follopwing/following/

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoUpdate Debian policy version (no changes needed)
Uwe Kleine-König [Mon, 16 Mar 2009 07:53:36 +0000 (08:53 +0100)]
Update Debian policy version (no changes needed)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoAdd GPLv2 and description for S-o-b
Uwe Kleine-König [Fri, 13 Mar 2009 09:18:17 +0000 (10:18 +0100)]
Add GPLv2 and description for S-o-b

The intend is to clearify the copyright situation.  I'm not a lawyer,
but it should now be better than before.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoCall git-rerere after a failing merge as git-merge does
Uwe Kleine-König [Sun, 8 Mar 2009 21:15:16 +0000 (22:15 +0100)]
Call git-rerere after a failing merge as git-merge does

This maybe does all the hard work for you ...

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoFix merge failure handling in tg export
Uwe Kleine-König [Sun, 8 Mar 2009 20:52:14 +0000 (21:52 +0100)]
Fix merge failure handling in tg export

There exist two problems that show that up to now the error handling was
completely untested:

  - tg.sh uses `set -e`, so `git merge $branch; retmerge=$?` obviously
    doesn't do the right thing.
  - in recurse_deps stdin is redirected from $_depsfile.  Starting a
    shell with that doesn't give the user any chance to do something.

Reported-by: "Bernhard R. Link" <brlink@debian.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoPass -- to diff-tree for branch/filename disambiguation
Uwe Kleine-König [Sat, 7 Mar 2009 20:01:30 +0000 (21:01 +0100)]
Pass -- to diff-tree for branch/filename disambiguation

Script to show the need of this patch:

mkdir ty;
cd ty;
git init-db;
touch a;
git add a;
git commit -m "...";
tg create bla;
git commit -m "...";
mkdir bla;
touch bla/blub;
git add bla/blub;
git commit -m "...";
tg export --quilt tt;

Reported-by: "Bernhard R. Link" <brlink@debian.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agodocument maintainer and uploader change in debian/changlog
Uwe Kleine-König [Thu, 5 Mar 2009 14:58:35 +0000 (15:58 +0100)]
document maintainer and uploader change in debian/changlog

The actual change was 0a871830e7be1c6a.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agonew upstream release topgit-0.7
Uwe Kleine-König [Thu, 5 Mar 2009 11:10:40 +0000 (12:10 +0100)]
new upstream release topgit-0.7

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoMerge tag 'topgit-0.7' of git://repo.or.cz/topgit
Uwe Kleine-König [Thu, 5 Mar 2009 10:40:25 +0000 (11:40 +0100)]
Merge tag 'topgit-0.7' of git://repo.or.cz/topgit

8 years agobump version number to 0.7
Uwe Kleine-König [Thu, 5 Mar 2009 10:29:07 +0000 (11:29 +0100)]
bump version number to 0.7

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agomake removing quilt patches dir more robust
Uwe Kleine-König [Thu, 5 Mar 2009 09:19:05 +0000 (10:19 +0100)]
make removing quilt patches dir more robust

This way errors only occur if something goes really wrong, so don't feed
to /dev/null and don't ignore non-zero exit status.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: martin f. krafft <madduck@debian.org>
8 years agolimit tg branches to those ready for deployment
martin f. krafft [Thu, 5 Mar 2009 10:02:22 +0000 (11:02 +0100)]
limit tg branches to those ready for deployment

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoswitch back to DH6 compat until we use DH7
martin f. krafft [Thu, 5 Mar 2009 09:52:33 +0000 (10:52 +0100)]
switch back to DH6 compat until we use DH7

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agopoint only to the GPLv2 common-licence
martin f. krafft [Thu, 5 Mar 2009 09:45:52 +0000 (10:45 +0100)]
point only to the GPLv2 common-licence

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoChange maintainer to list and add Uwe as uploader
martin f. krafft [Thu, 5 Mar 2009 09:31:24 +0000 (10:31 +0100)]
Change maintainer to list and add Uwe as uploader

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoUpdate packaging copyright to GPLv2 and include 2009
martin f. krafft [Thu, 5 Mar 2009 09:29:56 +0000 (10:29 +0100)]
Update packaging copyright to GPLv2 and include 2009

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoFix typo s/emmail/email/
Uwe Kleine-König [Tue, 3 Mar 2009 09:31:22 +0000 (10:31 +0100)]
Fix typo s/emmail/email/

This was introduced by a tired coder in d479474440713.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoMerge branch 'upstream' of git.debian.org:/git/collab-maint/topgit
Uwe Kleine-König [Tue, 3 Mar 2009 09:30:10 +0000 (10:30 +0100)]
Merge branch 'upstream' of git.debian.org:/git/collab-maint/topgit

8 years agoAdd documentation for tg export --linearize
Uwe Kleine-König [Tue, 3 Mar 2009 09:01:23 +0000 (10:01 +0100)]
Add documentation for tg export --linearize

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoDon't throw away already started base on resumed create.
Uwe Kleine-König [Sun, 1 Mar 2009 19:55:40 +0000 (20:55 +0100)]
Don't throw away already started base on resumed create.

The problem was that after a failure to create the patch base the
resuming tg create did reset HEAD to the next tree to merge in which is
the right thing for a pristine create.

This addresses Debian Bug #513018 and is based on a patch by the bug
reporter Gábor Braun.  A recipe triggering the bug is part of the report
that can be found at http://bugs.debian.org/513018.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoSuggest git-email package
martin f. krafft [Sun, 1 Mar 2009 17:59:33 +0000 (18:59 +0100)]
Suggest git-email package

Signed-off-by: martin f. krafft <madduck@debian.org>
Conflicts:

debian/changelog
debian/control

8 years agoAlso suggest make.
martin f. krafft [Sun, 1 Mar 2009 15:40:48 +0000 (16:40 +0100)]
Also suggest make.

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agofix the PATCHES_DIR deprecation warning
martin f. krafft [Sun, 1 Mar 2009 11:39:29 +0000 (12:39 +0100)]
fix the PATCHES_DIR deprecation warning

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agoDeprecate tg2quilt.mk's $PATCHES_DIR variable
martin f. krafft [Sun, 1 Mar 2009 11:25:59 +0000 (12:25 +0100)]
Deprecate tg2quilt.mk's $PATCHES_DIR variable

put a warning in place to point people to $QUILT_PATCH_DIR instead.

8 years agoSuggest the quilt package
martin f. krafft [Fri, 27 Feb 2009 17:00:30 +0000 (18:00 +0100)]
Suggest the quilt package

8 years ago[TOPGIT] implement linearize export method
Uwe Kleine-König [Thu, 15 Jan 2009 21:45:57 +0000 (22:45 +0100)]
[TOPGIT] implement linearize export method

This is a draft that seems to work for my test case.  The error handling
is to be improved though.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years ago[TOPGIT] make creating a commit from a topgit branch a function
Uwe Kleine-König [Wed, 14 Jan 2009 20:26:18 +0000 (21:26 +0100)]
[TOPGIT] make creating a commit from a topgit branch a function

This helps avoiding code duplication for the next commit.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years ago[TOPGIT] make tg remote idempotent
Uwe Kleine-König [Wed, 14 Jan 2009 20:23:51 +0000 (21:23 +0100)]
[TOPGIT] make tg remote idempotent

Before this patch each call to tg remote added three config entries
no matter if they already existed.  After some time my .git/config was
crowded.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years ago[TOPGIT] allow working with annihilated branches
Uwe Kleine-König [Wed, 25 Feb 2009 19:44:11 +0000 (20:44 +0100)]
[TOPGIT] allow working with annihilated branches

If you decide that you want to drop a patch, you can just merge in its
base with strategy "theirs".  Then you have base=topic and so no .top*
files any more.  This patch fixes tg summary and the helper function
recurse_deps() to handle these annihilated branches as if they don't
exist and don't show up in .topdeps files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years ago[TOPGIT] limit rev-list in branch_contains to a single rev
Uwe Kleine-König [Wed, 25 Feb 2009 10:05:00 +0000 (11:05 +0100)]
[TOPGIT] limit rev-list in branch_contains to a single rev

This eases reading of debug output using sh -x and probably helps
performance, too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoFix GPL version in copyright file (closes: #514157).
martin f. krafft [Wed, 4 Feb 2009 19:51:58 +0000 (20:51 +0100)]
Fix GPL version in copyright file (closes: #514157).

8 years agobump version number to 0.6
martin f. krafft [Fri, 23 Jan 2009 05:33:43 +0000 (16:33 +1100)]
bump version number to 0.6

8 years agoput tg version into a variable at the top
martin f. krafft [Fri, 23 Jan 2009 05:33:29 +0000 (16:33 +1100)]
put tg version into a variable at the top

8 years agotg-patch: add support for generating patches against worktree and index
Kirill Smelkov [Wed, 21 Jan 2009 20:18:42 +0000 (23:18 +0300)]
tg-patch: add support for generating patches against worktree and index

This implements `tg patch -i` and `tg patch -w` to see current patch as
generated against not-yet-committed index and worktree.

NOTE: unfortunately `git cat-file blob <file>` does not provide an option
to cat file from worktree (only from an object or from index), so I had to
unroll my own `cat file topic:file` with special support for '(i)' and
'(w)' topics.

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
8 years agotg-patch: fix pagination
Kirill Smelkov [Wed, 21 Jan 2009 20:18:42 +0000 (23:18 +0300)]
tg-patch: fix pagination

Previously, when I was invoking `tg patch` the following used to happen:

1. .topmsg content was sent directly to _terminal_
2. for each file in the patch, its diff was generated with `git diff`
   and sent to *PAGER*
3. trailing 'tg: ...' was sent to terminal again

So the problem is that while `tg patch >file` works as expected, plain
`tg patch` does not -- in pager there is only a part of the whole patch
(first file diff) and header and trailer are ommitted.

I've finally decided to fix this inconvenience, and the way it works is
like in git -- we just hook `setup_pager` function in commands which
need to be paginated.

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
8 years agoImplement setup_pager just like in git
Kirill Smelkov [Wed, 21 Jan 2009 20:18:42 +0000 (23:18 +0300)]
Implement setup_pager just like in git

setup_pager() spawns a pager process and redirect the rest of our output
to it.

This will be needed to fix `tg patch` output in the next commit.

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
8 years agomake tg remote idempotent
Uwe Kleine-König [Wed, 14 Jan 2009 20:23:51 +0000 (21:23 +0100)]
make tg remote idempotent

Before this patch each call to tg remote added three config entries
no matter if they already existed.  After some time my .git/config was
crowded.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
8 years agoCheck for git-send-email and die if not found
martin f. krafft [Wed, 21 Jan 2009 03:36:45 +0000 (14:36 +1100)]
Check for git-send-email and die if not found

Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg-completion: complete options for `tg remote`
Kirill Smelkov [Mon, 5 Jan 2009 15:08:20 +0000 (18:08 +0300)]
tg-completion: complete options for `tg remote`

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg-completion: complete options for `tg summary`
Kirill Smelkov [Mon, 5 Jan 2009 15:08:19 +0000 (18:08 +0300)]
tg-completion: complete options for `tg summary`

Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg export (quilt): Implement numbering the patches
Uwe Kleine-König [Fri, 19 Dec 2008 22:21:48 +0000 (23:21 +0100)]
tg export (quilt): Implement numbering the patches

To ease sending patches, with --numbered each patch gets a number prefix
similar to the output of git format-patch.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg export (quilt): Implement flattening patch paths
Uwe Kleine-König [Fri, 19 Dec 2008 21:40:33 +0000 (22:40 +0100)]
tg export (quilt): Implement flattening patch paths

The result of providing the new flag --flatten is that the exported
patches are all placed directly in the output directory, not in
subdirectories below it.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: martin f. krafft <madduck@debian.org>
8 years agotg export (collapse): implement skipping empty patches
Uwe Kleine-König [Fri, 19 Dec 2008 21:18:37 +0000 (22:18 +0100)]
tg export (collapse): implement skipping empty patches

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoNote in tg2quilt.mk's header the need to soft-include the file
martin f. krafft [Tue, 2 Dec 2008 09:52:56 +0000 (10:52 +0100)]
Note in tg2quilt.mk's header the need to soft-include the file

This avoids the build dependency on topgit as debian/rules can be used
just fine without the file present.

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoREADME: spelling fixes
Jonas Fonseca [Tue, 2 Dec 2008 07:45:46 +0000 (08:45 +0100)]
README: spelling fixes

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agotg-summary: -t and --graphviz are mutual exclusive
Bert Wesarg [Wed, 26 Nov 2008 18:39:45 +0000 (19:39 +0100)]
tg-summary: -t and --graphviz are mutual exclusive

The -t and --graphviz don't work together, the output is not what one expect.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agotg-export: implement skipping empty patches for quilt mode
Uwe Kleine-König [Wed, 26 Nov 2008 12:13:00 +0000 (13:13 +0100)]
tg-export: implement skipping empty patches for quilt mode

addionally fix the README item for skipping the export of empty patches
not to need an option (-n) as this should be the default.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoPass -- to rev-list for branch/filename disambiguation
Marc Weber [Fri, 21 Nov 2008 09:05:30 +0000 (10:05 +0100)]
Pass -- to rev-list for branch/filename disambiguation

While playing around it happened that I called the topic branch and
a file "foo"... Here is a small incomplete patch: I've not tried to
catch all of these errors..

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoAdd Vim modelines for consistent spacing
martin f. krafft [Thu, 20 Nov 2008 14:46:05 +0000 (15:46 +0100)]
Add Vim modelines for consistent spacing

TopGit shell scripts use tabs and this commit instructs Vim via modeline not
to expand tabs.

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@ucw.cz>
9 years agoNote that do_help is used when short messages might be wanted
martin f. krafft [Thu, 20 Nov 2008 14:24:16 +0000 (15:24 +0100)]
Note that do_help is used when short messages might be wanted

From http://marc.info/?l=git&m=122718711327376&w=2, by Petr:

  Note that I think these changes are reasonable only as long as do_help
  is just a short two-line usage help; in the event we also implement a
  longer help, it certainly shouldn't be printed in these cases.

This commit adds a comment to the do_help function to remind us.

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoPrint help message when command is not proper
martin f. krafft [Thu, 20 Nov 2008 14:06:19 +0000 (15:06 +0100)]
Print help message when command is not proper

When invoked with an unknown subcommand, or when --help is sought for
a command that does not exist, TopGit prints the help message.

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
9 years agoRequire an argument to tg -r
martin f. krafft [Thu, 20 Nov 2008 14:04:48 +0000 (15:04 +0100)]
Require an argument to tg -r

Right now, if -r is passed to tg, an ugly shift error occurs. This patch
checks for that case and outputs the help message if it occurs.

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
9 years agoImplement installation of contrib/tg-completion.bash
Uwe Kleine-König [Thu, 20 Nov 2008 09:53:47 +0000 (10:53 +0100)]
Implement installation of contrib/tg-completion.bash

Previously, the bash completion was not installed. This patch fixes
that.

Signed-off-by: Uwe Kleine-König <ukleinek@strlen.de>
Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoremove duplicate installation dir
martin f. krafft [Thu, 20 Nov 2008 10:58:27 +0000 (11:58 +0100)]
remove duplicate installation dir

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoPrint help output when no command is given
martin f. krafft [Wed, 19 Nov 2008 15:10:23 +0000 (16:10 +0100)]
Print help output when no command is given

As much as I love your message (although you really ought not be
throwing around ducks!), this is more user-friendly.

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
9 years agoCheck for cmddir earlier
martin f. krafft [Wed, 19 Nov 2008 15:08:02 +0000 (16:08 +0100)]
Check for cmddir earlier

Without cmddir, tg is basically useless, even do_help() needs it, so
check it first and die hard if not found

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
9 years agoChange tg help exit code to 0
martin f. krafft [Wed, 19 Nov 2008 15:07:02 +0000 (16:07 +0100)]
Change tg help exit code to 0

Printing --help is not an error, but a successful operation, if the help
output could be printed.

Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
9 years agoProvide new tg2quilt target tg-cleanexport to recreate debian/patches.
martin f. krafft [Wed, 19 Nov 2008 16:59:42 +0000 (17:59 +0100)]
Provide new tg2quilt target tg-cleanexport to recreate debian/patches.

9 years agoadd emacs modeline
martin f. krafft [Wed, 19 Nov 2008 16:17:37 +0000 (17:17 +0100)]
add emacs modeline

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agopass --no-print-directory to sub make invocations
martin f. krafft [Wed, 19 Nov 2008 16:13:30 +0000 (17:13 +0100)]
pass --no-print-directory to sub make invocations

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agofix hardcoding of patch dir
martin f. krafft [Wed, 19 Nov 2008 15:57:22 +0000 (16:57 +0100)]
fix hardcoding of patch dir

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agodo not use MAKEFLAGS
martin f. krafft [Wed, 19 Nov 2008 15:57:09 +0000 (16:57 +0100)]
do not use MAKEFLAGS

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agomake __tg-temp-export target phony
martin f. krafft [Wed, 19 Nov 2008 15:55:56 +0000 (16:55 +0100)]
make __tg-temp-export target phony

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoreuse quilt variables
martin f. krafft [Wed, 19 Nov 2008 15:54:56 +0000 (16:54 +0100)]
reuse quilt variables

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoclose README snippet bug too
martin f. krafft [Wed, 19 Nov 2008 14:38:46 +0000 (15:38 +0100)]
close README snippet bug too

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoadd ignore patterns for quilt and debian build
martin f. krafft [Wed, 19 Nov 2008 14:44:15 +0000 (15:44 +0100)]
add ignore patterns for quilt and debian build

Signed-off-by: martin f. krafft <madduck@debian.org>
9 years agoMake sure gitignore patterns are not recursive
martin f. krafft [Wed, 19 Nov 2008 14:42:47 +0000 (15:42 +0100)]
Make sure gitignore patterns are not recursive

9 years agoupdate since HOWTO is gzipped after install
martin f. krafft [Wed, 19 Nov 2008 14:37:26 +0000 (15:37 +0100)]
update since HOWTO is gzipped after install