Commit Graph

155 Commits

Author SHA1 Message Date
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
Simon Hausmann
f3340699f3 Fixed the initial versioned import 2007-03-20 21:13:49 +01:00
Simon Hausmann
19d73797bc Fixed some obvious of missing "self"s :) 2007-03-20 20:59:30 +01:00
Simon Hausmann
fe393f3d6a Completely untested "merge" of p4-fast-export.py into git-p4.py 2007-03-20 20:54:23 +01:00
Simon Hausmann
a1014dbc62 sync-to-perforce is now called submit and fixed the gitdir check a little bit 2007-03-20 18:32:47 +01:00
Simon Hausmann
6534d511d5 Credit where credit is due. Added Trolltech ASA. 2007-03-19 22:26:36 +01:00
Simon Hausmann
1d6c640423 First (untested) attempt at migrating p4-git-sync into the final git-p4 script 2007-03-19 22:25:17 +01:00
Simon Hausmann
55e377d90b Provide a tiny little bit of help 2007-03-19 21:02:30 +01:00
Simon Hausmann
2a6c075b1d Start moving the git-p4 tools into one single script. 2007-03-19 20:59:12 +01:00
Simon Hausmann
07587f6d76 Make it work again 2007-03-19 12:04:37 +01:00
Simon Hausmann
d4fc4499af Try harder to find the git repository 2007-03-19 11:57:10 +01:00
Rocco Rutte
825c884092 hg-reset.py: Print info about tags, too
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 09:44:46 +00:00
Rocco Rutte
5cc155e367 hg-reset.py: Print details for changed branches only
It doesn't make sense to suggest resetting branch HEADs to their current
value.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 09:27:37 +00:00
Rocco Rutte
8b0fca64da License hg-reset.py under GPLv2 as it uses mercurial code
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 09:18:20 +00:00
Rocco Rutte
f1397c068b hg-fast-export.py: Fix option presence checking
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 09:05:51 +00:00
Rocco Rutte
8aff9df2c3 hg-reset.sh: Helper for partially re-importing from hg
Given a hg revision to reset to, these scripts get the latest changes
per hg branch and print git SHA1. The user then needs to manually reset
branches as needed, tune the state file and can re-import things again.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 09:04:42 +00:00
Rocco Rutte
7044bdd4d1 Add hg2git.py with library routines
Unfortunately, I can't do 'import hg-fast-export' from python itself, so
we need to move some common methods into 'hg2git.py' which is to be used
as a library for common hg->git routines.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 08:45:42 +00:00
Rocco Rutte
b0492474e3 Ignore *.pyc files
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-19 08:38:27 +00:00
Rocco Rutte
b57ad30740 Replace some references from hg2git to hg-fast-import
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-16 18:19:08 +00:00
Simon Hausmann
84ca2f71c8 Default to interactive syncing 2007-03-16 13:47:46 +01:00
Simon Hausmann
c24e9e1bf3 Be more strict with Perforce after synching. 2007-03-15 19:07:06 +01:00
Simon Hausmann
6b1cb84f56 Auto-detect the current branch 2007-03-14 23:30:23 +01:00
Simon Hausmann
39fa67264e Ignore weird apple files :) 2007-03-14 19:03:16 +01:00
Simon Hausmann
2b756cf156 Be nice and use /usr/bin/env python for the git-p4 scripts 2007-03-14 17:33:46 +01:00
Simon Hausmann
235047bd9b Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
files that are deleted in the future.
Also do some Perforce cleaning
2007-03-14 17:31:47 +01:00
Rocco Rutte
1c311b6ef6 Use svn_repos_open() for svn-archive.c, too
Without the change, running it does nothing at all here.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 15:56:57 +00:00
Rocco Rutte
bca24a3468 Obtain svn_fs_t via svn_repos_open() -> svn_repos_fs()
Without really knowing the svn API, using plain svn_fs_open() complained
about a missing /foo/DB_CONFIG even on fsfs type repos. Use
svn_repos_open() to open the repo and use svn_repos_fs() to get the fs
instead of using svn_fs_open() since even the headers say I wouldn't
want to use it directly... and they're right, obviously. :)

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 15:35:33 +00:00
Rocco Rutte
e25b88e15f Allow CFLAGS and LDFLAGS to be overwritten on command line
Hardcoding doesn't make sense, after all.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 15:19:13 +00:00
Rocco Rutte
3919be7d55 hg-fast-export.sh Use hg-fast-export.py, not dead hg2git.py
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 10:56:18 +00:00
Rocco Rutte
30ce6693ed hg-fast-export.py: Kill stale usage() and __doc__
Both are obsolete since using the option parser.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 10:32:33 +00:00
Rocco Rutte
c84790da82 Use MIT license, adjust hg2git script names to match fast-export repo style
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 10:29:24 +00:00
Rocco Rutte
3e0fb1cf11 Merge branch 'master' of git://repo.or.cz/hg2git
* 'master' of git://repo.or.cz/hg2git: (38 commits)
  hg2git.py: Only print verification message for branches we have
  hg2git.py: Add simple delta revision feed
  hg2git.py: Create only leightweight tags
  hg2git.py: add -f/--force option to bypass validation checks
  hg2git.py: Bail out for certain errors
  Add a note about hg's unnamed branches and multiple heads
  hg2git.py: For the first revision, feed out full manifest
  hg2git.py: Don't complain die for non-existent heads
  Remove SHA stability note from readme
  hg2git.py: Remove leading/trailing spaces from authormap
  hg2git.py: Allow for spaces in authorfile
  hg2git.sh: Add usage note that argument order matters
  hg2git.sh: Complete --help output's option listing
  Basic support for an author map
  hg2git.py: Fix typo saving status to headsfile instead of statusfile
  hg2git.py: Display our max revision as progress, not tip
  hg2git.py: Disable parsing Signef-off-by lines and add -s to enable
  Basic support for command line options in hg2git.py
  Rename README.txt to hg2git.txt
  Only attempt to verify heads hg has, too
  ...
2007-03-14 10:22:52 +00:00
Rocco Rutte
f9879136a9 hg2git.py: Only print verification message for branches we have
It's pointless for many branches to print the validation message for the
first revision already; the same counts for incremental runs.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 10:13:27 +00:00
Rocco Rutte
287365c160 hg2git.py: Add simple delta revision feed
Now we have three methods of feeding out changes
  1) full for first revision or
  2) thorough delta for merges (compare checksums with all parents) or
  3) simple delta else (only got with manifest)

This requires some cleanup so that we have only place where we actually
call the appropriate dumping method.

The export_file_contents() method now also sorts its file list before
writing out anything as this seems to speed up hg data retrival a bit.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 10:02:15 +00:00
Rocco Rutte
af2237607c hg2git.py: Create only leightweight tags
The annotated tag with commit message summary was primarily only for
debugging.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-14 08:34:18 +00:00
Rocco Rutte
d988112549 hg2git.py: add -f/--force option to bypass validation checks
Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-13 16:43:20 +00:00
Rocco Rutte
ad283a91ca hg2git.py: Bail out for certain errors
New is that we also check for multiple tips having the same branch name,
i.e. no unnamed heads.

Signed-off-by: Rocco Rutte <pdmef@gmx.net>
2007-03-13 16:31:57 +00:00