jelmer/fast-export.git
11 years agoUse apr-config utility to find right compilation flags and includes master
Jelmer Vernooij [Wed, 12 Mar 2008 19:54:12 +0000 (20:54 +0100)]
Use apr-config utility to find right compilation flags and includes
for APR.

11 years agohg-fast-export.py: Cache possibly sanitized branch names
Rocco Rutte [Fri, 26 Oct 2007 15:11:57 +0000 (17:11 +0200)]
hg-fast-export.py: Cache possibly sanitized branch names

...instead of doing it for every single commit.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agoMerge branch 'fixes'
Rocco Rutte [Fri, 26 Oct 2007 14:29:18 +0000 (14:29 +0000)]
Merge branch 'fixes'

* fixes:
  hg-fast-import.py: Sanitize ref names
  hg-fast-export.py: Don't attempt to dump revs beyond tip with -m
  hg-fast-export.py: Minor tweaks/cleanup

11 years agohg-fast-import.py: Sanitize ref names
Rocco Rutte [Fri, 26 Oct 2007 14:06:40 +0000 (16:06 +0200)]
hg-fast-import.py: Sanitize ref names

At least the opensolaris hg repo has tag names containing '*',
so sanitize all branch and tag names roughly according to the
specs for git-check-ref-format(1).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg-fast-export.py: Don't attempt to dump revs beyond tip with -m
Rocco Rutte [Thu, 25 Oct 2007 13:23:17 +0000 (15:23 +0200)]
hg-fast-export.py: Don't attempt to dump revs beyond tip with -m

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg-fast-export.py: Minor tweaks/cleanup
Rocco Rutte [Thu, 25 Oct 2007 13:21:46 +0000 (15:21 +0200)]
hg-fast-export.py: Minor tweaks/cleanup

Remove some unused variables, generalize dictionary-splitting and make
sure we don't sort filename lists twice (repo.status returns files
sorted already).

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agoFix shell substitution typo
Rocco Rutte [Mon, 22 Oct 2007 08:28:41 +0000 (08:28 +0000)]
Fix shell substitution typo

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg-reset.py: Use mangle_key() for load_cache() as hg-fast-export.py does
Rocco Rutte [Mon, 22 Oct 2007 08:28:18 +0000 (08:28 +0000)]
hg-reset.py: Use mangle_key() for load_cache() as hg-fast-export.py does

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg-fast-export.py: Rewrite merge logic
Rocco Rutte [Mon, 22 Oct 2007 08:06:58 +0000 (10:06 +0200)]
hg-fast-export.py: Rewrite merge logic

Merges were completely broken as they ended up with twice the same
parent in git. Still everything besides gitk seemed to work.

This because of 1) the incorrect assumption that a commit's parent is
the commit exported right before it and 2) some confusion with markes
being saved/loaded/used since git-fast-import doesn't allow for a ":0"
mark to map hg revision 1:1 to marks.

The merge "algorithm" now works like this:

1) If the commit's higher parent (highest hg rev), is not the last
commit exported for a particular branch, we issue a "from" command to
place it on top of it.

2) If the commit's lower parent exists, we issue a "merge" for it.

This is much simpler and seems to produce correct merges in git. And
while I'm at it, make output less confusing by prepending the target
branch name to each line.

The "twice the same parent" bug was discovered by Michele Ballabio on
the git list.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg2git.py: Allow consumers to modify keys of dicts returned by load_cache()
Rocco Rutte [Mon, 22 Oct 2007 07:50:52 +0000 (09:50 +0200)]
hg2git.py: Allow consumers to modify keys of dicts returned by load_cache()

By default, the key is not changed. This will allow us for fixing up the
off-by-one issue with marks restored using load_cache().

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg2git.py: Use git-rev-parse to get SHA1s instead of reading files below refs/ directly
Rocco Rutte [Mon, 22 Oct 2007 07:48:48 +0000 (09:48 +0200)]
hg2git.py: Use git-rev-parse to get SHA1s instead of reading files below refs/ directly

