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
95962f318e
Make the command call silent
...
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com >
2007-05-15 16:07:41 +02:00
42890f6291
Converted to unix newlines
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com >
2007-05-15 16:07:02 +02:00
25df95cce4
Make submitting work on Windows.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-05-15 15:15:07 +02:00
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
ac1fde55a7
Added a little .bat wrapper from Marius
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-05-15 14:44:32 +02:00
0848358055
Use the subprocess module instead of popen2 to make it work on Windows.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-05-15 14:27:56 +02:00
ffcc952b33
Merge branch 'maint'
...
* maint:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars
2007-05-10 14:48:04 -07:00
d966e6aa66
Properly handle '0' filenames in import-tars
...
Randal L. Schwartz pointed out multiple times that we should be
testing the length of the name string here, not if it is "true".
The problem is the string '0' is actually false in Perl when we
try to evaluate it in this context, as '0' is 0 numerically and
the number 0 is treated as a false value. This would cause us
to break out of the import loop early if anyone had a file or
directory named "0".
Signed-off-by: Shawn O. Pearce <spearce@spearce.org >
2007-05-07 21:13:40 -04:00
a844b7406f
Document some implementation details, for the curious... :)
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-05-07 20:14:17 +02:00
db81e67a7d
Merge branch 'gfi-maint' into gfi-master
...
* gfi-maint:
Teach import-tars about GNU tar's @LongLink extension.
2007-05-02 13:24:10 -04:00
775477aa1d
Teach import-tars about GNU tar's @LongLink extension.
...
This extension allows GNU tar to process file names in excess of the 100
characters defined by the original tar standard. It does this by faking a
file, named '././@LongLink' containing the true file name, and then adding
the file with a truncated name. The idea is that tar without this
extension will write out a file with the long file name, and write the
contents into a file with truncated name.
Unfortunately, GNU tar does a lousy job at times. When truncating results
in a _directory_ name, it will happily use _that_ as a truncated name for
the file.
An example where this actually happens is gcc-4.1.2, where the full path
of the file WeThrowThisExceptionHelper.java truncates _exactly_ before the
basename. So, we have to support that ad-hoc extension.
This bug was noticed by Chris Riddoch on IRC.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de >
Signed-off-by: Shawn O. Pearce <spearce@spearce.org >
2007-05-02 13:22:34 -04:00
2835925139
Cleanup, removed the old tagging code
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-05-01 23:26:19 +02:00
8f8725314d
cleanup, renamed self.globalPrefix to self.depotPath
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-05-01 23:23:00 +02:00
1c094184da
Micro cleanup
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-05-01 23:15:48 +02:00
ff5dba20e3
Doc cleanups.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-05-01 18:28:38 +02:00
39231b1c32
Merge branch 'maint'
...
* maint:
http.c: Fix problem with repeated calls of http_init
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fix import-tars fix.
Update .mailmap with "Michael"
Do not barf on too long action description
Catch empty pathnames in trees during fsck
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes
git-svn: Added 'find-rev' command
git shortlog documentation: add long options and fix a typo
2007-04-29 01:52:43 -07:00
d0c32b6339
Fix import-tars fix.
...
This heeds advice from our resident Perl expert to make sure
the script is not confused with a string that ends with /\n
Signed-off-by: Junio C Hamano <junkio@cox.net >
2007-04-29 01:34:59 -07:00
87859f3443
import-tars: be nice to wrong directory modes
...
Some tars seem to have modes 0755 for directories, not 01000755. Do
not generate an empty object for them, but ignore them.
Noticed by riddochc on IRC.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de >
Signed-off-by: Shawn O. Pearce <spearce@spearce.org >
2007-04-28 20:01:36 -04:00
46f6178a3f
fix importing of subversion tars
...
add a / between the prefix and name fields of the tar archive if prefix
is non-empty.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de >
Signed-off-by: Shawn O. Pearce <spearce@spearce.org >
2007-04-24 12:14:40 -04:00
51a2640afd
Handle patch errors in git-p4 submit better.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-15 09:59:56 +02:00
90865adc01
A new attempt at fixing the child-fast-import-process-not-finished race condition
...
in the clone command
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-15 09:34:15 +02:00
5e80dd4d7e
Slightly improved formatting of the raw_input questions.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-14 16:09:43 +02:00
8b72ca0f76
Removed the old patch apply code from git-p4 submit.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-14 16:05:54 +02:00
f291b4e3d4
Fix the timezone formatting. Now qgit also displays (parses) it correctly.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-14 11:21:50 +02:00
fd4ca86a0b
Print an error message of some sort if git fast-import fails.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-13 22:21:10 +02:00
80b5910fac
Allow for convenient rebasing after git-p4 submit
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-09 12:43:40 +02:00
7243b350b3
Added a simple example of usage to the "documentation" :)
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 10:21:56 +02:00
10c3211b81
fix variable usage (oops)
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 10:15:47 +02:00
c45b1cfe1e
Fix file determination for #head imports
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 10:13:32 +02:00
f9a3a4f796
Added git-p4 clone convenience command
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 10:08:26 +02:00
68ed351ab5
Honor --silent for labels
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 09:00:55 +02:00
cb53e1f8e9
Turn off potentially slow label detection by default
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 00:12:02 +02:00
1f52af6c73
Provide a tree summary after git-p4 rebase
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-08 00:07:02 +02:00
01ce1fe967
Added git-p4 rebase convenience
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-04-07 23:46:50 +02:00
711544b00c
Clean up python class names.
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-04-01 15:40:46 +02:00
2a9489c024
Fix "compilation" :)
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-04-01 13:39:39 +02:00
c9b50e6307
Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
...
simply git-p4 submit mytopicbranch.
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-03-29 19:15:24 +02:00
a46668faf7
Fix variable usage in tag import
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-03-28 17:05:38 +02:00
1f4ba1cbfc
Added support for mapping p4 labels to git tags
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-03-26 22:34:34 +02:00
8910ac0e88
git-p4 debug doesn't need a git repository
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-03-26 08:18:55 +02:00
e20a9e530a
Don't try to parse any options with git-p4 debug but pass it straight on to p4
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-26 00:13:51 +02:00
9863f4055e
Prefer git command over git-command.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-24 16:35:05 +01:00
274917a3d6
Minor cosmetic fixlet for the git-p4 submit sync question.
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-24 09:18:20 +01:00
cb2c9db507
Different versions of p4 have different output for the where command ;(
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-24 09:15:11 +01:00
967f72e21b
Use the new incremental import style by default
...
Signed-off-by: Simon Hausmann <shausman@trolltech.com >
2007-03-23 09:30:41 +01:00
9512497bcf
Make it possible to run git-p4 submit from within the git repository
...
Signed-off-by: Simon Hausmann <hausmann@kde.org >
2007-03-23 09:16:07 +01:00
179caebff4
Brand new smart incremental import that doesn't need tags or git repo-config :)
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-22 22:17:42 +01:00
569d1bd409
Set the default branch in run, not in the constructor
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-22 21:34:16 +01:00
8136a6399c
Helper function to check the existance of a revision
...
Signed-off-by: Simon Hausmann <simon@lst.de >
2007-03-22 21:27:14 +01:00
