git.tokkee.org Git - git.git/log

projects / git.git / log

commit | commitdiff | tree

Simon Hausmann [Sun, 20 May 2007 08:55:54 +0000 (10:55 +0200)]

Cache the output of "p4 users" for faster syncs on high latency links.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 19 May 2007 10:05:40 +0000 (12:05 +0200)]

Removed unused variable, more cleanups

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Sat, 19 May 2007 09:54:11 +0000 (11:54 +0200)]

More cleanups and speedups for labels and branches

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Sat, 19 May 2007 09:07:32 +0000 (11:07 +0200)]

Cleanup/speed up the branch<> file split and removed change range limitation that I added
for debugging (oops).

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Sat, 19 May 2007 08:23:12 +0000 (10:23 +0200)]

More work on the incremental importing of multiple branches.
Improved error detection by checking the exit code of git-fast-import.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Fri, 18 May 2007 20:13:26 +0000 (22:13 +0200)]

Give branches a nice project prefix and don't bail out on clone if we failed
to detect the master branch.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Fri, 18 May 2007 19:45:23 +0000 (21:45 +0200)]

Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Fri, 18 May 2007 18:39:38 +0000 (20:39 +0200)]

Removed unused cache variables.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Fri, 18 May 2007 18:32:35 +0000 (20:32 +0200)]

Fix branch setup after initial clone.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 20:22:26 +0000 (22:22 +0200)]

Removed todo item that is implemented :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 20:17:49 +0000 (22:17 +0200)]

Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 19:18:53 +0000 (21:18 +0200)]

Bite the bullet and automatically convert old style refs/heads/p4 repositories
to the new style refs/remotes/p4 branching.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 18:57:05 +0000 (20:57 +0200)]

Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}
instead of refs/heads/p4.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 18:26:58 +0000 (20:26 +0200)]

Create the origin based import branch using git update-ref instead of git branch
so that it's possible to have the import branch in refs/remotes.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 18:15:47 +0000 (20:15 +0200)]

Removed ancient and unused code to find the last imported revision from previous imports
to use for the current import by looking at the p4 tags. The current approach of using
the log message works better.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 17:44:50 +0000 (19:44 +0200)]

Removed cleantags command. It doesn't have any meaning anymore.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 07:13:54 +0000 (09:13 +0200)]

Clean up code duplication for revision parsing and fix previous commit to not
import into remotes/p4 (yet!).

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 07:02:45 +0000 (09:02 +0200)]

Always pass a sha1 for the initial parent so that git-fast-import doesn't think
it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 17 May 2007 05:42:38 +0000 (07:42 +0200)]

Fixing syncing (gitdir discovery / cd) for bare repositories

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Wed, 16 May 2007 11:15:34 +0000 (13:15 +0200)]

A little todo note before I forget it :), based on a suggestion from Lars.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Wed, 16 May 2007 10:12:39 +0000 (12:12 +0200)]

Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Wed, 16 May 2007 07:43:13 +0000 (09:43 +0200)]

Give a better hint if git-p4 submit fails

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Wed, 16 May 2007 07:41:26 +0000 (09:41 +0200)]

Added the possibility of skipping patches during git-p4 submit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 21:06:43 +0000 (23:06 +0200)]

Make git-p4 work with bare repositories.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 14:15:26 +0000 (16:15 +0200)]

Fix git-p4 clone //depot/project (head import)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Marius Storm-Olsen [Tue, 15 May 2007 13:51:25 +0000 (15:51 +0200)]

Make the command call silent

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 14:07:02 +0000 (16:07 +0200)]

Converted to unix newlines

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 13:15:39 +0000 (15:15 +0200)]

Make submitting work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 12:57:57 +0000 (14:57 +0200)]

Make sure all popen calls use binary mode (for Windows) and

also make gitBranchExists work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 12:42:56 +0000 (14:42 +0200)]

Added a little .bat wrapper from Marius

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 15 May 2007 12:31:06 +0000 (14:31 +0200)]

Use the subprocess module instead of popen2 to make it work on Windows.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 7 May 2007 18:14:17 +0000 (20:14 +0200)]

Document some implementation details, for the curious... :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 1 May 2007 21:26:19 +0000 (23:26 +0200)]

Cleanup, removed the old tagging code

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 1 May 2007 21:23:00 +0000 (23:23 +0200)]