This should now also properly support packed refs.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agohg2git.py: Map 'HEAD', 'default' and '' hg branches to 'master' in git
Rocco Rutte [Mon, 22 Oct 2007 07:44:12 +0000 (09:44 +0200)]
hg2git.py: Map 'HEAD', 'default' and '' hg branches to 'master' in git

Also add a note where HEAD is comming from.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agoAllow for $PYTHON environment variable specifying python binary to use
Rocco Rutte [Mon, 22 Oct 2007 07:34:40 +0000 (09:34 +0200)]
Allow for $PYTHON environment variable specifying python binary to use

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
11 years agoThis prevents invalid command errors caused by bytes not being flushed to
Scott Lamb [Mon, 16 Jul 2007 08:31:00 +0000 (01:31 -0700)]
This prevents invalid command errors caused by bytes not being flushed to
git-fastimport in the same order as they were written to the buffer.

Signed-off-by: Scott Lamb <slamb@slamb.org>
11 years agoRemoved git-p4 from fast-export. It has been moved to git.git:contrib/fast-import.
Simon Hausmann [Mon, 25 Jun 2007 08:34:20 +0000 (10:34 +0200)]
Removed git-p4 from fast-export. It has been moved to git.git:contrib/fast-import.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
11 years agoMake it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
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>
11 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>
11 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>
11 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>
11 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>
11 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.

11 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

11 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

11 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.

11 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

11 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.

11 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

11 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>
11 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

11 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

11 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)

11 years agoFix project name guessing
Simon Hausmann [Mon, 11 Jun 2007 06:50:57 +0000 (08:50 +0200)]
Fix project name guessing

11 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/*

11 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.

11 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.

11 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

11 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)

11 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).

11 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>
11 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>
11 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

11 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

11 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)

11 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>
11 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

11 years agoFix git-p4 submit
Simon Hausmann [Thu, 7 Jun 2007 11:09:14 +0000 (13:09 +0200)]
Fix git-p4 submit

11 years agoFix git-p4 rebase
Simon Hausmann [Thu, 7 Jun 2007 10:51:03 +0000 (12:51 +0200)]
Fix git-p4 rebase

11 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

11 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 :)

11 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.

11 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

11 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.

11 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.

11 years agoremove debug print
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
remove debug print

11 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

11 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.

11 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

11 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.

11 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.

11 years agothinko.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
thinko.

11 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.

11 years agoThinko, fix buglet.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Thinko, fix buglet.

11 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.

11 years agoremove global .gitdir
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
remove global .gitdir

11 years agoMerge origin.
Han-Wen Nienhuys [Wed, 23 May 2007 21:49:35 +0000 (18:49 -0300)]
Merge origin.

11 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

11 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.

11 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.

11 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.

11 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.

11 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

11 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.

11 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.

11 years agominor cleanups
Han-Wen Nienhuys [Wed, 23 May 2007 20:41:50 +0000 (17:41 -0300)]
minor cleanups

11 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

11 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

11 years agoadd .dotest to .gitignore
Han-Wen Nienhuys [Wed, 23 May 2007 20:10:46 +0000 (17:10 -0300)]
add .dotest to .gitignore

11 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 :)

11 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

11 years agoreformatting: break long lines.
Han-Wen Nienhuys [Wed, 23 May 2007 19:53:11 +0000 (16:53 -0300)]
reformatting: break long lines.

11 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

11 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

11 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 :)

11 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 :)

11 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

11 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.

11 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 :)

11 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)

11 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

11 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 :)

11 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

11 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

11 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

11 years agoReplace
Marius Storm-Olsen [Thu, 24 May 2007 12:07:55 +0000 (14:07 +0200)]
Replace
 with
 when importing from p4 on Windows

11 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.

11 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.

11 years agop4 p4 is not a valid p4 command :)
Simon Hausmann [Wed, 23 May 2007 21:44:19 +0000 (23:44 +0200)]
p4 p4 is not a valid p4 command :)

11 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!)

11 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.

11 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.