undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
232 Commits 1 Branch 0 Tags 217 MiB
a52d5c7bc0
Commit Graph

140 Commits

Author SHA1 Message Date
Simon Hausmann
a52d5c7bc0 Fix depot-path determination for git-p4 submit 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 13:10:20 +02:00
Simon Hausmann
b0d10df77a Fix git-p4 submit 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 13:09:14 +02:00
Simon Hausmann
68c4215306 Fix git-p4 rebase 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 12:51:03 +02:00
Simon Hausmann
6509e19cd1 Hack to make the multi-branch import work again with self.depotPaths now that 
self.depotPath is gone

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 09:41:53 +02:00
Simon Hausmann
330f53b8d6 Don't attempt to set the initialParent on multi-branch imports (useless). 
At some point the code paths should be unified, but for now I need a working
git-p4 :)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 09:39:51 +02:00
Simon Hausmann
583e170706 Fix common path "calculation" from logs of multiple branches. 
Need to use min instead of max for prev/cur to avoid out-of-bounds
string access. Also treat "i" as index of the last match instead of
a length because in case of a complete match of the two strings
i was off by one.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 09:37:13 +02:00
Simon Hausmann
845b42cb6c Fix support for "depot-path" in older git-p4 imports 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-07 09:19:34 +02:00
Han-Wen Nienhuys
7530a40ce2 look for 'text' and 'binary' files. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-06-05 20:29:59 -03:00
Han-Wen Nienhuys
b1ce944726 thinko: really ignore deleted files. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 14:21:58 -03:00
Han-Wen Nienhuys
b17f88b544 remove debug print 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 12:40:24 -03:00
Han-Wen Nienhuys
86dff6b676 Cleanups & import into p4/master for local import 
- import into master/local if --import-local is set

- use Die() for exiting

- if --verbose is set, raise Exception()

- use joined strings iso. `list` for progress printing

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 12:38:30 -03:00
Han-Wen Nienhuys
d2c6dd30ef use p4CmdList() to get file contents in Python dicts. This is more robust. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 11:29:25 -03:00
Han-Wen Nienhuys
f2eda79f69 only run p4 print if necessary 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 18:50:41 -03:00
Han-Wen Nienhuys
982bb8a303 don't p4 print deleted files. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 17:33:18 -03:00
Han-Wen Nienhuys
96e07dd23c read files before creating the commit. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:57:59 -03:00
Han-Wen Nienhuys
a3287be5bc thinko. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:38:32 -03:00
Han-Wen Nienhuys
183b8ef89b store p4 user cache in home directory. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:35:32 -03:00
Han-Wen Nienhuys
9320da8dd4 Thinko, fix buglet. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:22:57 -03:00
Han-Wen Nienhuys
6a49f8e2e0 Read p4 files in one batch. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:21:46 -03:00
Han-Wen Nienhuys
b86f73782e remove global .gitdir 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 13:58:19 -03:00
Han-Wen Nienhuys
5e926eed9f Merge origin. 2007-05-30 13:46:25 -03:00
Han-Wen Nienhuys
bb6e09b27a 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

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 13:44:15 -03:00
Simon Hausmann
cfeb59be25 Fix typo in listExistingP4Branches that broke sync. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-28 19:24:57 +02:00
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>
 2007-05-28 19:23:19 +02:00
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>
 2007-05-28 12:50:04 -03:00
Han-Wen Nienhuys
4addad2291 add --verbose to all commands. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:45:26 -03:00
Han-Wen Nienhuys
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
Han-Wen Nienhuys
b76f0565bf use string.strip() iso. slicing. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:19:10 -03:00
Han-Wen Nienhuys
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
Han-Wen Nienhuys
6754a299d8 minor cleanups 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:17:27 -03:00
Han-Wen Nienhuys
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
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>
 2007-05-28 11:15:29 -03:00
Simon Hausmann
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
Han-Wen Nienhuys
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
Han-Wen Nienhuys
cebdf5af31 reformatting: break long lines. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 14:28:58 +02:00
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>
 2007-05-28 14:22:53 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
01265103fe Make --with-origin the default for syncing. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-25 10:36:10 +02:00
Simon Hausmann
417a7a6fc8 Make --with-origin also work without origin :) 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-25 10:28:46 +02:00
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>
 2007-05-25 08:49:18 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
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>
 2007-05-24 21:23:04 +02:00
Marius Storm-Olsen
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
Simon Hausmann
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