view README @ 1335:bea6356b8bca

git -> hg conversion script

contrib/convert-repo changes:
- do not print verbose output so that error messages are seen more easily
- Output the date as integer and not as floating point number.
- Do not require a ".git" subdirectory to work on, but use the GIT_DIR
  environment var to specify the git repository.

Change is otherwise compatible to the current version and I have tested it
by converting the kernel and several git respositories from kernel.org.
(Btw, the udev test dir contains a /sys dir with entries which should not
be normal dirs and not be normal files. ;-)

Thanks again for mercurial,

Florian La Roche



--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -28,26 +28,18 @@
         self.path = path

     def getheads(self):
-        h = file(self.path + "/.git/HEAD").read()[:-1]
-        return [h]
+        return [file(self.path + "/HEAD").read()[:-1]]

     def catfile(self, rev, type):
         if rev == "0" * 40: raise IOError()
-        path = os.getcwd()
-        os.chdir(self.path)
-        fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev))
-        os.chdir(path)
+        fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
         return fh.read()

     def getfile(self, name, rev):
         return self.catfile(rev, "blob")

     def getchanges(self, version):
-        path = os.getcwd()
-        os.chdir(self.path)
-        fh = os.popen("git-diff-tree --root -m -r %s" % (version))
-        os.chdir(path)
-
+        fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
         changes = []
         for l in fh:
             if "\t" not in l: continue
@@ -83,9 +75,9 @@

     def gettags(self):
         tags = {}
-        for f in os.listdir(self.path + "/.git/refs/tags"):
+        for f in os.listdir(self.path + "/refs/tags"):
             try:
-                h = file(self.path + "/.git/refs/tags/" + f).read().strip()
+                h = file(self.path + "/refs/tags/" + f).read().strip()
                 tags[f] = h
             except:
                 pass
@@ -99,8 +91,7 @@

     def getheads(self):
         h = self.repo.changelog.heads()
-        h = [ hg.hex(x) for x in h ]
-        return h
+        return [ hg.hex(x) for x in h ]

     def putfile(self, f, e, data):
         self.repo.wfile(f, "w").write(data)
@@ -155,12 +146,12 @@
         newlines.sort()

         if newlines != oldlines:
-            print "updating tags"
+            #print "updating tags"
             f = self.repo.wfile(".hgtags", "w")
             f.write("".join(newlines))
             f.close()
             if not oldlines: self.repo.add([".hgtags"])
-            date = "%s 0" % time.mktime(time.gmtime())
+            date = "%s 0" % int(time.mktime(time.gmtime()))
             self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
                                 date, self.repo.changelog.tip(), hg.nullid)

@@ -262,7 +253,7 @@
             num -= 1
             if c in self.map: continue
             desc = self.commitcache[c][3].splitlines()[0]
-            print num, desc
+            #print num, desc
             self.copy(c)

         tags = self.source.gettags()
@@ -275,6 +266,8 @@
         self.dest.puttags(ctags)

 gitpath, hgpath, mapfile = sys.argv[1:]
+if os.path.isdir(gitpath + "/.git"):
+    gitpath += "/.git"

 c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile)
 c.convert()
_______________________________________________
Mercurial mailing list
[e-mail]
http://selenic.com/mailman/listinfo/mercurial

MERCURIAL QUICK-START

Setting up Mercurial:

 Note: some distributions fails to include bits of distutils by
 default, you'll need python-dev to install. You'll also need a C
 compiler and a 3-way merge tool like merge, tkdiff, or kdiff3.

 First, unpack the source:

 $ tar xvzf mercurial-<ver>.tar.gz
 $ cd mercurial-<ver>

 To install system-wide:

 $ python setup.py install   # change python to python2.3 if 2.2 is default

 To install in your home directory (~/bin and ~/lib, actually), run:

 $ python2.3 setup.py install --home=~
 $ export PYTHONPATH=${HOME}/lib/python  # (or lib64/ on some systems)
 $ export PATH=${HOME}/bin:$PATH         # add these to your .bashrc

 And finally:

 $ hg                                    # test installation, show help

 If you get complaints about missing modules, you probably haven't set
 PYTHONPATH correctly.

Setting up a Mercurial project:

 $ cd project/
 $ hg init         # creates .hg
 $ hg addremove    # add all unknown files and remove all missing files
 $ hg commit       # commit all changes, edit changelog entry

 Mercurial will look for a file named .hgignore in the root of your
 repository which contains a set of regular expressions to ignore in
 file paths.

Branching and merging:

 $ hg clone linux linux-work    # create a new branch
 $ cd linux-work
 $ <make changes>
 $ hg commit
 $ cd ../linux
 $ hg pull ../linux-work     # pull changesets from linux-work
 $ hg update -m              # merge the new tip from linux-work into
                             # our working directory
 $ hg commit                 # commit the result of the merge

Importing patches:

 Fast:
 $ patch < ../p/foo.patch
 $ hg addremove
 $ hg commit

 Faster:
 $ patch < ../p/foo.patch
 $ hg commit `lsdiff -p1 ../p/foo.patch`

 Fastest:
 $ cat ../p/patchlist | xargs hg import -p1 -b ../p

Exporting a patch:

 (make changes)
 $ hg commit
 $ hg tip
 28237:747a537bd090880c29eae861df4d81b245aa0190
 $ hg export 28237 > foo.patch    # export changeset 28237

Network support:

 # pull from the primary Mercurial repo
 foo$ hg clone http://selenic.com/hg/
 foo$ cd hg

 # export your current repo via HTTP with browsable interface
 foo$ hg serve -n "My repo" -p 80

 # pushing changes to a remote repo with SSH
 foo$ hg push ssh://[e-mail]/~/hg/

 # merge changes from a remote machine
 bar$ hg pull http://foo/
 bar$ hg update -m        # merge changes into your working directory

 # Set up a CGI server on your webserver
 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi
 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults

For more info:

 Documentation in doc/
 Mercurial website at http://selenic.com/mercurial
 Mercurial wiki at http://selenic.com/mercurial/wiki