Simon Hausmann
|
1f52af6c73
|
Provide a tree summary after git-p4 rebase
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-04-08 00:07:02 +02:00 |
|
Simon Hausmann
|
01ce1fe967
|
Added git-p4 rebase convenience
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-04-07 23:46:50 +02:00 |
Simon Hausmann
|
711544b00c
|
Clean up python class names.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-04-01 15:40:46 +02:00 |
|
Simon Hausmann
|
2a9489c024
|
Fix "compilation" :)
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-04-01 13:39:39 +02:00 |
|
Simon Hausmann
|
c9b50e6307
|
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>
|
2007-03-29 19:15:24 +02:00 |
|
Simon Hausmann
|
a46668faf7
|
Fix variable usage in tag import
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-28 17:05:38 +02:00 |
|
Simon Hausmann
|
1f4ba1cbfc
|
Added support for mapping p4 labels to git tags
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-26 22:34:34 +02:00 |
|
Simon Hausmann
|
8910ac0e88
|
git-p4 debug doesn't need a git repository
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-26 08:18:55 +02:00 |
|
Simon Hausmann
|
e20a9e530a
|
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>
|
2007-03-26 00:13:51 +02:00 |
|
Simon Hausmann
|
9863f4055e
|
Prefer git command over git-command.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-24 16:35:05 +01:00 |
|
Simon Hausmann
|
274917a3d6
|
Minor cosmetic fixlet for the git-p4 submit sync question.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-24 09:18:20 +01:00 |
|
Simon Hausmann
|
cb2c9db507
|
Different versions of p4 have different output for the where command ;(
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-24 09:15:11 +01:00 |
Simon Hausmann
|
967f72e21b
|
Use the new incremental import style by default
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
2007-03-23 09:30:41 +01:00 |
|
Simon Hausmann
|
9512497bcf
|
Make it possible to run git-p4 submit from within the git repository
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-23 09:16:07 +01:00 |
|
Simon Hausmann
|
179caebff4
|
Brand new smart incremental import that doesn't need tags or git repo-config :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-22 22:17:42 +01:00 |
|
Simon Hausmann
|
569d1bd409
|
Set the default branch in run, not in the constructor
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-22 21:34:16 +01:00 |
|
Simon Hausmann
|
8136a6399c
|
Helper function to check the existance of a revision
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-22 21:27:14 +01:00 |
|
Simon Hausmann
|
6ae8de88f5
|
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>
|
2007-03-22 21:10:25 +01:00 |
|
Simon Hausmann
|
f5816a5522
|
Changed the default branch for imports from "master" to "p4"
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-22 20:36:28 +01:00 |
|
Simon Hausmann
|
a559b289bd
|
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>
|
2007-03-22 20:27:41 +01:00 |
|
Simon Hausmann
|
e7f0d0d9b9
|
Removed the .py extension from git-p4 as it's annoying to type every time.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-22 09:15:32 +01:00 |
|
Simon Hausmann
|
53150250b1
|
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>
|
2007-03-21 21:04:12 +01:00 |
|
Simon Hausmann
|
2061865005
|
Make it possible to invoke git-p4 from within subdirectories of a git working tree.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-21 13:05:30 +01:00 |
|
Simon Hausmann
|
1932a6ac7c
|
Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-21 11:01:18 +01:00 |
|
Simon Hausmann
|
5d0b6042d4
|
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>
|
2007-03-21 10:57:54 +01:00 |
|
Simon Hausmann
|
04219c04b7
|
Added experimental but super-fast --apply-as-patch option to git-p4 submit
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-21 10:11:20 +01:00 |
|
Simon Hausmann
|
b4aa8d12b4
|
Documentation enhancements.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-21 08:27:33 +01:00 |
|
Simon Hausmann
|
0b69b46925
|
Start of the git-p4 documentation.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-20 22:41:00 +01:00 |
|
Simon Hausmann
|
c5fdcbcc20
|
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>
|
2007-03-20 22:09:27 +01:00 |
|
Simon Hausmann
|
c715706b15
|
Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-20 21:13:49 +01:00 |
|
Simon Hausmann
|
0828ab1403
|
Added missing "self"s to make the script evaluate correctly.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-20 20:59:30 +01:00 |
|
Simon Hausmann
|
b984733c80
|
Completely untested "merge" of p4-fast-export.py into git-p4.py
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-20 20:54:23 +01:00 |
|
Simon Hausmann
|
05140f342e
|
sync-to-perforce is now called submit and fixed the gitdir check a little bit
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-20 18:32:47 +01:00 |
|
Simon Hausmann
|
83dce55af3
|
Part of the code is copyright by Trolltech ASA.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 22:26:36 +01:00 |
|
Simon Hausmann
|
4f5cf76a55
|
First (untested) attempt at migrating p4-git-sync into the final git-p4 script
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 22:25:17 +01:00 |
|
Simon Hausmann
|
c8c3911685
|
Provide a little bit of help description for the git-p4 "tools".
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 21:02:30 +01:00 |
|
Simon Hausmann
|
86949eef40
|
Start moving the git-p4 tools into one single script.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 20:59:12 +01:00 |
|
Simon Hausmann
|
95d27cb75d
|
Pass the right number of arguments to commit, fixes single-branch imports.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 12:04:37 +01:00 |
|
Simon Hausmann
|
09e16455e0
|
Improved the git dir detection.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-19 11:57:10 +01:00 |
|
Simon Hausmann
|
228d36c92b
|
Default to interactive syncing
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-16 13:47:46 +01:00 |
|
Simon Hausmann
|
f72537f97e
|
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>
|
2007-03-15 19:07:06 +01:00 |
|
Simon Hausmann
|
d566209e7f
|
Auto-detect the current git branch before submitting back to perforce.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-14 23:30:23 +01:00 |
|
Simon Hausmann
|
4d9e5fcea6
|
Ignore Apple resource files when importing from perforce to git.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
2007-03-14 19:03:16 +01:00 |
|
Simon Hausmann
|
d7873afdf4
|
Be nice and use /usr/bin/env python for the git-p4 scripts
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-14 17:33:46 +01:00 |
|
Simon Hausmann
|
794a913a00
|
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>
|
2007-03-14 17:31:47 +01:00 |
|
Simon Hausmann
|
09a14fb524
|
Lots of bugfixes to p4-git-sync.
Added interactive and dry-run mode.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-13 16:36:10 +01:00 |
|
Simon Hausmann
|
5aba82fd50
|
Fix git-dir option and allow reading log substitutions from a file
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-13 09:14:45 +01:00 |
|
Simon Hausmann
|
0bcff6121d
|
First version of a new script to submit changes back to perforce from git repositories.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-12 23:00:34 +01:00 |
|
Simon Hausmann
|
4fe2ca17f7
|
Split up the cache commandline options into (command) cache and data cache.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
2007-03-10 21:30:24 +01:00 |
|
Simon Hausmann
|
dd87020bd3
|
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>
|
2007-03-10 21:23:49 +01:00 |