2007-10-20 |
Simon Hausmann | git-p4: When skipping a patch as part of "git-p4 submit... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Added support for automatically importing newly... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Cleanup; moved the (duplicated) code for turning... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Cleanup; moved the code for the initial #head... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Cleanup; Turn self.revision into a function... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Cleanup; moved the code to import a list of... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Cleanup; moved the code for getting a sorted... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: After submission to p4 always synchronize from... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-09-03 |
Simon Hausmann | git-p4: Always call 'p4 sync ...' before submitting...
|
commit | commitdiff | tree |
2007-08-25 |
Simon Hausmann | git-p4: Fix warnings about non-existant refs/remotes... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-08-25 |
Simon Hausmann | git-p4: Make 'git-p4 branches' work after an initial... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-08-08 |
Simon Hausmann | git-p4: Fix git-p4 submit to include only changed files... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-08-08 |
Simon Hausmann | git-p4: Fix support for symlinks. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-07-25 |
Simon Hausmann | git-p4: Fix p4 user cache population on Windows. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-07-18 |
Simon Hausmann | git-p4: Cleanup, used common function for listing imported... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-07-18 |
Simon Hausmann | git-p4: Fix upstream branch detection for submit/rebase... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-07-18 |
Simon Hausmann | git-p4: Cleanup, make listExistingP4Branches a global... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-27 |
Simon Hausmann | git-new-workdir: Fix shell warning about operator ... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-21 |
Simon Hausmann | Make it possible to specify the HEAD for the internal... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-06-20 |
Simon Hausmann | Added git-p4 branches command that shows the mapping... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-17 |
Simon Hausmann | Warn about conflicting p4 branch mappings and use the... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-17 |
Simon Hausmann | Fix the branch mapping detection to be independent... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-16 |
Simon Hausmann | Fix initial multi-branch import. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-06-12 |
Simon Hausmann | Fix git-p4 rebase to detect the correct upstream branch... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-06-12 |
Simon Hausmann | Moved the code from git-p4 submit to figure out the... Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | git-p4 submit: Fix missing quotes around p4 commands... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Mention remotes/p4/master also in the documentation. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Provide some information for single branch imports... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Write out the options tag in the log message of imports... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Fix support for explicit disabling of syncing with... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Fix depot-paths encoding for multi-path imports (don... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-11 |
Simon Hausmann | Fix project name guessing Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-10 |
Simon Hausmann | Fix updating/creating remotes/p4/* heads from origin... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-09 |
Simon Hausmann | Fixed the check to make sure to exclude the HEAD symbolic... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-08 |
Simon Hausmann | Only get the expensive branch mapping from the p4 server... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-07 |
Simon Hausmann | Make git-p4 submit detect the correct reference (origin... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-07 |
Simon Hausmann | Make clone behave like git clone by default again. Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-06-07 |
Simon Hausmann | Fix depot-path determination for git-p4 submit Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
2007-06-07 |
Simon Hausmann | Fix git-p4 submit Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
commit | commitdiff | tree |
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... 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-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 |
Simon Hausmann | fast-import: Fix crash when referencing already existing... Signed-off-by: Simon Hausmann <simon@lst.de>
|
commit | commitdiff | tree |
2007-05-24 |
Simon Hausmann | fast-import: Fix uninitialized variable Signed-off-by: Simon Hausmann <simon@lst.de>
|
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... 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... 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... 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... 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 |
next |