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

287 Commits

Author SHA1 Message Date
Simon Hausmann
1c49fc197b git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function). 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-09-03 20:35:13 +02:00
Simon Hausmann
e87f37ae42 git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-09-03 20:34:56 +02:00
Simon Hausmann
4f6432d8cc git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-09-03 20:34:32 +02:00
Simon Hausmann
14594f4b57 git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-09-03 20:27:02 +02:00
Simon Hausmann
31f9ec129e git-p4: Always call 'p4 sync ...' before submitting to Perforce. 
Acked-by: Marius Storm-Olsen <marius@trolltech.com>
Acked-by: Thiago Macieira <thiago@kde.org>
 2007-09-03 20:27:02 +02:00
Simon Hausmann
0058a33a8e git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone. 
Don't create the p4/HEAD symbolic ref if p4/master doesn't exist yet.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-08-24 18:54:37 -07:00
Simon Hausmann
5ca4461728 git-p4: Make 'git-p4 branches' work after an initial clone with git clone from an origin-updated repository. 
After a clone with "git clone" of a repository the p4 branches are only in remotes/origin/p4/* and not in remotes/p4/*.
Separate the code for detection and creation out of the P4Sync command class into standalone methods and use them
from the P4Branches command.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-08-24 18:54:37 -07:00
Reece H. Dunn
7da660f437 git-p4: Fix the sorting of changelists when cloning a Perforce repository. 
When performing a git-p4 clone operation on a Perforce repository,
where the changelists change in order of magnitude (e.g. 100 to 1000),
the set of changes to import from is not sorted properly. This is
because the data in the list is strings not integers. The other place
where this is done already converts the value to an integer, so it is
not affected.

Acked-by: Simon Hausmann <simon@lst.de>
 2007-08-13 15:23:14 -07:00
Simon Hausmann
ea99c3ae0e git-p4: Fix git-p4 submit to include only changed files in the perforce submit template. 
Parse the files section in the "p4 change -o" output and remove lines with file changes in unrelated depot paths.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-08-08 13:45:04 -07:00
Simon Hausmann
74276ec6f2 git-p4: Fix support for symlinks. 
Detect symlinks as file type, set the git file mode accordingly and strip off the trailing newline in the p4 print output.
Make the mode handling a bit more readable at the same time.

Signed-off-by: Simon Hausmann <simon@lst.de>
Acked-by: Brian Swetland <swetland@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-08-08 01:58:05 -07:00
Han-Wen Nienhuys
7fcff9def5 Fix style nit in Python slicing. 
Python slices start at 0 by default.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-08-02 09:40:28 +02:00
Han-Wen Nienhuys
a4eba020f9 Sort output of "p4 change" in incremental import before further 
processing

P4 change outputs the changes sorted for each directory separately. We
want the global ordering on the changes, hence we sort.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-08-02 09:40:25 +02:00
Simon Hausmann
b2d2d16af7 git-p4: Fix p4 user cache population on Windows. 
Fall back to USERPROFILE if HOME isn't set.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-07-25 16:06:54 -07:00
Simon Hausmann
144ff46b19 git-p4: Cleanup, used common function for listing imported p4 branches 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-07-18 17:29:38 +02:00
Simon Hausmann
86506fe54c git-p4: Fix upstream branch detection for submit/rebase with multiple branches. 
Don't use git name-rev to locate the upstream git-p4 branch for rebase and submit but instead locate the branch by comparing the depot paths.
name-rev may produce results like wrongbranch~12 as it uses the first match.

Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
 2007-07-18 17:29:31 +02:00
Simon Hausmann
062410bb9d git-p4: Cleanup, make listExistingP4Branches a global function for later use. 
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
 2007-07-18 17:29:05 +02:00
Scott Lamb
788001908c git-p4: input to "p4 files" by stdin instead of arguments 
This approach, suggested by Alex Riesen, bypasses the need for xargs-style
argument list handling. The handling in question looks broken in a corner
case with SC_ARG_MAX=4096 and final argument over 96 characters.

Signed-off-by: Scott Lamb <slamb@slamb.org>
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-07-17 08:35:33 +02:00
Scott Lamb
9f90c7335e git-p4: use subprocess in p4CmdList 
This allows bidirectional piping - useful for "-x -" to avoid commandline
arguments - and is a step toward bypassing the shell.

Signed-off-by: Scott Lamb <slamb@slamb.org>
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-07-17 08:35:24 +02:00
Marius Storm-Olsen
48b4c3d5ab Fix git-p4 on Windows to not use the Posix sysconf function. 
Add condition for Windows, since it doesn't support the os.sysconf module.
We hardcode the commandline limit to 2K, as that should work on most
Windows platforms.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Acked-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-07-14 22:47:14 -04:00
Simon Hausmann
9ceab36375 Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function. 
This isn't used right now in git-p4 but I use it in an external script that loads git-p4 as module.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-22 00:00:34 +02:00
Simon Hausmann
09d89de2e3 Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-20 23:13:20 +02:00
Simon Hausmann
1a2edf4e8d Warn about conflicting p4 branch mappings and use the first one found. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-17 15:10:24 +02:00
Simon Hausmann
6555b2ccfe Fix the branch mapping detection to be independent from the order of the "p4 branches" output. 
Collect "unknown" source branches separately and register them at the end.

Also added a minor speed up to splitFilesIntoBranches by breaking out of the loop through all branches when it's safe.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-17 11:25:59 +02:00
Benjamin Sergeant
da4a660161 git-p4 fails when cloning a p4 depo. 
A perforce command with all the files in the repo is generated to get
all the file content.
Here is a patch to break it into multiple successive perforce command
who uses 4K of parameter max, and collect the output for later.

It works, but not for big depos, because the whole perforce depo
content is stored in memory in P4Sync.run(), and it looks like mine is
bigger than 2 Gigs, so I had to kill the process.

[Simon: I added the bit about using SC_ARG_MAX, as suggested by Han-Wen]

Signed-off-by: Benjamin Sergeant <bsergean@gmail.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-16 22:06:06 +02:00
Simon Hausmann
3c699645f5 Fix initial multi-branch import. 
The list of existing p4 branches in git wasn't initialized.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-16 13:09:21 +02:00
Marius Storm-Olsen
cbae7080a7 Only use double quotes on Windows 
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
 2007-06-12 15:27:52 +02:00
Simon Hausmann
d7e3868cdf Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally 
always rebasing on top of remotes/p4/master

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-12 14:34:46 +02:00
Simon Hausmann
27d2d8119b Moved the code from git-p4 submit to figure out the upstream branch point 
into a separate helper method.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-06-12 14:31:59 +02:00
Simon Hausmann
e6b711f00e git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames 
Noticed by Alex Riesen

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 23:41:41 +02:00
Simon Hausmann
a9d1a27af1 Provide some information for single branch imports where the commits go 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 23:28:03 +02:00
Kevin Green
c3bf3f1301 git-p4: check for existence of repo dir before trying to create 
When using git-p4 in this manner:

git-p4 clone //depot/path/project myproject

If "myproject" already exists as a dir, but not a valid git repo, it fails
to create the directory.

Signed-off-by: Kevin Green <Kevin.Green@morganstanley.com>
 2007-06-11 23:15:38 +02:00
Simon Hausmann
6581de096e Write out the options tag in the log message of imports only if we actually have 
options

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 10:01:58 +02:00
Simon Hausmann
a43ff00c7c Fix support for explicit disabling of syncing with the origin 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 09:59:27 +02:00
Simon Hausmann
86fda6a327 Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 08:54:45 +02:00
Simon Hausmann
6e5295c4d3 Fix project name guessing 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-11 08:50:57 +02:00
Simon Hausmann
cae7b732d8 Fix updating/creating remotes/p4/* heads from origin/p4/* 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-10 10:57:40 +02:00
Simon Hausmann
7aded26ce8 Fixed the check to make sure to exclude the HEAD symbolic refs when updating 
the remotes/p4 branches from origin.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-10 00:22:30 +02:00
Han-Wen Nienhuys
5265bfcb06 also strip p4/ from local imports. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-06-08 19:31:49 -03:00
Han-Wen Nienhuys
69d8cc8b99 Merge branch 'master' of git://repo.or.cz/fast-export 2007-06-08 18:19:23 -03:00
Han-Wen Nienhuys
1b9a46849a print error message when p4 print fails (eg. due to permission problems) 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-06-08 18:19:16 -03:00
Simon Hausmann
df450923a2 Only get the expensive branch mapping from the p4 server when not 
syncing with the help of an origin remote (which we instead then use
to get new branches from).

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-08 08:49:22 +02:00
Simon Hausmann
a3fdd57901 Make git-p4 submit detect the correct reference (origin) branch when 
working with multi-branch imports.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-07 22:54:32 +02:00
Simon Hausmann
5e100b5cd7 Make clone behave like git clone by default again. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-06-07 21:52:12 +02:00
Marius Storm-Olsen
c4b33253c2 Exclude the HEAD symbolic ref from the list of known branches 
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
 2007-06-07 15:28:04 +02:00
Marius Storm-Olsen
db775559c2 Fix single branch import into remotes 
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
 2007-06-07 15:13:59 +02:00
Marius Storm-Olsen
98ad4faf95 Fix git-p4 clone (defaultDestination) 
Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
 2007-06-07 15:08:33 +02:00
Marius Storm-Olsen
f7baba8b09 Ensure that the commit message is Windows formated (CRLF) before invoking the editor. 
(The default editor on Windows (Notepad) doesn't handle Unix line endings)

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
 2007-06-07 14:11:15 +02:00
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
Simon Hausmann
b3fd1b2808 Fix multi-branch import with --silent. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:53:14 +02:00
Simon Hausmann
ad192f2888 Fix p4 execution in git-p4 rollback. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:44:19 +02:00
Simon Hausmann
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
Simon Hausmann
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
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>
 2007-05-23 23:29:01 +02:00
Simon Hausmann
0c66a78393 Make rollback work with locally imported branches 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 20:07:57 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
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>
 2007-05-23 00:03:08 +02:00
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>
 2007-05-21 23:44:24 +02:00
Simon Hausmann
af8da89cb7 Fix branch detection in multi-branch imports 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 23:25:51 +02:00
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>
 2007-05-21 22:57:06 +02:00
Simon Hausmann
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
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>
 2007-05-21 10:08:11 +02:00
Simon Hausmann
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
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>
 2007-05-21 09:34:56 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
24f7b53fdd Had an idea for debugging, record it :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 23:42:22 +02:00
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>
 2007-05-20 23:39:40 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
9bda3a8556 Removed unused variable, more cleanups 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-19 12:05:40 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
66c6a9b559 Removed unused cache variables. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 20:39:38 +02:00
Simon Hausmann
05094f987c Fix branch setup after initial clone. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 20:32:35 +02:00
Simon Hausmann
71bd9bacec Removed todo item that is implemented :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 22:22:26 +02:00
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
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
Simon Hausmann
81f2373f89 Make git-p4 work with bare repositories. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-15 23:06:43 +02:00
Simon Hausmann
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
Simon Hausmann
25df95cce4 Make submitting work on Windows. 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
 2007-05-15 15:15:07 +02:00
Simon Hausmann
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