58 Commits

Author SHA1 Message Date
Miklos Vajna
677b4402a9 g: fix --set-push-urls
1) submodule's .git is possibly a file now

2) just use the logerrit alias, as

   - logerrit setup already set that up
   - possibly otherwise the right ssh key is not picked up

Change-Id: I4fb355a7f7ec7d549d2b06367f4fd10d06086374
2013-10-04 16:06:02 +02:00
Miklos Vajna
27925032cd g: ignore submodule changes
Change-Id: I6125dd018615bc7aa18bacc838ea602ccb0fabc1
2013-07-22 12:13:20 +02:00
Lionel Elie Mamane
aa1a988c74 Reintroduce --with-linked-git option
With slightly different semantics:
Instead of pointing at a previous checkout,
point at base directory of all repos.

Change-Id: I254ecc33071be53067c44610b030f737cf75a7ee
2013-06-21 13:36:33 +02:00
Miklos Vajna
73b50b7336 g clone: fix non-referenced cloning
Change-Id: I98d6f5c20bacbb5d6457857906c591fea034288a
2013-02-26 16:18:14 +01:00
Miklos Vajna
803137f471 configure: add --with-referenced-git option
This is similar to --with-linked-git, but:

1) It uses git submodule update --reference, so it works with submodules.

2) The created repo is a true git repo, except that its object database
reuses the referenced repo's objects, so it's a real speedup when e.g.
translations are enabled.

I intentionally didn't just fixed --with-linked-git, to make it clear
this is more like git clone --reference, not git-new-workdir.

Change-Id: I7c9584bce3670fd1e175b90aded2435cfe78056d
2013-02-09 19:21:53 +01:00
Norbert Thiebaud
0cac67b270 set-up the hooks for submodules for recent git setup
Change-Id: I52482d017966e1d9671f92f43ec9d8cac6daf602
2012-12-21 04:40:06 -06:00
Luboš Luňák
d449869617 ./g cannot reference builddir
Because either it's called from there, and then it's the current directory,
or otherwise the srcdir has no idea where the builddir is (or even how many
of them), and there's nothing to tell it.

Change-Id: I88c5fe8f015cc63a5aa7c327eb82ed751c3e8aa0
2012-12-11 16:39:02 +01:00
Luboš Luňák
c8c056fd20 BUILD_DIR -> BUILDDIR, to be consistent with the other *DIR
Change-Id: Ia80a1246a7e3c8862a50a3daf79aba5609b7df3a
2012-12-11 15:39:49 +01:00
Norbert Thiebaud
ae4e327739 Prepare for read-only source build
This patch allows to do

mkdir <build_dir>
cd <build_dir>
<src_root>/autogen.sh
make

Only the remaining dmake modules are poluting the <src_root>...
which will get eventually convererd to gmake...

Change-Id: Iefd64732fa12e096d554cff4eee6b777deb92338
Reviewed-on: https://gerrit.libreoffice.org/1273
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-11 14:26:30 +00:00
Jan Holesovsky
e1b59fc0c4 Fix --set-push-urls.
Change-Id: Ic3a424b5ac8c2168747bc7253f421bf5367beac7
2012-11-23 21:06:57 +01:00
Norbert Thiebaud
060219ac1a binfilter.die.die.die
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3
Reviewed-on: https://gerrit.libreoffice.org/1014
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-09 07:58:02 +00:00
Miklos Vajna
2a8cabe86a g: fix typo
Change-Id: I97484d8647549646117f6c51dde4eb17ec82c8be
2012-10-18 09:27:52 +02:00
Peter Foley
41b5c80add cleanup ./g output
Change-Id: I84a775ceb983ad21d4585a3c3718f99bbac5a282
2012-10-16 20:46:22 -04:00
Norbert Thiebaud
c58b4fcd35 missing fi in ./g
Change-Id: Ic763d7cd73c2a3df8e5d5146eaf795188d8c79d1
2012-10-16 11:28:27 -05:00
Norbert Thiebaud
a31714fb75 add tag support to ./g, try to optimize pre->post submerge situation
Change-Id: I052817865da6df193c0451eccc3b8b6f507845a3
2012-10-16 11:28:27 -05:00
Norbert Thiebaud
2c5cdc4d3e when switching to a pre-submodule point, clean-up the soft-link point
Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
2012-10-16 11:28:26 -05:00
Norbert Thiebaud
9152c42a65 submodules migration
Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
2012-10-16 11:28:26 -05:00
Jan Holesovsky
aa6808ba11 Update ./g --set-push-user to work with gerrit.
Change-Id: If83b29222740e9d479d8b3c9b9d90ccc3706cd49
2012-08-20 14:04:06 +02:00
Norbert Thiebaud
1659bbe429 suppress distracting message in ./g on some platform
we use perl to determine the absolute path of argument thought to be
fiels. but sometime they are not file at all and that call 'fail'.
The code is meant to deal with such case, but
on some platform that produce a scary message on stderr in the
middle of the build log.
This hide these messages.

