Simon Hausmann
|
9226c03c32
|
In *_pipe print the command that failed if it fails.
Fixed old calls to mypopen.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Han-Wen Nienhuys
|
6326aa5866
|
Extract multiple paths concurrently.
This enables importing just the interesting bits of large
repositories.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
4addad2291
|
add --verbose to all commands.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
b25b20656d
|
use strip() iso. slicing for removing \n
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
b76f0565bf
|
use string.strip() iso. slicing.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
8b41a97f8a
|
clone and sync --keep-path to keep perforce path to module.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
6754a299d8
|
minor cleanups
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
bce4c5fc0b
|
cleanup
- use re.sub() iso. if for stripping ...
- spacing nits
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
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>
|
18 years ago |
Simon Hausmann
|
c8cbbee980
|
Fix my email address, this isn't really KDE related :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Han-Wen Nienhuys
|
7cb5cbefd2
|
rename apply() to applyCommit(); apply is a python builtin
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
cebdf5af31
|
reformatting: break long lines.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Han-Wen Nienhuys
|
ce6f33c835
|
Cleanups
- don't use dir (python builtin)
- use re for munging depotPath into destination
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
|
18 years ago |
Simon Hausmann
|
a3c55c09ec
|
Fix creation of refs/remotes/p4/HEAD symbolic ref
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
cb4f1280dd
|
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
877db584aa
|
Forgot to remove this TODO item when I made --with-origin the default :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
d414c74afd
|
Shortcut the case where we have no origin branch
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
01265103fe
|
Make --with-origin the default for syncing.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
417a7a6fc8
|
Make --with-origin also work without origin :)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |
Simon Hausmann
|
65c5f3e3f2
|
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
10f880f8d4
|
Oops, fix --with-origin to /really/ also call git fetch :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
abcd790fe9
|
Added support for --with-origin with multi-branch imports
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
2cc58fd99a
|
Forgot to remove this return statement from debugging
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
d1874ed33b
|
Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Marius Storm-Olsen
|
c1f9197f37
|
Replace \r\n with \n when importing from p4 on Windows
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
|
18 years ago |
Simon Hausmann
|
ebd8116870
|
Load the user map from p4 only once at run-time.
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
b3fd1b2808
|
Fix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
ad192f2888
|
Fix p4 execution in git-p4 rollback.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
66a2f52395
|
Catch p4 errors in rollback early enough (before deleting refs!)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
ac3e0d79ee
|
Oops, fill the /list/ correct with the p4 exit code.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |
Simon Hausmann
|
0c66a78393
|
Make rollback work with locally imported branches
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
65d2ade95e
|
Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
a396b29267
|
Doc updates
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
57284050a8
|
Use refs/heads/* instead of refs/heads/p4/* for local imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
01a9c9c5a8
|
Added support for --max-changes=<count> to ease import debugging
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |
Simon Hausmann
|
52102d4784
|
Fixes for rollback, delete branches that did not exist at the specified p4 change
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
af8da89cb7
|
Fix branch detection in multi-branch imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |
Simon Hausmann
|
7944f1425c
|
Make git-p4 submit --direct safer by also creating a git commit
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
cbf5efa61a
|
Detect with git-p4 submit --direct when there are no changes in the working directory
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
faf1bd2026
|
Fix git symbolic-ref warning on initial clone
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |
Simon Hausmann
|
33be3e6550
|
Fix conversion from old style heads/p4 to remotes/p4/master
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
341dc1c179
|
Improved output for multi branch imports and noted another little todo item
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
|
18 years ago |
Simon Hausmann
|
b1561ee256
|
Another (potentially life-saving) idea for submit --direct
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
24f7b53fdd
|
Had an idea for debugging, record it :)
Signed-off-by: Simon Hausmann <simon@lst.de>
|
18 years ago |
Simon Hausmann
|
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>
|
18 years ago |