cleanup, renamed self.globalPrefix to self.depotPath

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 1 May 2007 21:15:48 +0000 (23:15 +0200)]

Micro cleanup

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 1 May 2007 16:28:38 +0000 (18:28 +0200)]

Doc cleanups.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 15 Apr 2007 07:59:56 +0000 (09:59 +0200)]

Handle patch errors in git-p4 submit better.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 15 Apr 2007 07:34:15 +0000 (09:34 +0200)]

A new attempt at fixing the child-fast-import-process-not-finished race condition
in the clone command

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 14 Apr 2007 14:09:43 +0000 (16:09 +0200)]

Slightly improved formatting of the raw_input questions.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 14 Apr 2007 14:05:54 +0000 (16:05 +0200)]

Removed the old patch apply code from git-p4 submit.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 14 Apr 2007 09:21:50 +0000 (11:21 +0200)]

Fix the timezone formatting. Now qgit also displays (parses) it correctly.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Fri, 13 Apr 2007 20:21:10 +0000 (22:21 +0200)]

Print an error message of some sort if git fast-import fails.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Mon, 9 Apr 2007 10:43:40 +0000 (12:43 +0200)]

Allow for convenient rebasing after git-p4 submit

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 8 Apr 2007 08:21:56 +0000 (10:21 +0200)]

Added a simple example of usage to the "documentation" :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 8 Apr 2007 08:15:47 +0000 (10:15 +0200)]

fix variable usage (oops)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 8 Apr 2007 08:13:32 +0000 (10:13 +0200)]

Fix file determination for #head imports

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 8 Apr 2007 08:08:26 +0000 (10:08 +0200)]

Added git-p4 clone convenience command

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 8 Apr 2007 07:00:55 +0000 (09:00 +0200)]

Honor --silent for labels

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 7 Apr 2007 22:12:02 +0000 (00:12 +0200)]

Turn off potentially slow label detection by default

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 7 Apr 2007 22:07:02 +0000 (00:07 +0200)]

Provide a tree summary after git-p4 rebase

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 7 Apr 2007 21:46:50 +0000 (23:46 +0200)]

Added git-p4 rebase convenience

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sun, 1 Apr 2007 13:40:46 +0000 (15:40 +0200)]

Clean up python class names.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Sun, 1 Apr 2007 11:39:39 +0000 (13:39 +0200)]

Fix "compilation" :)

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Thu, 29 Mar 2007 17:15:24 +0000 (19:15 +0200)]

Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
simply git-p4 submit mytopicbranch.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 28 Mar 2007 15:05:38 +0000 (17:05 +0200)]

Fix variable usage in tag import

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 26 Mar 2007 20:34:34 +0000 (22:34 +0200)]

Added support for mapping p4 labels to git tags

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 26 Mar 2007 06:18:55 +0000 (08:18 +0200)]

git-p4 debug doesn't need a git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Sun, 25 Mar 2007 22:13:51 +0000 (00:13 +0200)]

Don't try to parse any options with git-p4 debug but pass it straight on to p4

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 24 Mar 2007 15:35:05 +0000 (16:35 +0100)]

Prefer git command over git-command.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 24 Mar 2007 08:18:20 +0000 (09:18 +0100)]

Minor cosmetic fixlet for the git-p4 submit sync question.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Sat, 24 Mar 2007 08:15:11 +0000 (09:15 +0100)]

Different versions of p4 have different output for the where command ;(

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Fri, 23 Mar 2007 08:30:41 +0000 (09:30 +0100)]

Use the new incremental import style by default

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

commit | commitdiff | tree

Simon Hausmann [Fri, 23 Mar 2007 08:16:07 +0000 (09:16 +0100)]

Make it possible to run git-p4 submit from within the git repository

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 21:17:42 +0000 (22:17 +0100)]

Brand new smart incremental import that doesn't need tags or git repo-config :)

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 20:34:16 +0000 (21:34 +0100)]

Set the default branch in run, not in the constructor

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 20:27:14 +0000 (21:27 +0100)]

Helper function to check the existance of a revision

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 20:10:25 +0000 (21:10 +0100)]

Added some helper function(s) to parse the depot path and change number from the log message

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 19:36:28 +0000 (20:36 +0100)]

