python/fast-export.git
14 years agoMake it possible to specify the HEAD for the internal findUpstreamBranchPoint function. git-p4
Simon Hausmann [Thu, 21 Jun 2007 22:01:57 +0000 (00:01 +0200)]
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>
14 years agoAdded git-p4 branches command that shows the mapping of perforce depot paths to impor...
Simon Hausmann [Wed, 20 Jun 2007 21:10:28 +0000 (23:10 +0200)]
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>
14 years agoWarn about conflicting p4 branch mappings and use the first one found.
Simon Hausmann [Sun, 17 Jun 2007 13:10:24 +0000 (15:10 +0200)]
Warn about conflicting p4 branch mappings and use the first one found.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix the branch mapping detection to be independent from the order of the "p4 branches...
Simon Hausmann [Sun, 17 Jun 2007 09:25:34 +0000 (11:25 +0200)]
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>
14 years agogit-p4 fails when cloning a p4 depo.
Benjamin Sergeant [Fri, 8 Jun 2007 18:13:55 +0000 (11:13 -0700)]
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>
14 years agoFix initial multi-branch import.
Simon Hausmann [Sat, 16 Jun 2007 11:09:21 +0000 (13:09 +0200)]
Fix initial multi-branch import.

The list of existing p4 branches in git wasn't initialized.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoOnly use double quotes on Windows
Marius Storm-Olsen [Tue, 12 Jun 2007 13:27:52 +0000 (15:27 +0200)]
Only use double quotes on Windows

Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
14 years agoFix git-p4 rebase to detect the correct upstream branch instead of unconditionally
Simon Hausmann [Tue, 12 Jun 2007 12:34:46 +0000 (14:34 +0200)]
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>
14 years agoMoved the code from git-p4 submit to figure out the upstream branch point
Simon Hausmann [Tue, 12 Jun 2007 12:31:59 +0000 (14:31 +0200)]
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>
14 years agogit-p4 submit: Fix missing quotes around p4 commands to make them work with spaces...
Simon Hausmann [Mon, 11 Jun 2007 21:40:25 +0000 (23:40 +0200)]
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>
14 years agoMention remotes/p4/master also in the documentation.
Simon Hausmann [Mon, 11 Jun 2007 21:30:23 +0000 (23:30 +0200)]
Mention remotes/p4/master also in the documentation.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoProvide some information for single branch imports where the commits go
Simon Hausmann [Mon, 11 Jun 2007 21:28:03 +0000 (23:28 +0200)]
Provide some information for single branch imports where the commits go

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agogit-p4: check for existence of repo dir before trying to create
Kevin Green [Mon, 11 Jun 2007 20:48:07 +0000 (16:48 -0400)]
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>
14 years agoWrite out the options tag in the log message of imports only if we actually have
Simon Hausmann [Mon, 11 Jun 2007 08:01:58 +0000 (10:01 +0200)]
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>
14 years agoFix support for explicit disabling of syncing with the origin
Simon Hausmann [Mon, 11 Jun 2007 07:59:27 +0000 (09:59 +0200)]
Fix support for explicit disabling of syncing with the origin

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
Simon Hausmann [Mon, 11 Jun 2007 06:54:45 +0000 (08:54 +0200)]
Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix project name guessing
Simon Hausmann [Mon, 11 Jun 2007 06:50:57 +0000 (08:50 +0200)]
Fix project name guessing

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix updating/creating remotes/p4/* heads from origin/p4/*
Simon Hausmann [Sun, 10 Jun 2007 08:57:40 +0000 (10:57 +0200)]
Fix updating/creating remotes/p4/* heads from origin/p4/*

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFixed the check to make sure to exclude the HEAD symbolic refs when updating
Simon Hausmann [Sat, 9 Jun 2007 22:22:30 +0000 (00:22 +0200)]
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>
14 years agoalso strip p4/ from local imports.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
also strip p4/ from local imports.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoMerge branch 'master' of git://repo.or.cz/fast-export
Han-Wen Nienhuys [Fri, 8 Jun 2007 21:19:23 +0000 (18:19 -0300)]
Merge branch 'master' of git://repo.or.cz/fast-export

14 years agoprint error message when p4 print fails (eg. due to permission problems)
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
print error message when p4 print fails (eg. due to permission problems)

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoOnly get the expensive branch mapping from the p4 server when not
Simon Hausmann [Fri, 8 Jun 2007 06:49:22 +0000 (08:49 +0200)]
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>
14 years agoMake git-p4 submit detect the correct reference (origin) branch when
Simon Hausmann [Thu, 7 Jun 2007 20:54:32 +0000 (22:54 +0200)]
Make git-p4 submit detect the correct reference (origin) branch when
working with multi-branch imports.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoMake clone behave like git clone by default again.
Simon Hausmann [Thu, 7 Jun 2007 19:12:25 +0000 (21:12 +0200)]
Make clone behave like git clone by default again.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoExclude the HEAD symbolic ref from the list of known branches
Marius Storm-Olsen [Thu, 7 Jun 2007 13:28:04 +0000 (15:28 +0200)]
Exclude the HEAD symbolic ref from the list of known branches

Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
14 years agoFix single branch import into remotes
Marius Storm-Olsen [Thu, 7 Jun 2007 13:13:59 +0000 (15:13 +0200)]
Fix single branch import into remotes

Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
14 years agoFix git-p4 clone (defaultDestination)
Marius Storm-Olsen [Thu, 7 Jun 2007 13:08:33 +0000 (15:08 +0200)]
Fix git-p4 clone (defaultDestination)

Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
14 years agoEnsure that the commit message is Windows formated (CRLF) before invoking the editor.
Marius Storm-Olsen [Thu, 7 Jun 2007 12:07:01 +0000 (14:07 +0200)]
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>
14 years agoFix depot-path determination for git-p4 submit
Simon Hausmann [Thu, 7 Jun 2007 11:10:20 +0000 (13:10 +0200)]
Fix depot-path determination for git-p4 submit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix git-p4 submit
Simon Hausmann [Thu, 7 Jun 2007 11:09:14 +0000 (13:09 +0200)]
Fix git-p4 submit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix git-p4 rebase
Simon Hausmann [Thu, 7 Jun 2007 10:51:03 +0000 (12:51 +0200)]
Fix git-p4 rebase

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoHack to make the multi-branch import work again with self.depotPaths now that
Simon Hausmann [Thu, 7 Jun 2007 07:41:53 +0000 (09:41 +0200)]
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>
14 years agoDon't attempt to set the initialParent on multi-branch imports (useless).
Simon Hausmann [Thu, 7 Jun 2007 07:39:51 +0000 (09:39 +0200)]
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>
14 years agoFix common path "calculation" from logs of multiple branches.
Simon Hausmann [Thu, 7 Jun 2007 07:37:13 +0000 (09:37 +0200)]
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>
14 years agoFix support for "depot-path" in older git-p4 imports
Simon Hausmann [Thu, 7 Jun 2007 07:19:34 +0000 (09:19 +0200)]
Fix support for "depot-path" in older git-p4 imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agolook for 'text' and 'binary' files.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
look for 'text' and 'binary' files.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agothinko: really ignore deleted files.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
thinko: really ignore deleted files.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoremove debug print
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
remove debug print

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoCleanups & import into p4/master for local import
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
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>
14 years agouse p4CmdList() to get file contents in Python dicts. This is more robust.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
use p4CmdList() to get file contents in Python dicts. This is more robust.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoonly run p4 print if necessary
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
only run p4 print if necessary

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agodon't p4 print deleted files.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
don't p4 print deleted files.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoread files before creating the commit.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
read files before creating the commit.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agothinko.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
thinko.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agostore p4 user cache in home directory.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
store p4 user cache in home directory.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoThinko, fix buglet.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Thinko, fix buglet.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoRead p4 files in one batch.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Read p4 files in one batch.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoremove global .gitdir
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
remove global .gitdir

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoMerge origin.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Merge origin.

14 years agoDiverse cleanups
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
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>
14 years agoFix typo in listExistingP4Branches that broke sync.
Simon Hausmann [Mon, 28 May 2007 17:24:57 +0000 (19:24 +0200)]
Fix typo in listExistingP4Branches that broke sync.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoIn *_pipe print the command that failed if it fails.
Simon Hausmann [Mon, 28 May 2007 17:23:19 +0000 (19:23 +0200)]
In *_pipe print the command that failed if it fails.
Fixed old calls to mypopen.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoExtract multiple paths concurrently.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Extract multiple paths concurrently.

This enables importing just the interesting bits of large
repositories.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoadd --verbose to all commands.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
add --verbose to all commands.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agouse strip() iso. slicing for removing \n
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
use strip() iso. slicing for removing \n

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agouse string.strip() iso. slicing.
Han-Wen Nienhuys [Wed, 23 May 2007 21:29:34 +0000 (18:29 -0300)]
use string.strip() iso. slicing.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoclone and sync --keep-path to keep perforce path to module.
Han-Wen Nienhuys [Wed, 23 May 2007 21:20:53 +0000 (18:20 -0300)]
clone and sync --keep-path to keep perforce path to module.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agominor cleanups
Han-Wen Nienhuys [Wed, 23 May 2007 20:41:50 +0000 (17:41 -0300)]
minor cleanups

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agocleanup
Han-Wen Nienhuys [Wed, 23 May 2007 20:14:33 +0000 (17:14 -0300)]
cleanup

- use re.sub() iso. if for stripping ...
- spacing nits

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoRobustness fixes for pipes
Han-Wen Nienhuys [Wed, 23 May 2007 20:10:46 +0000 (17:10 -0300)]
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>
14 years agoadd .dotest to .gitignore
Han-Wen Nienhuys [Wed, 23 May 2007 20:10:46 +0000 (17:10 -0300)]
add .dotest to .gitignore

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoFix my email address, this isn't really KDE related :)
Simon Hausmann [Mon, 28 May 2007 12:43:25 +0000 (14:43 +0200)]
Fix my email address, this isn't really KDE related :)

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agorename apply() to applyCommit(); apply is a python builtin
Han-Wen Nienhuys [Wed, 23 May 2007 19:55:48 +0000 (16:55 -0300)]
rename apply() to applyCommit(); apply is a python builtin

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoreformatting: break long lines.
Han-Wen Nienhuys [Wed, 23 May 2007 19:53:11 +0000 (16:53 -0300)]
reformatting: break long lines.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoCleanups
Han-Wen Nienhuys [Wed, 23 May 2007 19:46:29 +0000 (16:46 -0300)]
Cleanups

- don't use dir (python builtin)
- use re for munging depotPath into destination

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
14 years agoFix creation of refs/remotes/p4/HEAD symbolic ref
Simon Hausmann [Sun, 27 May 2007 13:48:01 +0000 (15:48 +0200)]
Fix creation of refs/remotes/p4/HEAD symbolic ref

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoAdded git-p4 submit --trust-me-like-a-fool for the adventurous users :)
Simon Hausmann [Fri, 25 May 2007 20:34:30 +0000 (22:34 +0200)]
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoForgot to remove this TODO item when I made --with-origin the default :)
Simon Hausmann [Fri, 25 May 2007 17:43:38 +0000 (19:43 +0200)]
Forgot to remove this TODO item when I made --with-origin the default :)

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoShortcut the case where we have no origin branch
Simon Hausmann [Fri, 25 May 2007 09:36:42 +0000 (11:36 +0200)]
Shortcut the case where we have no origin branch

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoMake --with-origin the default for syncing.
Simon Hausmann [Fri, 25 May 2007 08:36:10 +0000 (10:36 +0200)]
Make --with-origin the default for syncing.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoMake --with-origin also work without origin :)
Simon Hausmann [Fri, 25 May 2007 08:28:46 +0000 (10:28 +0200)]
Make --with-origin also work without origin :)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoMake git-p4 work with packed refs (don't use os.path.exists to check for the
Simon Hausmann [Fri, 25 May 2007 06:49:18 +0000 (08:49 +0200)]
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>
14 years agoAvoid creating non-p4 branches in remotes/p4 off of remotes/origin
Simon Hausmann [Fri, 25 May 2007 06:44:41 +0000 (08:44 +0200)]
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoOops, fix --with-origin to /really/ also call git fetch :)
Simon Hausmann [Thu, 24 May 2007 20:28:28 +0000 (22:28 +0200)]
Oops, fix --with-origin to /really/ also call git fetch :)

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoAdded support for --with-origin with multi-branch imports
Simon Hausmann [Thu, 24 May 2007 20:25:36 +0000 (22:25 +0200)]
Added support for --with-origin with multi-branch imports

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoForgot to remove this return statement from debugging
Simon Hausmann [Thu, 24 May 2007 20:10:40 +0000 (22:10 +0200)]
Forgot to remove this return statement from debugging

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix creating the remotes/p4 branches based on origin/* for the multi-branch import
Simon Hausmann [Thu, 24 May 2007 19:23:04 +0000 (21:23 +0200)]
Fix creating the remotes/p4 branches based on origin/* for the multi-branch import

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoReplace \r\n with \n when importing from p4 on Windows
Marius Storm-Olsen [Thu, 24 May 2007 12:07:55 +0000 (14:07 +0200)]
Replace \r\n with \n when importing from p4 on Windows

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
14 years agoLoad the user map from p4 only once at run-time.
Simon Hausmann [Wed, 23 May 2007 22:24:52 +0000 (00:24 +0200)]
Load the user map from p4 only once at run-time.

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoFix multi-branch import with --silent.
Simon Hausmann [Wed, 23 May 2007 21:53:14 +0000 (23:53 +0200)]
Fix multi-branch import with --silent.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix p4 execution in git-p4 rollback.
Simon Hausmann [Wed, 23 May 2007 21:44:19 +0000 (23:44 +0200)]
Fix p4 execution in git-p4 rollback.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoCatch p4 errors in rollback early enough (before deleting refs!)
Simon Hausmann [Wed, 23 May 2007 21:40:48 +0000 (23:40 +0200)]
Catch p4 errors in rollback early enough (before deleting refs!)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoOops, fill the /list/ correct with the p4 exit code.
Simon Hausmann [Wed, 23 May 2007 21:32:32 +0000 (23:32 +0200)]
Oops, fill the /list/ correct with the p4 exit code.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoDon't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command...
Simon Hausmann [Wed, 23 May 2007 21:27:31 +0000 (23:27 +0200)]
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>
14 years agoMake rollback work with locally imported branches
Simon Hausmann [Wed, 23 May 2007 18:07:57 +0000 (20:07 +0200)]
Make rollback work with locally imported branches

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoAvoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
Simon Hausmann [Wed, 23 May 2007 14:41:46 +0000 (16:41 +0200)]
Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoDoc updates
Simon Hausmann [Tue, 22 May 2007 22:33:34 +0000 (00:33 +0200)]
Doc updates

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoUse refs/heads/* instead of refs/heads/p4/* for local imports
Simon Hausmann [Tue, 22 May 2007 22:15:50 +0000 (00:15 +0200)]
Use refs/heads/* instead of refs/heads/p4/* for local imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoAdded support for --max-changes=<count> to ease import debugging
Simon Hausmann [Tue, 22 May 2007 22:07:35 +0000 (00:07 +0200)]
Added support for --max-changes=<count> to ease import debugging

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoAdded support for importing multiple branches into refs/heads instead of just refs...
Simon Hausmann [Tue, 22 May 2007 22:03:08 +0000 (00:03 +0200)]
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>
14 years agoFixes for rollback, delete branches that did not exist at the specified p4 change
Simon Hausmann [Mon, 21 May 2007 21:44:24 +0000 (23:44 +0200)]
Fixes for rollback, delete branches that did not exist at the specified p4 change

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix branch detection in multi-branch imports
Simon Hausmann [Mon, 21 May 2007 21:25:51 +0000 (23:25 +0200)]
Fix branch detection in multi-branch imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoAdded a rollback command for debugging. It sets back the heads of the p4 branches...
Simon Hausmann [Mon, 21 May 2007 20:57:06 +0000 (22:57 +0200)]
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>
14 years agoMake git-p4 submit --direct safer by also creating a git commit
Simon Hausmann [Mon, 21 May 2007 09:04:26 +0000 (11:04 +0200)]
Make git-p4 submit --direct safer by also creating a git commit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoDetect with git-p4 submit --direct when there are no changes in the working directory
Simon Hausmann [Mon, 21 May 2007 08:08:11 +0000 (10:08 +0200)]
Detect with git-p4 submit --direct when there are no changes in the working directory

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix git symbolic-ref warning on initial clone
Simon Hausmann [Mon, 21 May 2007 08:05:30 +0000 (10:05 +0200)]
Fix git symbolic-ref warning on initial clone

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
14 years agoFix error detection with git-p4 submit when the requested depot path is not in the...
Simon Hausmann [Mon, 21 May 2007 07:34:56 +0000 (09:34 +0200)]
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>
14 years agoFix conversion from old style heads/p4 to remotes/p4/master
Simon Hausmann [Mon, 21 May 2007 06:44:16 +0000 (08:44 +0200)]
Fix conversion from old style heads/p4 to remotes/p4/master

Signed-off-by: Simon Hausmann <simon@lst.de>
14 years agoImproved output for multi branch imports and noted another little todo item
Simon Hausmann [Sun, 20 May 2007 22:39:16 +0000 (00:39 +0200)]
Improved output for multi branch imports and noted another little todo item

Signed-off-by: Simon Hausmann <shausman@trolltech.com>