2007-05-22 |
Simon Hausmann | Added support for importing multiple branches into... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Fixes for rollback, delete branches that did not exist... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Fix branch detection in multi-branch imports Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Added a rollback command for debugging. It sets back... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Make git-p4 submit --direct safer by also creating... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Detect with git-p4 submit --direct when there are no... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Fix git symbolic-ref warning on initial clone Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Fix error detection with git-p4 submit when the requested... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-21 |
Simon Hausmann | Fix conversion from old style heads/p4 to remotes/p4... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Improved output for multi branch imports and noted... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Another (potentially life-saving) idea for submit ... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Had an idea for debugging, record it :) Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Specifying --detect-branches is now only needed for... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Added support for git-p4 submit --direct (experimental) Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Use git format-patch and git apply --apply when extracting... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Oops, not only /set/ gitdir on clone, also set it ... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Fix gitdir not being set when cloning. Needed for writing... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-20 |
Simon Hausmann | Cache the output of "p4 users" for faster syncs on... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-19 |
Simon Hausmann | Removed unused variable, more cleanups Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-19 |
Simon Hausmann | More cleanups and speedups for labels and branches Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-19 |
Simon Hausmann | Cleanup/speed up the branch<> file split and removed... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-19 |
Simon Hausmann | More work on the incremental importing of multiple... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-18 |
Simon Hausmann | Give branches a nice project prefix and don't bail... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-18 |
Simon Hausmann | Started rewriting the branch detection, based on "p4... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-18 |
Simon Hausmann | Removed unused cache variables. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-18 |
Simon Hausmann | Fix branch setup after initial clone. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Removed todo item that is implemented :) Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Added support for git-p4 sync/rebase --with-origin... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Bite the bullet and automatically convert old style... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Changed the default p4 import branch to be refs/remotes... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Create the origin based import branch using git update... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Removed ancient and unused code to find the last imported... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Removed cleantags command. It doesn't have any meaning... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Clean up code duplication for revision parsing and... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Always pass a sha1 for the initial parent so that git... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-17 |
Simon Hausmann | Fixing syncing (gitdir discovery / cd) for bare repositories Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-16 |
Simon Hausmann | A little todo note before I forget it :), based on... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-16 |
Simon Hausmann | Fix calling git-p4 rebase from within a subdirectory... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-16 |
Simon Hausmann | Give a better hint if git-p4 submit fails Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-16 |
Simon Hausmann | Added the possibility of skipping patches during git... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Make git-p4 work with bare repositories. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Fix git-p4 clone //depot/project (head import) Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Converted to unix newlines Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Make submitting work on Windows. Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Make sure all popen calls use binary mode (for Windows... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Added a little .bat wrapper from Marius Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-05-15 |
Simon Hausmann | Use the subprocess module instead of popen2 to make... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-05-07 |
Simon Hausmann | Document some implementation details, for the curious... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-01 |
Simon Hausmann | Cleanup, removed the old tagging code Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-01 |
Simon Hausmann | cleanup, renamed self.globalPrefix to self.depotPath Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-01 |
Simon Hausmann | Micro cleanup Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-01 |
Simon Hausmann | Doc cleanups. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-15 |
Simon Hausmann | Handle patch errors in git-p4 submit better. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-15 |
Simon Hausmann | A new attempt at fixing the child-fast-import-process... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-14 |
Simon Hausmann | Slightly improved formatting of the raw_input questions. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-14 |
Simon Hausmann | Removed the old patch apply code from git-p4 submit. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-14 |
Simon Hausmann | Fix the timezone formatting. Now qgit also displays... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-13 |
Simon Hausmann | Print an error message of some sort if git fast-import... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-09 |
Simon Hausmann | Allow for convenient rebasing after git-p4 submit Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-08 |
Simon Hausmann | Added a simple example of usage to the "documentation" :) Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-08 |
Simon Hausmann | fix variable usage (oops) Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-08 |
Simon Hausmann | Fix file determination for #head imports Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-08 |
Simon Hausmann | Added git-p4 clone convenience command Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-08 |
Simon Hausmann | Honor --silent for labels Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-07 |
Simon Hausmann | Turn off potentially slow label detection by default Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-07 |
Simon Hausmann | Provide a tree summary after git-p4 rebase Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-07 |
Simon Hausmann | Added git-p4 rebase convenience Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-04-01 |
Simon Hausmann | Clean up python class names. Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-04-01 |
Simon Hausmann | Fix "compilation" :) Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-29 |
Simon Hausmann | Fix the docs for git-p4 submit and turn git-p4 submit... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-28 |
Simon Hausmann | Fix variable usage in tag import Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-26 |
Simon Hausmann | Added support for mapping p4 labels to git tags Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-26 |
Simon Hausmann | git-p4 debug doesn't need a git repository Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-25 |
Simon Hausmann | Don't try to parse any options with git-p4 debug but... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-24 |
Simon Hausmann | Prefer git command over git-command. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-24 |
Simon Hausmann | Minor cosmetic fixlet for the git-p4 submit sync question. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-24 |
Simon Hausmann | Different versions of p4 have different output for... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-23 |
Simon Hausmann | Use the new incremental import style by default Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-03-23 |
Simon Hausmann | Make it possible to run git-p4 submit from within the... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Brand new smart incremental import that doesn't need... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Set the default branch in run, not in the constructor Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Helper function to check the existance of a revision Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Added some helper function(s) to parse the depot path... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Changed the default branch for imports from "master... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Changed the format of the imported log message slightly... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-22 |
Simon Hausmann | Removed the .py extension from git-p4 as it's annoying... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Don't show the submit template and the diff first in... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Make it possible to invoke git-p4 from within subdirectories... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Made --apply-as-patch the default for git-p4 submit... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Fix support for deletions in git-p4 submit when using... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Added experimental but super-fast --apply-as-patch... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-21 |
Simon Hausmann | Documentation enhancements. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | Start of the git-p4 documentation. Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | Removed p4-fast-export and p4-git-sync as they've been... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | Fixed the initial version import by getting the file... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | Added missing "self"s to make the script evaluate correctly. Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | Completely untested "merge" of p4-fast-export.py into... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-20 |
Simon Hausmann | sync-to-perforce is now called submit and fixed the... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-19 |
Simon Hausmann | Part of the code is copyright by Trolltech ASA. Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |
2007-03-19 |
Simon Hausmann | First (untested) attempt at migrating p4-git-sync into... Signed-off-by: Simon Hausmann <hausmann@kde.org>
|
commit | commitdiff | tree |