Han-Wen Nienhuys
5016361592
Thinko, fix buglet.
2007-05-30 16:22:57 -03:00
Han-Wen Nienhuys
6460cf12df
Read p4 files in one batch.
2007-05-30 16:21:46 -03:00
Han-Wen Nienhuys
c246e21090
remove global .gitdir
2007-05-30 13:58:19 -03:00
Han-Wen Nienhuys
ae38e155d0
Merge origin.
2007-05-30 13:46:25 -03:00
Han-Wen Nienhuys
49ae8869e7
Diverse cleanups
...
- print commands with \n
- extractDepotPathsAndChangeFromGitLog -> extractSettings, returning
dict.
- store keepRepoPath in [git-p4: ] line
- create a main() function, so git-p4 can be pychecked
- use --destination for clone destination. This simplifies logic
for --keep-path
2007-05-30 13:44:15 -03:00
Simon Hausmann
458e0545cb
Fix typo in listExistingP4Branches that broke sync.
2007-05-28 19:24:57 +02:00
Simon Hausmann
e49c494d27
In *_pipe print the command that failed if it fails.
...
Fixed old calls to mypopen.
2007-05-28 19:23:19 +02:00
Han-Wen Nienhuys
e274d94177
Extract multiple paths concurrently.
...
This enables importing just the interesting bits of large
repositories.
2007-05-28 12:50:04 -03:00
Han-Wen Nienhuys
aba960de59
add --verbose to all commands.
2007-05-28 11:45:26 -03:00
Han-Wen Nienhuys
79904ad286
use strip() iso. slicing for removing \n
2007-05-28 11:20:50 -03:00
Han-Wen Nienhuys
0e303e401d
use string.strip() iso. slicing.
2007-05-28 11:19:10 -03:00
Han-Wen Nienhuys
b1c7b0866f
clone and sync --keep-path to keep perforce path to module.
2007-05-28 11:18:31 -03:00
Han-Wen Nienhuys
7c32565090
minor cleanups
2007-05-28 11:17:27 -03:00
Han-Wen Nienhuys
829dde7184
cleanup
...
- use re.sub() iso. if for stripping ...
- spacing nits
2007-05-28 11:15:43 -03:00
Han-Wen Nienhuys
3c81f33f48
Robustness fixes for pipes
...
- add read_pipe(), read_pipe_lines(), write_pipe(), which
check pipe.close()
- use throughout
2007-05-28 11:15:29 -03:00
Han-Wen Nienhuys
73a8a9786e
add .dotest to .gitignore
2007-05-28 11:08:19 -03:00
Simon Hausmann
481694a31a
Fix my email address, this isn't really KDE related :)
2007-05-28 14:43:25 +02:00
Han-Wen Nienhuys
e22b86f010
rename apply() to applyCommit(); apply is a python builtin
2007-05-28 14:29:11 +02:00
Han-Wen Nienhuys
bd609cfd0f
reformatting: break long lines.
2007-05-28 14:28:58 +02:00
Han-Wen Nienhuys
a05b21cd97
Cleanups
...
- don't use dir (python builtin)
- use re for munging depotPath into destination
2007-05-28 14:22:53 +02:00
Simon Hausmann
175ea59305
Fix creation of refs/remotes/p4/HEAD symbolic ref
2007-05-27 15:48:01 +02:00
Simon Hausmann
741db7fa74
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
2007-05-25 22:34:30 +02:00
Simon Hausmann
f5af3efa26
Forgot to remove this TODO item when I made --with-origin the default :)
2007-05-25 19:43:38 +02:00
Simon Hausmann
7116f99151
Shortcut the case where we have no origin branch
2007-05-25 11:36:42 +02:00
Simon Hausmann
5cacfb60f5
Make --with-origin the default for syncing.
2007-05-25 10:36:10 +02:00
Simon Hausmann
c083b834af
Make --with-origin also work without origin :)
2007-05-25 10:28:46 +02:00
Simon Hausmann
7c2db22e2d
Make git-p4 work with packed refs (don't use os.path.exists to check for the
...
existance of a ref)
2007-05-25 08:49:18 +02:00
Simon Hausmann
2ccb8d4a2d
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
2007-05-25 08:44:41 +02:00
Simon Hausmann
78eb61f487
Oops, fix --with-origin to /really/ also call git fetch :)
2007-05-24 22:28:28 +02:00
Simon Hausmann
228b25f2dc
Added support for --with-origin with multi-branch imports
2007-05-24 22:25:36 +02:00
Simon Hausmann
0dedbed800
Forgot to remove this return statement from debugging
2007-05-24 22:10:40 +02:00
Simon Hausmann
7a9bd9a760
Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
2007-05-24 21:23:04 +02:00
Marius Storm-Olsen
e7d3ee6b59
Replace
...
with
when importing from p4 on Windows
2007-05-24 14:17:29 +02:00
Simon Hausmann
87e8a542af
Load the user map from p4 only once at run-time.
2007-05-24 00:24:52 +02:00
Simon Hausmann
dcce87a4bf
Fix multi-branch import with --silent.
2007-05-23 23:53:14 +02:00
Simon Hausmann
25a59c6c42
p4 p4 is not a valid p4 command :)
2007-05-23 23:44:19 +02:00
Simon Hausmann
244b953db5
Catch p4 errors in rollback early enough (before deleting refs!)
2007-05-23 23:40:48 +02:00
Simon Hausmann
d1edf40a27
Oops, fill the /list/ correct with the p4 exit code.
2007-05-23 23:32:32 +02:00
Simon Hausmann
409a4ab6ea
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.
2007-05-23 23:29:01 +02:00
Simon Hausmann
8796865166
Make rollback work with locally imported branches
2007-05-23 20:07:57 +02:00
Simon Hausmann
bcdf34c777
Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
2007-05-23 16:41:46 +02:00
Simon Hausmann
5a403c2cce
Doc updates
2007-05-23 00:33:34 +02:00
Simon Hausmann
985366f0e8
Use refs/heads/* instead of refs/heads/p4/* for local imports
2007-05-23 00:15:50 +02:00
Simon Hausmann
d8db890ea2
Added support for --max-changes=<count> to ease import debugging
2007-05-23 00:07:35 +02:00
Simon Hausmann
6e9ee62062
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.
2007-05-23 00:03:08 +02:00
Simon Hausmann
6ee645441b
Fixes for rollback, delete branches that did not exist at the specified p4 change
2007-05-21 23:44:24 +02:00
Simon Hausmann
ea975442b4
Fix branch detection in multi-branch imports
2007-05-21 23:25:51 +02:00
Simon Hausmann
b137492471
Added rollback command for debugging
2007-05-21 22:57:06 +02:00
Simon Hausmann
2ade241861
Make git-p4 submit --direct safer by also creating a git commit
2007-05-21 11:04:26 +02:00
Simon Hausmann
88916904b6
Detect with git-p4 submit --direct when there are no changes in the working directory
2007-05-21 10:08:11 +02:00