Change-Id: I52d43e0b26847ab091d76fd446a05c4d84836a77
2012-07-21 07:21:11 -05:00
Bjoern Michaelsen
79e9a64299 make ./g robust against missing bin/repo-list file
Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb
2012-07-10 19:09:56 +02:00
Miklos Vajna
ae6d4aeb89 g push/status: use @{upstream} instead of origin
origin won't work if origin/HEAD points to nowhere, which is a valid
use-case.
2012-03-13 11:49:32 +01:00
Norbert Thiebaud
a7069c2aa2 git rev-parse argument are not files, no need to try to find abs-path
This was causing some error message on Windows
2011-11-29 11:00:12 -06:00
Stephan Bergmann
79e65eefd9 Added ./g -v switch to show git commands. 2011-11-29 16:57:16 +01:00
Michael Stahl
175f17b31e 'g': whitespace: expand tabs 2011-11-04 10:54:59 +01:00
Michael Stahl
a0eb50ac6c 'g': actually set up git hooks properly 2011-11-04 10:54:59 +01:00
Michael Meeks
2ed58be879 make --last-working checkout the last working version
thanks to Bjoern and Christian for tips.
2011-10-31 15:06:34 +00:00
Michael Meeks
8418eeb79b 'g' tool: fix silly error in --set-last-working 2011-10-27 12:54:47 +01:00
Michael Meeks
4d2803d706 initial cut at 'last working' feature to help windows builders 2011-10-25 16:25:27 +01:00
Miklos Vajna
889934e739 g: check if git is in PATH 2011-09-05 20:47:09 +02:00
Norbert Thiebaud
5c0b472433 remove debug-traces 2011-08-28 11:22:15 -05:00
Norbert Thiebaud
dc28f1945c mishap in ./g, issue with links creations 2011-08-28 11:21:34 -05:00
Norbert Thiebaud
b216943255 add ./g -z to just refresh the hooks and possibly other housekeeping 2011-08-27 23:42:18 -05:00
Norbert Thiebaud
71e5200756 use translations' own hooks. update the hooks after the clone/fetch/pull 2011-08-27 23:42:18 -05:00
Norbert Thiebaud
3d8fa59aca bootstrap is now core in ./g 2011-08-06 13:07:57 -05:00
Norbert Thiebaud
dfd64a3780 we don't need the repos_changed semaphore file anymore
./g was doing 2 pair of git show-ref --head HEAD
to figure out if something had change... notwidthstanding that it is a
complete waste for the case of ./g clone, the only reason this was
done was to touch a ./clone/repos_changed file that used to be
used back in the 'build repo' days (pre 3.4)

binned that.
2011-06-04 15:42:42 -05:00
Christian Dywan
0ffc0016e1 Don't print === decoration when running g grep
Otherwise g grep -l can't be used, for example with sed.
2011-05-18 16:39:22 +02:00
Tor Lillqvist
0f6ceedad9 Dont print misleading information 2011-05-06 16:37:19 +03:00
Norbert Thiebaud
67dd44fba7 add an option to ./g to have a compact <repo>:<value> output
This is usefull to collect the heads of the repos in a easily parsable
format
2011-05-01 03:26:45 -05:00
Andras Timar
066300b5aa use git hook instead of gitattributes filter for *.po files 2011-04-27 21:13:12 +02:00
Andras Timar
a5ca1dcb91 set .gitattributes filter for *.po files 2011-03-23 19:23:49 +01:00
Miklos Vajna
e175056684 Introduce a single .gitattributes file in bootstrap 2011-03-16 11:08:46 +01:00
Miklos Vajna
2a1d78c0b2 g: remove leftover debug echo 2011-03-12 23:25:27 +01:00
Bjoern Michaelsen
781086f067 teach ./g at least some basic manners when using commit -F
* still needs fixes for message files with relative paths
2011-03-07 14:55:26 +01:00
Thorsten Behrens
957600ba66 Use git pushurl, setup via --set-push-user now
An easy way to turn your set of repos into something you can push
from - after you've gotten commit rights on fd.o - just use
./g --set-push-user <your_user_name>
2011-02-10 17:29:41 +01:00
Michael Meeks
52e721c101 don't use -f flag if we just removed the existing link, thanks Florian 2011-01-21 11:27:41 +00:00
Michael Meeks
f8eb05ab0e Add --rewrite-account [username] option, inspired by Christina Roßmanith's work 2011-01-20 16:03:48 +00:00
Michael Meeks
5dd4778d66 cope with change of path, and broken absolute links this generates 2011-01-20 15:47:18 +00:00
Jan Holesovsky
86e5b4eff5 g: Give full path to the repo-list file. 2010-12-06 18:32:17 +01:00
Norbert Thiebaud
090d023b00 g clone now tolerate silently already cloned repos. 2010-12-05 19:10:02 -06:00
Jan Holesovsky
a16ea41c84 g: Configure git's push.default to tracking if it is not set. 2010-12-03 12:36:19 +01:00