b25b20656d
use strip() iso. slicing for removing \n
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:20:50 -03:00
b76f0565bf
use string.strip() iso. slicing.
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:19:10 -03:00
8b41a97f8a
clone and sync --keep-path to keep perforce path to module.
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:18:31 -03:00
6754a299d8
minor cleanups
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:17:27 -03:00
bce4c5fc0b
cleanup
...
- use re.sub() iso. if for stripping ...
- spacing nits
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:15:43 -03:00
b016d39756
Robustness fixes for pipes
...
- add read_pipe(), read_pipe_lines(), write_pipe(), which
check pipe.close()
- use throughout
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 11:15:29 -03:00
c8cbbee980
Fix my email address, this isn't really KDE related :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-28 14:43:25 +02:00
7cb5cbefd2
rename apply() to applyCommit(); apply is a python builtin
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 14:29:11 +02:00
cebdf5af31
reformatting: break long lines.
...
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 14:28:58 +02:00
ce6f33c835
Cleanups
...
- don't use dir (python builtin)
- use re for munging depotPath into destination
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
2007-05-28 14:22:53 +02:00
a3c55c09ec
Fix creation of refs/remotes/p4/HEAD symbolic ref
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-27 15:48:01 +02:00
cb4f1280dd
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25 22:34:30 +02:00
877db584aa
Forgot to remove this TODO item when I made --with-origin the default :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25 19:43:38 +02:00
d414c74afd
Shortcut the case where we have no origin branch
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-25 11:36:42 +02:00
01265103fe
Make --with-origin the default for syncing.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-25 10:36:10 +02:00
417a7a6fc8
Make --with-origin also work without origin :)
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-25 10:28:46 +02:00
4280e53333
Make git-p4 work with packed refs (don't use os.path.exists to check for the
...
existance of a ref)
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25 08:49:18 +02:00
65c5f3e3f2
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25 08:44:41 +02:00
10f880f8d4
Oops, fix --with-origin to /really/ also call git fetch :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24 22:28:28 +02:00
abcd790fe9
Added support for --with-origin with multi-branch imports
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24 22:25:36 +02:00
2cc58fd99a
Forgot to remove this return statement from debugging
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24 22:10:40 +02:00
d1874ed33b
Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24 21:23:04 +02:00
c1f9197f37
Replace \r\n with \n when importing from p4 on Windows
...
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
2007-05-24 14:17:29 +02:00
ebd8116870
Load the user map from p4 only once at run-time.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-24 00:24:52 +02:00
b3fd1b2808
Fix multi-branch import with --silent.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 23:53:14 +02:00
ad192f2888
Fix p4 execution in git-p4 rollback.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 23:44:19 +02:00
66a2f52395
Catch p4 errors in rollback early enough (before deleting refs!)
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 23:40:48 +02:00
ac3e0d79ee
Oops, fill the /list/ correct with the p4 exit code.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 23:32:32 +02:00
a6d5da36af
Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
...
When the p4 command failed write out the exit code in the returned dict.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 23:29:01 +02:00
0c66a78393
Make rollback work with locally imported branches
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 20:07:57 +02:00
65d2ade95e
Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 16:41:46 +02:00
57284050a8
Use refs/heads/* instead of refs/heads/p4/* for local imports
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 00:15:50 +02:00
01a9c9c5a8
Added support for --max-changes=<count> to ease import debugging
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 00:07:35 +02:00
a028a98e9a
Added support for importing multiple branches into refs/heads instead of just refs/remotes
...
using --import-local. Needs some further microfix but seems to work otherwise.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23 00:03:08 +02:00
52102d4784
Fixes for rollback, delete branches that did not exist at the specified p4 change
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 23:44:24 +02:00
af8da89cb7
Fix branch detection in multi-branch imports
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 23:25:51 +02:00
5834684d51
Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 22:57:06 +02:00
7944f1425c
Make git-p4 submit --direct safer by also creating a git commit
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 11:04:26 +02:00
cbf5efa61a
Detect with git-p4 submit --direct when there are no changes in the working directory
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 10:08:11 +02:00
faf1bd2026
Fix git symbolic-ref warning on initial clone
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 10:05:30 +02:00
dc52403696
Fix error detection with git-p4 submit when the requested depot path is not in the client view.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 09:34:56 +02:00
33be3e6550
Fix conversion from old style heads/p4 to remotes/p4/master
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-21 08:44:16 +02:00
341dc1c179
Improved output for multi branch imports and noted another little todo item
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-21 00:39:16 +02:00
b1561ee256
Another (potentially life-saving) idea for submit --direct
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 23:52:51 +02:00
24f7b53fdd
Had an idea for debugging, record it :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 23:42:22 +02:00
8a5fc95b43
Specifying --detect-branches is now only needed for the initial clone/sync.
...
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master
are found.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-20 23:39:40 +02:00
c1b296b9f1
Added support for git-p4 submit --direct (experimental)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 16:55:05 +02:00
47a130b7bf
Use git format-patch and git apply --apply when extracting patches from git and
...
applying them to a Perforce checkout. This should make it possible to apply git
commits with binary files that cannot be handled by path.
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 16:33:21 +02:00
64ffb06a9c
Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 15:24:01 +02:00
59fa417109
Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 15:15:34 +02:00
b607e71efd
Cache the output of "p4 users" for faster syncs on high latency links.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-20 10:55:54 +02:00
9bda3a8556
Removed unused variable, more cleanups
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-19 12:05:40 +02:00
71b112d4a4
More cleanups and speedups for labels and branches
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-19 11:54:11 +02:00
d5904674d1
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>
2007-05-19 11:07:32 +02:00
29bdbac1cd
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>
2007-05-19 10:23:12 +02:00
8f9b2e082b
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>
2007-05-18 22:13:26 +02:00
4b97ffb1e4
Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18 21:45:23 +02:00
66c6a9b559
Removed unused cache variables.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18 20:39:38 +02:00
05094f987c
Fix branch setup after initial clone.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-18 20:32:35 +02:00
71bd9bacec
Removed todo item that is implemented :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17 22:22:26 +02:00
ef48f9093c
Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17 22:17:49 +02:00
48df6fd850
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>
2007-05-17 21:18:53 +02:00
c6d44cb1a1
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>
2007-05-17 20:57:05 +02:00
8ead4fda3f
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>
2007-05-17 20:26:58 +02:00
1c9d393d30
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>
2007-05-17 20:15:47 +02:00
8a2820def4
Removed cleantags command. It doesn't have any meaning anymore.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17 19:44:50 +02:00
463e8af655
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>
2007-05-17 09:13:54 +02:00
f9162f6a4c
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>
2007-05-17 09:09:05 +02:00
5c4153e488
Fixing syncing (gitdir discovery / cd) for bare repositories
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17 07:42:38 +02:00
ca0affe7bb
A little todo note before I forget it :), based on a suggestion from Lars.
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16 13:15:34 +02:00
dc1a93b6dc
Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16 12:12:39 +02:00
c3c4624451
Give a better hint if git-p4 submit fails
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16 09:43:13 +02:00
d336c15835
Added the possibility of skipping patches during git-p4 submit
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-16 09:41:46 +02:00
81f2373f89
Make git-p4 work with bare repositories.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-15 23:06:43 +02:00
cd6cc0d318
Fix git-p4 clone //depot/project (head import)
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-15 16:15:26 +02:00
25df95cce4
Make submitting work on Windows.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-15 15:15:07 +02:00
caace11112
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>
2007-05-15 15:15:07 +02:00
0848358055
Use the subprocess module instead of popen2 to make it work on Windows.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-05-15 14:27:56 +02:00
2835925139
Cleanup, removed the old tagging code
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01 23:26:19 +02:00
8f8725314d
cleanup, renamed self.globalPrefix to self.depotPath
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01 23:23:00 +02:00
1c094184da
Micro cleanup
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01 23:15:48 +02:00
51a2640afd
Handle patch errors in git-p4 submit better.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-15 09:59:56 +02:00
90865adc01
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>
2007-04-15 09:34:15 +02:00
5e80dd4d7e
Slightly improved formatting of the raw_input questions.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14 16:09:43 +02:00
8b72ca0f76
Removed the old patch apply code from git-p4 submit.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14 16:05:54 +02:00
f291b4e3d4
Fix the timezone formatting. Now qgit also displays (parses) it correctly.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-14 11:21:50 +02:00
fd4ca86a0b
Print an error message of some sort if git fast-import fails.
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-13 22:21:10 +02:00
80b5910fac
Allow for convenient rebasing after git-p4 submit
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-09 12:43:40 +02:00
10c3211b81
fix variable usage (oops)
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08 10:15:47 +02:00
c45b1cfe1e
Fix file determination for #head imports
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08 10:13:32 +02:00
f9a3a4f796
Added git-p4 clone convenience command
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08 10:08:26 +02:00
68ed351ab5
Honor --silent for labels
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08 09:00:55 +02:00
cb53e1f8e9
Turn off potentially slow label detection by default
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08 00:12:02 +02:00
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
01ce1fe967
Added git-p4 rebase convenience
...
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-07 23:46:50 +02:00
711544b00c
Clean up python class names.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-04-01 15:40:46 +02:00
2a9489c024
Fix "compilation" :)
...
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-04-01 13:39:39 +02:00
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
a46668faf7
Fix variable usage in tag import
...
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-28 17:05:38 +02:00
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
Han-Wen Nienhuys
Simon Hausmann
Simon Hausmann
Marius Storm-Olsen
Simon Hausmann