Changed the default branch for imports from "master" to "p4"

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 19:27:41 +0000 (20:27 +0100)]

Changed the format of the imported log message slightly, so that it's easier to parse again.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Thu, 22 Mar 2007 08:13:01 +0000 (09:13 +0100)]

Removed the .py extension from git-p4 as it's annoying to type every time.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 20:04:12 +0000 (21:04 +0100)]

Don't show the submit template and the diff first in less but show it in $editor right away

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 12:05:30 +0000 (13:05 +0100)]

Make it possible to invoke git-p4 from within subdirectories of a git working tree.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 10:01:18 +0000 (11:01 +0100)]

Made --apply-as-patch the default for git-p4 submit as it's significantly faster.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 09:57:54 +0000 (10:57 +0100)]

Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 09:11:20 +0000 (10:11 +0100)]

Added experimental but super-fast --apply-as-patch option to git-p4 submit

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 21 Mar 2007 07:27:33 +0000 (08:27 +0100)]

Documentation enhancements.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 21:41:00 +0000 (22:41 +0100)]

Start of the git-p4 documentation.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 21:09:27 +0000 (22:09 +0100)]

Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 20:13:49 +0000 (21:13 +0100)]

Fixed the initial version import by getting the file index correct by correctly skipping deleted files.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 19:59:30 +0000 (20:59 +0100)]

Added missing "self"s to make the script evaluate correctly.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 19:54:23 +0000 (20:54 +0100)]

Completely untested "merge" of p4-fast-export.py into git-p4.py

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 20 Mar 2007 17:32:47 +0000 (18:32 +0100)]

sync-to-perforce is now called submit and fixed the gitdir check a little bit

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 21:26:36 +0000 (22:26 +0100)]

Part of the code is copyright by Trolltech ASA.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 21:25:17 +0000 (22:25 +0100)]

First (untested) attempt at migrating p4-git-sync into the final git-p4 script

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 20:02:30 +0000 (21:02 +0100)]

Provide a little bit of help description for the git-p4 "tools".

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 19:59:12 +0000 (20:59 +0100)]

Start moving the git-p4 tools into one single script.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 11:04:37 +0000 (12:04 +0100)]

Pass the right number of arguments to commit, fixes single-branch imports.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 19 Mar 2007 10:57:07 +0000 (11:57 +0100)]

Improved the git dir detection.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Fri, 16 Mar 2007 12:47:46 +0000 (13:47 +0100)]

Default to interactive syncing

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Thu, 15 Mar 2007 18:07:06 +0000 (19:07 +0100)]

Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 14 Mar 2007 22:30:23 +0000 (23:30 +0100)]

Auto-detect the current git branch before submitting back to perforce.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Wed, 14 Mar 2007 18:03:16 +0000 (19:03 +0100)]

Ignore Apple resource files when importing from perforce to git.

Signed-off-by: Simon Hausmann <simon@lst.de>

commit | commitdiff | tree

Simon Hausmann [Wed, 14 Mar 2007 16:33:46 +0000 (17:33 +0100)]

Be nice and use /usr/bin/env python for the git-p4 scripts

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Wed, 14 Mar 2007 16:29:46 +0000 (17:29 +0100)]

Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to

files that are deleted in the future.
Also do some Perforce cleaning

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 13 Mar 2007 15:36:10 +0000 (16:36 +0100)]

Lots of bugfixes to p4-git-sync.

Added interactive and dry-run mode.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Tue, 13 Mar 2007 08:14:45 +0000 (09:14 +0100)]

Fix git-dir option and allow reading log substitutions from a file

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Mon, 12 Mar 2007 22:00:34 +0000 (23:00 +0100)]

First version of a new script to submit changes back to perforce from git repositories.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Sat, 10 Mar 2007 20:30:24 +0000 (21:30 +0100)]

Split up the cache commandline options into (command) cache and data cache.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Sat, 10 Mar 2007 20:23:49 +0000 (21:23 +0100)]

Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

commit | commitdiff | tree

Simon Hausmann [Sat, 10 Mar 2007 16:46:49 +0000 (17:46 +0100)]

More work on branch detection by implementing changeIsBranchMerge().

Signed-off-by: Simon Hausmann <hausmann@kde.org>

Git - the stupid content tracker

RSS Atom

tokkee.org

Code