Commit Graph

491 Commits

Author SHA1 Message Date
Simon Hausmann
aaa19d91cb Make sure all popen calls use binary mode (for Windows) and
also make gitBranchExists work on Windows.
2007-05-15 15:15:07 +02:00
Simon Hausmann
7ad8d65b05 Added a little .bat wrapper from Marius 2007-05-15 14:44:32 +02:00
Simon Hausmann
c8eff44695 Use the subprocess module instead of popen2 to make it work on Windows. 2007-05-15 14:27:56 +02:00
Simon Hausmann
c7afe08124 Document some implementation details, for the curious... :) 2007-05-07 20:14:17 +02:00
Simon Hausmann
7bfbfcf1d5 Cleanup, removed the old tagging code 2007-05-01 23:26:19 +02:00
Simon Hausmann
0269c80c68 cleanup, renamed self.globalPrefix to self.depotPath 2007-05-01 23:23:00 +02:00
Simon Hausmann
d2904a9358 Micro cleanup 2007-05-01 23:15:48 +02:00
Simon Hausmann
bbe740ba2c Doc cleanups. 2007-05-01 18:28:38 +02:00
Simon Hausmann
e3772eb1f2 Handle patch errors in git-p4 submit better. 2007-04-15 09:59:56 +02:00
Simon Hausmann
6c9989feec A new attempt at fixing the child-fast-import-process-not-finished race condition
in the clone command
2007-04-15 09:34:15 +02:00
Simon Hausmann
7fd31726a9 Slightly improved formatting of the raw_input questions. 2007-04-14 16:09:43 +02:00
Simon Hausmann
d7e877303c Removed the old patch apply code from git-p4 submit. 2007-04-14 16:05:54 +02:00
Simon Hausmann
e8e5d6b624 Fix the timezone formatting. Now qgit also displays (parses) it correctly. 2007-04-14 11:21:50 +02:00
Simon Hausmann
837ec75aad Print an error message of some sort if git fast-import fails. 2007-04-13 22:21:10 +02:00
Simon Hausmann
3a7b8e74e5 Allow for convenient rebasing after git-p4 submit 2007-04-09 12:43:40 +02:00
Simon Hausmann
1164789a59 Added a simple example of usage to the "documentation" :) 2007-04-08 10:21:56 +02:00
Simon Hausmann
a20699aaab fix variable usage (oops) 2007-04-08 10:15:47 +02:00
Simon Hausmann
13b8d8fd8d Fix file determination for #head imports 2007-04-08 10:13:32 +02:00
Simon Hausmann
f82f79df67 Added git-p4 clone convenience command 2007-04-08 10:08:26 +02:00
Simon Hausmann
289a5e1d1f Honor --silent for labels 2007-04-08 09:00:55 +02:00
Simon Hausmann
916373a87c Turn off potentially slow label detection by default 2007-04-08 00:12:02 +02:00
Simon Hausmann
64255e2b01 Provide a tree summary after git-p4 rebase 2007-04-08 00:07:02 +02:00
Simon Hausmann
17360fd2c9 Added git-p4 rebase convenience 2007-04-07 23:46:50 +02:00
Simon Hausmann
6358992b2f Minor cleanup 2007-04-01 15:40:46 +02:00
Simon Hausmann
1249f67588 Fix "compilation" :) 2007-04-01 13:39:39 +02:00
Simon Hausmann
a13c1bfdf0 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
simply git-p4 submit mytopicbranch.
2007-03-29 19:15:24 +02:00
Simon Hausmann
171dbab4a6 Fix variable usage in tag import 2007-03-28 17:05:38 +02:00
Simon Hausmann
a1bdb1671a Added support for mapping p4 labels to git tags 2007-03-26 22:34:34 +02:00
Simon Hausmann
f2ba67a06a git-p4 debug doesn't need a git repository 2007-03-26 08:18:55 +02:00
Simon Hausmann
6a5d0cf493 Don't try to parse any options with git-p4 debug but pass it straight on to p4 2007-03-26 00:13:51 +02:00
Simon Hausmann
0befe991ab Prefer git command over git-command. 2007-03-24 16:35:05 +01:00
Simon Hausmann
46479794f8 Minor cosmetic fixlet ;-) 2007-03-24 09:18:20 +01:00
Simon Hausmann
db49ff9686 Different versions of p4 have different output for the where command ;( 2007-03-24 09:15:11 +01:00
Simon Hausmann
368b0ef1db Use the new incremental import style by default 2007-03-23 09:30:41 +01:00
Simon Hausmann
af6fdd432b Make it possible to run git-p4 submit from within the git repository 2007-03-23 09:16:07 +01:00
Simon Hausmann
7645763cfa Brand new smart incremental import that doesn't need tags or git repo-config :) 2007-03-22 22:17:42 +01:00
Simon Hausmann
3a17a51aaf Set the default branch in run, not in the constructor 2007-03-22 21:34:16 +01:00
Simon Hausmann
c27a1d9593 Helper function to check the existance of a revision 2007-03-22 21:27:14 +01:00
Simon Hausmann
29b9fbc9ad Added some helper function(s) to parse the depot path and change number from the log message 2007-03-22 21:10:25 +01:00
Simon Hausmann
dba0b732ae Changed the default branch for imports from "master" to "p4" 2007-03-22 20:36:28 +01:00
Simon Hausmann
4c2c547d88 Changed the format of the imported log message slightly, so that it's easier to parse again. 2007-03-22 20:27:41 +01:00
Simon Hausmann
3eb08ff474 Get rid of the ugly .py extensions - in everyday usage the .py is annoying :) 2007-03-22 09:15:32 +01:00
Simon Hausmann
e421eb3f97 Don't show the submit template and the diff first in less but show it in $editor right away 2007-03-21 21:04:12 +01:00
Simon Hausmann
50f56d35d0 Allow invocations from within a git working tree 2007-03-21 13:05:30 +01:00
Simon Hausmann
10255c36c2 I'm feeling adventurous :), make --apply-as-patch the new default because it's sooo much faster. 2007-03-21 11:01:18 +01:00
Simon Hausmann
f27907b793 This should make --apply-as-patch work with deletions (fingers crossed :) 2007-03-21 10:57:54 +01:00
Simon Hausmann
c6d59cf630 Added experimental but super-fast --apply-as-patch option to git-p4 submit 2007-03-21 10:11:20 +01:00
Simon Hausmann
1504d0e597 Some more docs 2007-03-21 08:27:33 +01:00
Simon Hausmann
9df78326e6 Some docs :) 2007-03-20 22:41:00 +01:00
Simon Hausmann
6838cc4bcb These two scripts have been migrated into git-p4.py now 2007-03-20 22:09:27 +01:00