| 2007-06-07 |
Simon Hausmann | Fix git-p4 rebase
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-06-07 |
Simon Hausmann | Hack to make the multi-branch import work again with...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-06-07 |
Simon Hausmann | Don't attempt to set the initialParent on multi-branch...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-06-07 |
Simon Hausmann | Fix common path "calculation" from logs of multiple branches.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-06-07 |
Simon Hausmann | Fix support for "depot-path" in older git-p4 imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-28 |
Simon Hausmann | Fix typo in listExistingP4Branches that broke sync.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-28 |
Simon Hausmann | In *_pipe print the command that failed if it fails.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-28 |
Simon Hausmann | Fix my email address, this isn't really KDE related :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-28 |
Han-Wen Nienhuys | rename apply() to applyCommit(); apply is a python builtin
|
commit | commitdiff | tree |
| 2007-05-28 |
Han-Wen Nienhuys | reformatting: break long lines.
|
commit | commitdiff | tree |
| 2007-05-28 |
Han-Wen Nienhuys | Cleanups
|
commit | commitdiff | tree |
| 2007-05-27 |
Simon Hausmann | Fix creation of refs/remotes/p4/HEAD symbolic ref
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Added git-p4 submit --trust-me-like-a-fool for the...
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Forgot to remove this TODO item when I made --with...
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Shortcut the case where we have no origin branch
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Make --with-origin the default for syncing.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Make --with-origin also work without origin :)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Make git-p4 work with packed refs (don't use os.path...
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-25 |
Simon Hausmann | Avoid creating non-p4 branches in remotes/p4 off of...
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-24 |
Simon Hausmann | Oops, fix --with-origin to /really/ also call git fetch :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-24 |
Simon Hausmann | Added support for --with-origin with multi-branch imports
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-24 |
Simon Hausmann | Forgot to remove this return statement from debugging
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-24 |
Simon Hausmann | Fix creating the remotes/p4 branches based on origin...
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-24 |
Marius Storm-Olsen | Replace \r\n with \n when importing from p4 on Windows
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Load the user map from p4 only once at run-time.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Fix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Fix p4 execution in git-p4 rollback.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Catch p4 errors in rollback early enough (before deleting refs!)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Oops, fill the /list/ correct with the p4 exit code.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Don't make len(p4Cmd("p4 changes -m 1 //foo/..."))...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Make rollback work with locally imported branches
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-23 |
Simon Hausmann | Avoid calling git symbolic-ref refs/heads/p4//HEAD...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-22 |
Simon Hausmann | Doc updates
Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
| 2007-05-22 |
Simon Hausmann | Use refs/heads/* instead of refs/heads/p4/* for local imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 2007-05-22 |
Simon Hausmann | Added support for --max-changes=<count> to ease import debugging
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
| 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 a git commit
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/master
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 --direct
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 /correctly/ :)
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 branches.
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 anymore.
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-p4 submit
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 |
Marius Storm-Olsen | Make the command call silent
|
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) and
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 fails.
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 |
| next |
projects / git.git / search